From d469cc04bcace0f601802301caeddc5b473b75f2 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 7 Jan 2018 22:20:14 +0100 Subject: API Change: Machine configs are now a method of the owner class, and the prototype is simplified [O. Galibert] Beware, the device context does not follow in MCFG_FRAGMENT_ADD anymore due to the prototype change. So creating a device then configuring through a fragment doesn't work as-is. The simplest solution is just to add a MCFG_DEVICE_MODIFY at the start of the fragment with the correct tag. --- src/mame/audio/alesis.cpp | 2 +- src/mame/audio/asteroid.cpp | 4 +- src/mame/audio/astrof.cpp | 6 +- src/mame/audio/atarijsa.cpp | 8 +- src/mame/audio/avalnche.cpp | 4 +- src/mame/audio/bwidow.cpp | 4 +- src/mame/audio/bzone.cpp | 2 +- src/mame/audio/cage.cpp | 4 +- src/mame/audio/carnival.cpp | 2 +- src/mame/audio/carnival.h | 4 - src/mame/audio/cclimber.cpp | 2 +- src/mame/audio/cheekyms.cpp | 2 +- src/mame/audio/cinemat.cpp | 30 +- src/mame/audio/copsnrob.cpp | 2 +- src/mame/audio/crbaloon.cpp | 2 +- src/mame/audio/csd.cpp | 2 +- src/mame/audio/dcs.cpp | 20 +- src/mame/audio/decobsmt.cpp | 2 +- src/mame/audio/depthch.cpp | 2 +- src/mame/audio/depthch.h | 4 - src/mame/audio/dkong.cpp | 10 +- src/mame/audio/dsbz80.cpp | 2 +- src/mame/audio/efo_zsu.cpp | 4 +- src/mame/audio/exidy.cpp | 8 +- src/mame/audio/exidy.h | 10 +- src/mame/audio/exidy440.cpp | 3 +- src/mame/audio/exidy440.h | 3 +- src/mame/audio/galaxian.cpp | 26 +- src/mame/audio/galaxian.h | 5 +- src/mame/audio/gottlieb.cpp | 8 +- src/mame/audio/harddriv.cpp | 2 +- src/mame/audio/hng64.cpp | 2 +- src/mame/audio/hyprolyb.cpp | 37 -- src/mame/audio/hyprolyb.h | 3 +- src/mame/audio/invinco.cpp | 2 +- src/mame/audio/invinco.h | 4 - src/mame/audio/irem.cpp | 6 +- src/mame/audio/jedi.cpp | 2 +- src/mame/audio/leland.cpp | 8 +- src/mame/audio/llander.cpp | 3 +- src/mame/audio/llander.h | 4 - src/mame/audio/mario.cpp | 4 +- src/mame/audio/midway.cpp | 8 +- src/mame/audio/mw8080bw.cpp | 44 +-- src/mame/audio/n8080.cpp | 6 +- src/mame/audio/namco52.cpp | 2 +- src/mame/audio/namco54.cpp | 2 +- src/mame/audio/nichisnd.cpp | 2 +- src/mame/audio/pulsar.cpp | 2 +- src/mame/audio/pulsar.h | 4 - src/mame/audio/qix.cpp | 4 +- src/mame/audio/rax.cpp | 2 +- src/mame/audio/redalert.cpp | 10 +- src/mame/audio/s11c_bg.cpp | 2 +- src/mame/audio/scramble.cpp | 2 +- src/mame/audio/segag80r.cpp | 8 +- src/mame/audio/segam1audio.cpp | 2 +- src/mame/audio/segasnd.cpp | 27 +- src/mame/audio/segasnd.h | 4 +- src/mame/audio/spacefb.cpp | 2 +- src/mame/audio/spiders.cpp | 2 +- src/mame/audio/sprint8.cpp | 2 +- src/mame/audio/svis_snd.h | 2 +- src/mame/audio/t5182.cpp | 2 +- src/mame/audio/taito_en.cpp | 2 +- src/mame/audio/taito_zm.cpp | 18 +- src/mame/audio/taito_zm.h | 4 +- src/mame/audio/targ.cpp | 4 +- src/mame/audio/targ.h | 5 - src/mame/audio/timeplt.cpp | 13 +- src/mame/audio/timeplt.h | 6 +- src/mame/audio/tranqgun.cpp | 2 +- src/mame/audio/tranqgun.h | 4 - src/mame/audio/turbo.cpp | 6 +- src/mame/audio/vicdual-97271p.cpp | 2 +- src/mame/audio/vicdual.cpp | 6 +- src/mame/audio/vicdual.h | 6 - src/mame/audio/williams.cpp | 6 +- src/mame/audio/wpcsnd.cpp | 2 +- src/mame/audio/zaccaria.cpp | 6 +- src/mame/audio/zaxxon.cpp | 4 +- src/mame/drivers/1942.cpp | 18 +- src/mame/drivers/1943.cpp | 22 +- src/mame/drivers/1945kiii.cpp | 6 +- src/mame/drivers/20pacgal.cpp | 22 +- src/mame/drivers/24cdjuke.cpp | 3 +- src/mame/drivers/2mindril.cpp | 4 +- src/mame/drivers/30test.cpp | 5 +- src/mame/drivers/39in1.cpp | 22 +- src/mame/drivers/3do.cpp | 12 +- src/mame/drivers/3x3puzzl.cpp | 3 +- src/mame/drivers/4004clk.cpp | 5 +- src/mame/drivers/40love.cpp | 8 +- src/mame/drivers/4dpi.cpp | 3 +- src/mame/drivers/4enlinea.cpp | 7 +- src/mame/drivers/4enraya.cpp | 8 +- src/mame/drivers/4roses.cpp | 9 +- src/mame/drivers/5clown.cpp | 3 +- src/mame/drivers/68ksbc.cpp | 3 +- src/mame/drivers/8080bw.cpp | 60 ++-- src/mame/drivers/88games.cpp | 8 +- src/mame/drivers/a1supply.cpp | 3 +- src/mame/drivers/a2600.cpp | 9 +- src/mame/drivers/a5105.cpp | 3 +- src/mame/drivers/a51xx.cpp | 6 +- src/mame/drivers/a6809.cpp | 3 +- src/mame/drivers/a7150.cpp | 3 +- src/mame/drivers/a7800.cpp | 6 +- src/mame/drivers/aa310.cpp | 42 ++- src/mame/drivers/abc1600.cpp | 2 +- src/mame/drivers/abc80.cpp | 2 +- src/mame/drivers/abc80x.cpp | 11 +- src/mame/drivers/ac1.cpp | 4 +- src/mame/drivers/accomm.cpp | 3 +- src/mame/drivers/acd.cpp | 3 +- src/mame/drivers/ace.cpp | 3 +- src/mame/drivers/aceex.cpp | 3 +- src/mame/drivers/acefruit.cpp | 3 +- src/mame/drivers/aces1.cpp | 3 +- src/mame/drivers/acesp.cpp | 3 +- src/mame/drivers/acommand.cpp | 3 +- src/mame/drivers/acrnsys1.cpp | 3 +- src/mame/drivers/actfancr.cpp | 4 +- src/mame/drivers/acvirus.cpp | 3 +- src/mame/drivers/adam.cpp | 2 +- src/mame/drivers/adp.cpp | 18 +- src/mame/drivers/advision.cpp | 2 +- src/mame/drivers/aeroboto.cpp | 2 +- src/mame/drivers/aerofgt.cpp | 28 +- src/mame/drivers/agat.cpp | 3 +- src/mame/drivers/age_candy.cpp | 3 +- src/mame/drivers/aim65.cpp | 2 +- src/mame/drivers/aim65_40.cpp | 3 +- src/mame/drivers/airbustr.cpp | 4 +- src/mame/drivers/airraid.cpp | 6 +- src/mame/drivers/ajax.cpp | 2 +- src/mame/drivers/akaiax80.cpp | 3 +- src/mame/drivers/albazc.cpp | 3 +- src/mame/drivers/albazg.cpp | 3 +- src/mame/drivers/aleck64.cpp | 6 +- src/mame/drivers/aleisttl.cpp | 3 +- src/mame/drivers/alesis.cpp | 6 +- src/mame/drivers/alesis_qs.cpp | 3 +- src/mame/drivers/alg.cpp | 9 +- src/mame/drivers/alien.cpp | 3 +- src/mame/drivers/aliens.cpp | 2 +- src/mame/drivers/alinvade.cpp | 3 +- src/mame/drivers/allied.cpp | 3 +- src/mame/drivers/alpha68k.cpp | 20 +- src/mame/drivers/alphasma.cpp | 6 +- src/mame/drivers/alphatpx.cpp | 9 +- src/mame/drivers/alphatro.cpp | 3 +- src/mame/drivers/altair.cpp | 3 +- src/mame/drivers/alto1.cpp | 3 +- src/mame/drivers/alto2.cpp | 3 +- src/mame/drivers/altos2.cpp | 3 +- src/mame/drivers/altos486.cpp | 3 +- src/mame/drivers/altos5.cpp | 3 +- src/mame/drivers/altos8600.cpp | 3 +- src/mame/drivers/alvg.cpp | 3 +- src/mame/drivers/amaticmg.cpp | 9 +- src/mame/drivers/ambush.cpp | 9 +- src/mame/drivers/amerihok.cpp | 3 +- src/mame/drivers/amico2k.cpp | 3 +- src/mame/drivers/amiga.cpp | 74 ++-- src/mame/drivers/ampex.cpp | 3 +- src/mame/drivers/ampoker2.cpp | 4 +- src/mame/drivers/ampro.cpp | 3 +- src/mame/drivers/ampscarp.cpp | 3 +- src/mame/drivers/amspdwy.cpp | 2 +- src/mame/drivers/amstr_pc.cpp | 20 +- src/mame/drivers/amstrad.cpp | 18 +- src/mame/drivers/amusco.cpp | 6 +- src/mame/drivers/amust.cpp | 3 +- src/mame/drivers/anes.cpp | 3 +- src/mame/drivers/angelkds.cpp | 4 +- src/mame/drivers/anzterm.cpp | 3 +- src/mame/drivers/apc.cpp | 3 +- src/mame/drivers/apexc.cpp | 3 +- src/mame/drivers/apf.cpp | 6 +- src/mame/drivers/apogee.cpp | 3 +- src/mame/drivers/apollo.cpp | 24 +- src/mame/drivers/apple1.cpp | 3 +- src/mame/drivers/apple2.cpp | 15 +- src/mame/drivers/apple2e.cpp | 39 ++- src/mame/drivers/apple2gs.cpp | 4 +- src/mame/drivers/apple3.cpp | 2 +- src/mame/drivers/applix.cpp | 3 +- src/mame/drivers/appoooh.cpp | 8 +- src/mame/drivers/apricot.cpp | 6 +- src/mame/drivers/apricotf.cpp | 3 +- src/mame/drivers/apricotp.cpp | 3 +- src/mame/drivers/aquarium.cpp | 2 +- src/mame/drivers/aquarius.cpp | 2 +- src/mame/drivers/arabian.cpp | 2 +- src/mame/drivers/arachnid.cpp | 3 +- src/mame/drivers/arcadecl.cpp | 4 +- src/mame/drivers/arcadia.cpp | 2 +- src/mame/drivers/argo.cpp | 3 +- src/mame/drivers/argox.cpp | 3 +- src/mame/drivers/argus.cpp | 6 +- src/mame/drivers/aristmk4.cpp | 11 +- src/mame/drivers/aristmk5.cpp | 12 +- src/mame/drivers/aristmk6.cpp | 3 +- src/mame/drivers/arkanoid.cpp | 16 +- src/mame/drivers/armedf.cpp | 20 +- src/mame/drivers/arsystems.cpp | 6 +- src/mame/drivers/artmagic.cpp | 8 +- src/mame/drivers/ashnojoe.cpp | 2 +- src/mame/drivers/asst128.cpp | 3 +- src/mame/drivers/asterix.cpp | 2 +- src/mame/drivers/asteroid.cpp | 11 +- src/mame/drivers/astinvad.cpp | 9 +- src/mame/drivers/astrafr.cpp | 33 +- src/mame/drivers/astrcorp.cpp | 12 +- src/mame/drivers/astrocde.cpp | 26 +- src/mame/drivers/astrof.cpp | 10 +- src/mame/drivers/astrohome.cpp | 3 +- src/mame/drivers/astropc.cpp | 3 +- src/mame/drivers/asuka.cpp | 12 +- src/mame/drivers/at.cpp | 90 +++-- src/mame/drivers/atari400.cpp | 39 ++- src/mame/drivers/atari_s1.cpp | 9 +- src/mame/drivers/atari_s2.cpp | 6 +- src/mame/drivers/atarifb.cpp | 8 +- src/mame/drivers/atarig1.cpp | 16 +- src/mame/drivers/atarig42.cpp | 6 +- src/mame/drivers/atarigt.cpp | 8 +- src/mame/drivers/atarigx2.cpp | 6 +- src/mame/drivers/atarist.cpp | 16 +- src/mame/drivers/atarisy1.cpp | 14 +- src/mame/drivers/atarisy2.cpp | 24 +- src/mame/drivers/atarisy4.cpp | 6 +- src/mame/drivers/atarittl.cpp | 6 +- src/mame/drivers/atetris.cpp | 6 +- src/mame/drivers/atlantis.cpp | 3 +- src/mame/drivers/atm.cpp | 6 +- src/mame/drivers/atom.cpp | 6 +- src/mame/drivers/atpci.cpp | 29 +- src/mame/drivers/atronic.cpp | 3 +- src/mame/drivers/att4425.cpp | 3 +- src/mame/drivers/att630.cpp | 3 +- src/mame/drivers/attache.cpp | 6 +- src/mame/drivers/attckufo.cpp | 3 +- src/mame/drivers/atvtrack.cpp | 6 +- src/mame/drivers/aussiebyte.cpp | 2 +- src/mame/drivers/avalnche.cpp | 10 +- src/mame/drivers/avigo.cpp | 2 +- src/mame/drivers/avt.cpp | 6 +- src/mame/drivers/ax20.cpp | 3 +- src/mame/drivers/aztarac.cpp | 2 +- src/mame/drivers/b16.cpp | 3 +- src/mame/drivers/b2m.cpp | 4 +- src/mame/drivers/babbage.cpp | 3 +- src/mame/drivers/backfire.cpp | 3 +- src/mame/drivers/badlands.cpp | 4 +- src/mame/drivers/bagman.cpp | 12 +- src/mame/drivers/bailey.cpp | 3 +- src/mame/drivers/balsente.cpp | 4 +- src/mame/drivers/banctec.cpp | 3 +- src/mame/drivers/bankp.cpp | 2 +- src/mame/drivers/baraduke.cpp | 2 +- src/mame/drivers/barata.cpp | 3 +- src/mame/drivers/barni.cpp | 3 +- src/mame/drivers/bartop52.cpp | 3 +- src/mame/drivers/basic52.cpp | 6 +- src/mame/drivers/batman.cpp | 2 +- src/mame/drivers/battlane.cpp | 2 +- src/mame/drivers/battlera.cpp | 2 +- src/mame/drivers/battlex.cpp | 4 +- src/mame/drivers/battlnts.cpp | 2 +- src/mame/drivers/bbc.cpp | 54 +-- src/mame/drivers/bbcbc.cpp | 3 +- src/mame/drivers/bbusters.cpp | 4 +- src/mame/drivers/bcs3.cpp | 9 +- src/mame/drivers/beaminv.cpp | 3 +- src/mame/drivers/beathead.cpp | 2 +- src/mame/drivers/bebox.cpp | 18 +- src/mame/drivers/beehive.cpp | 3 +- src/mame/drivers/beezer.cpp | 3 +- src/mame/drivers/belatra.cpp | 3 +- src/mame/drivers/berzerk.cpp | 6 +- src/mame/drivers/besta.cpp | 3 +- src/mame/drivers/bestleag.cpp | 6 +- src/mame/drivers/beta.cpp | 3 +- src/mame/drivers/bfcobra.cpp | 3 +- src/mame/drivers/bfm_ad5.cpp | 2 +- src/mame/drivers/bfm_ad5sw.hxx | 1 - src/mame/drivers/bfm_sc1.cpp | 9 +- src/mame/drivers/bfm_sc2.cpp | 30 +- src/mame/drivers/bfm_sc4.cpp | 48 +-- src/mame/drivers/bfm_sc5.cpp | 2 +- src/mame/drivers/bfm_sc5sw.hxx | 1 - src/mame/drivers/bfm_swp.cpp | 3 +- src/mame/drivers/bfmsys83.cpp | 3 +- src/mame/drivers/bfmsys85.cpp | 3 +- src/mame/drivers/bgt.cpp | 3 +- src/mame/drivers/big10.cpp | 3 +- src/mame/drivers/bigbord2.cpp | 3 +- src/mame/drivers/bigevglf.cpp | 2 +- src/mame/drivers/bigstrkb.cpp | 2 +- src/mame/drivers/binbug.cpp | 6 +- src/mame/drivers/bingo.cpp | 9 +- src/mame/drivers/bingoc.cpp | 3 +- src/mame/drivers/bingoman.cpp | 3 +- src/mame/drivers/bingor.cpp | 9 +- src/mame/drivers/bingowav.cpp | 3 +- src/mame/drivers/bionicc.cpp | 2 +- src/mame/drivers/bishi.cpp | 4 +- src/mame/drivers/bitgraph.cpp | 11 +- src/mame/drivers/bk.cpp | 4 +- src/mame/drivers/bking.cpp | 4 +- src/mame/drivers/blackt96.cpp | 3 +- src/mame/drivers/bladestl.cpp | 2 +- src/mame/drivers/blitz68k.cpp | 27 +- src/mame/drivers/blktiger.cpp | 4 +- src/mame/drivers/blmbycar.cpp | 4 +- src/mame/drivers/blockade.cpp | 3 +- src/mame/drivers/blockhl.cpp | 3 +- src/mame/drivers/blockout.cpp | 4 +- src/mame/drivers/bloodbro.cpp | 6 +- src/mame/drivers/blstroid.cpp | 2 +- src/mame/drivers/blueprnt.cpp | 4 +- src/mame/drivers/bmcbowl.cpp | 3 +- src/mame/drivers/bmcpokr.cpp | 6 +- src/mame/drivers/bmjr.cpp | 3 +- src/mame/drivers/bml3.cpp | 12 +- src/mame/drivers/bnstars.cpp | 3 +- src/mame/drivers/bntyhunt.cpp | 3 +- src/mame/drivers/bob85.cpp | 3 +- src/mame/drivers/bogeyman.cpp | 2 +- src/mame/drivers/bombjack.cpp | 2 +- src/mame/drivers/boogwing.cpp | 2 +- src/mame/drivers/bottom9.cpp | 2 +- src/mame/drivers/bowltry.cpp | 3 +- src/mame/drivers/boxer.cpp | 3 +- src/mame/drivers/bpmmicro.cpp | 3 +- src/mame/drivers/br8641.cpp | 3 +- src/mame/drivers/brkthru.cpp | 4 +- src/mame/drivers/bsktball.cpp | 2 +- src/mame/drivers/btime.cpp | 20 +- src/mame/drivers/btoads.cpp | 2 +- src/mame/drivers/bublbobl.cpp | 14 +- src/mame/drivers/buggychl.cpp | 2 +- src/mame/drivers/bullet.cpp | 4 +- src/mame/drivers/busicom.cpp | 2 +- src/mame/drivers/buster.cpp | 3 +- src/mame/drivers/bw12.cpp | 6 +- src/mame/drivers/bw2.cpp | 2 +- src/mame/drivers/bwidow.cpp | 10 +- src/mame/drivers/bwing.cpp | 2 +- src/mame/drivers/by17.cpp | 3 +- src/mame/drivers/by35.cpp | 12 +- src/mame/drivers/by6803.cpp | 3 +- src/mame/drivers/by68701.cpp | 3 +- src/mame/drivers/byvid.cpp | 6 +- src/mame/drivers/bzone.cpp | 6 +- src/mame/drivers/c10.cpp | 3 +- src/mame/drivers/c128.cpp | 21 +- src/mame/drivers/c64.cpp | 27 +- src/mame/drivers/c64dtv.cpp | 3 +- src/mame/drivers/c65.cpp | 3 +- src/mame/drivers/c80.cpp | 2 +- src/mame/drivers/c900.cpp | 3 +- src/mame/drivers/cabal.cpp | 8 +- src/mame/drivers/cabaret.cpp | 3 +- src/mame/drivers/calchase.cpp | 6 +- src/mame/drivers/calcune.cpp | 3 +- src/mame/drivers/calomega.cpp | 8 +- src/mame/drivers/calorie.cpp | 6 +- src/mame/drivers/camplynx.cpp | 15 +- src/mame/drivers/candela.cpp | 6 +- src/mame/drivers/canon_s80.cpp | 3 +- src/mame/drivers/canyon.cpp | 2 +- src/mame/drivers/capbowl.cpp | 4 +- src/mame/drivers/capcom.cpp | 3 +- src/mame/drivers/capr1.cpp | 3 +- src/mame/drivers/caprcyc.cpp | 3 +- src/mame/drivers/cardline.cpp | 3 +- src/mame/drivers/carjmbre.cpp | 3 +- src/mame/drivers/carpolo.cpp | 2 +- src/mame/drivers/carrera.cpp | 3 +- src/mame/drivers/casloopy.cpp | 3 +- src/mame/drivers/castle.cpp | 6 +- src/mame/drivers/caswin.cpp | 3 +- src/mame/drivers/cat.cpp | 3 +- src/mame/drivers/cave.cpp | 40 +-- src/mame/drivers/cavepc.cpp | 3 +- src/mame/drivers/cb2001.cpp | 3 +- src/mame/drivers/cball.cpp | 3 +- src/mame/drivers/cbasebal.cpp | 2 +- src/mame/drivers/cbm2.cpp | 74 ++-- src/mame/drivers/cbuster.cpp | 2 +- src/mame/drivers/cc40.cpp | 3 +- src/mame/drivers/ccastles.cpp | 2 +- src/mame/drivers/cchance.cpp | 3 +- src/mame/drivers/cchasm.cpp | 2 +- src/mame/drivers/cclimber.cpp | 20 +- src/mame/drivers/ccs2810.cpp | 6 +- src/mame/drivers/ccs300.cpp | 3 +- src/mame/drivers/cd2650.cpp | 3 +- src/mame/drivers/cdc721.cpp | 3 +- src/mame/drivers/cdi.cpp | 18 +- src/mame/drivers/cedar_magnet.cpp | 3 +- src/mame/drivers/centiped.cpp | 20 +- src/mame/drivers/cesclass.cpp | 3 +- src/mame/drivers/cfx9850.cpp | 3 +- src/mame/drivers/cgc7900.cpp | 2 +- src/mame/drivers/cgenie.cpp | 3 +- src/mame/drivers/chaknpop.cpp | 2 +- src/mame/drivers/cham24.cpp | 3 +- src/mame/drivers/champbas.cpp | 18 +- src/mame/drivers/champbwl.cpp | 6 +- src/mame/drivers/chanbara.cpp | 3 +- src/mame/drivers/chance32.cpp | 3 +- src/mame/drivers/changela.cpp | 2 +- src/mame/drivers/channelf.cpp | 10 +- src/mame/drivers/chaos.cpp | 3 +- src/mame/drivers/cheekyms.cpp | 2 +- src/mame/drivers/chessmst.cpp | 9 +- src/mame/drivers/chesstrv.cpp | 6 +- src/mame/drivers/chexx.cpp | 6 +- src/mame/drivers/chicago.cpp | 3 +- src/mame/drivers/chihiro.cpp | 18 +- src/mame/drivers/chinagat.cpp | 9 +- src/mame/drivers/chinsan.cpp | 6 +- src/mame/drivers/chqflag.cpp | 2 +- src/mame/drivers/chsuper.cpp | 3 +- src/mame/drivers/cidelsa.cpp | 8 +- src/mame/drivers/cinemat.cpp | 48 +-- src/mame/drivers/circus.cpp | 8 +- src/mame/drivers/circusc.cpp | 2 +- src/mame/drivers/cischeat.cpp | 16 +- src/mame/drivers/cit220.cpp | 3 +- src/mame/drivers/citycon.cpp | 2 +- src/mame/drivers/ckz80.cpp | 3 +- src/mame/drivers/clayshoo.cpp | 3 +- src/mame/drivers/clcd.cpp | 3 +- src/mame/drivers/cliffhgr.cpp | 3 +- src/mame/drivers/cloak.cpp | 2 +- src/mame/drivers/cloud9.cpp | 2 +- src/mame/drivers/clowndwn.cpp | 3 +- src/mame/drivers/clpoker.cpp | 3 +- src/mame/drivers/clshroad.cpp | 4 +- src/mame/drivers/cm1800.cpp | 3 +- src/mame/drivers/cmi.cpp | 5 +- src/mame/drivers/cmmb.cpp | 3 +- src/mame/drivers/cninja.cpp | 14 +- src/mame/drivers/cntsteer.cpp | 6 +- src/mame/drivers/cobra.cpp | 3 +- src/mame/drivers/coco12.cpp | 18 +- src/mame/drivers/coco3.cpp | 8 +- src/mame/drivers/cocoloco.cpp | 3 +- src/mame/drivers/codata.cpp | 3 +- src/mame/drivers/coinmstr.cpp | 18 +- src/mame/drivers/coinmvga.cpp | 3 +- src/mame/drivers/coleco.cpp | 8 +- src/mame/drivers/combatsc.cpp | 4 +- src/mame/drivers/comebaby.cpp | 3 +- src/mame/drivers/commando.cpp | 2 +- src/mame/drivers/compc.cpp | 6 +- src/mame/drivers/compgolf.cpp | 2 +- src/mame/drivers/compis.cpp | 6 +- src/mame/drivers/compucolor.cpp | 3 +- src/mame/drivers/comquest.cpp | 2 +- src/mame/drivers/comx35.cpp | 4 +- src/mame/drivers/concept.cpp | 2 +- src/mame/drivers/contra.cpp | 2 +- src/mame/drivers/controlid.cpp | 3 +- src/mame/drivers/coolpool.cpp | 22 +- src/mame/drivers/coolridr.cpp | 6 +- src/mame/drivers/cop01.cpp | 4 +- src/mame/drivers/cops.cpp | 6 +- src/mame/drivers/copsnrob.cpp | 2 +- src/mame/drivers/corona.cpp | 15 +- src/mame/drivers/cortex.cpp | 3 +- src/mame/drivers/cosmic.cpp | 14 +- src/mame/drivers/cosmicos.cpp | 2 +- src/mame/drivers/cp1.cpp | 3 +- src/mame/drivers/cps1.cpp | 18 +- src/mame/drivers/cps2.cpp | 6 +- src/mame/drivers/cps3.cpp | 28 +- src/mame/drivers/craft.cpp | 3 +- src/mame/drivers/crbaloon.cpp | 2 +- src/mame/drivers/crgolf.cpp | 6 +- src/mame/drivers/crimfght.cpp | 2 +- src/mame/drivers/crospang.cpp | 6 +- src/mame/drivers/crshrace.cpp | 2 +- src/mame/drivers/crvision.cpp | 8 +- src/mame/drivers/crystal.cpp | 12 +- src/mame/drivers/csplayh5.cpp | 3 +- src/mame/drivers/cswat.cpp | 3 +- src/mame/drivers/ct486.cpp | 3 +- src/mame/drivers/cubeqst.cpp | 3 +- src/mame/drivers/cubo.cpp | 3 +- src/mame/drivers/cultures.cpp | 3 +- src/mame/drivers/cupidon.cpp | 3 +- src/mame/drivers/cv1k.cpp | 6 +- src/mame/drivers/cvicny.cpp | 3 +- src/mame/drivers/cvs.cpp | 2 +- src/mame/drivers/cxgz80.cpp | 3 +- src/mame/drivers/cxhumax.cpp | 2 +- src/mame/drivers/cyberbal.cpp | 6 +- src/mame/drivers/cybertnk.cpp | 3 +- src/mame/drivers/cybiko.cpp | 6 +- src/mame/drivers/cybstorm.cpp | 4 +- src/mame/drivers/cyclemb.cpp | 6 +- src/mame/drivers/czk80.cpp | 3 +- src/mame/drivers/d400.cpp | 3 +- src/mame/drivers/d6800.cpp | 3 +- src/mame/drivers/d6809.cpp | 3 +- src/mame/drivers/d9final.cpp | 3 +- src/mame/drivers/dacholer.cpp | 6 +- src/mame/drivers/dai.cpp | 2 +- src/mame/drivers/dai3wksi.cpp | 3 +- src/mame/drivers/dambustr.cpp | 3 +- src/mame/drivers/darius.cpp | 2 +- src/mame/drivers/darkmist.cpp | 2 +- src/mame/drivers/darkseal.cpp | 2 +- src/mame/drivers/daruma.cpp | 3 +- src/mame/drivers/dassault.cpp | 2 +- src/mame/drivers/datum.cpp | 3 +- src/mame/drivers/dblcrown.cpp | 3 +- src/mame/drivers/dblewing.cpp | 3 +- src/mame/drivers/dbox.cpp | 4 +- src/mame/drivers/dbz.cpp | 2 +- src/mame/drivers/dccons.cpp | 9 +- src/mame/drivers/dcheese.cpp | 4 +- src/mame/drivers/dcon.cpp | 4 +- src/mame/drivers/dct11em.cpp | 3 +- src/mame/drivers/dday.cpp | 2 +- src/mame/drivers/ddayjlc.cpp | 3 +- src/mame/drivers/ddealer.cpp | 3 +- src/mame/drivers/ddenlovr.cpp | 105 ++++-- src/mame/drivers/ddragon.cpp | 14 +- src/mame/drivers/ddragon3.cpp | 10 +- src/mame/drivers/ddribble.cpp | 2 +- src/mame/drivers/de_2.cpp | 15 +- src/mame/drivers/de_3.cpp | 9 +- src/mame/drivers/de_3b.cpp | 10 +- src/mame/drivers/deadang.cpp | 2 +- src/mame/drivers/dec0.cpp | 34 +- src/mame/drivers/dec8.cpp | 20 +- src/mame/drivers/deco156.cpp | 6 +- src/mame/drivers/deco32.cpp | 20 +- src/mame/drivers/deco_ld.cpp | 3 +- src/mame/drivers/deco_mlc.cpp | 8 +- src/mame/drivers/decocass.cpp | 64 ++-- src/mame/drivers/dectalk.cpp | 3 +- src/mame/drivers/decwritr.cpp | 3 +- src/mame/drivers/deniam.cpp | 4 +- src/mame/drivers/deshoros.cpp | 3 +- src/mame/drivers/destroyr.cpp | 3 +- src/mame/drivers/dfruit.cpp | 3 +- src/mame/drivers/dgn_beta.cpp | 2 +- src/mame/drivers/dgpix.cpp | 3 +- src/mame/drivers/didact.cpp | 6 +- src/mame/drivers/dietgo.cpp | 2 +- src/mame/drivers/digel804.cpp | 6 +- src/mame/drivers/digijet.cpp | 3 +- src/mame/drivers/dim68k.cpp | 3 +- src/mame/drivers/discoboy.cpp | 3 +- src/mame/drivers/divebomb.cpp | 2 +- src/mame/drivers/diverboy.cpp | 3 +- src/mame/drivers/djboy.cpp | 2 +- src/mame/drivers/djmain.cpp | 6 +- src/mame/drivers/dkong.cpp | 30 +- src/mame/drivers/dlair.cpp | 12 +- src/mame/drivers/dlair2.cpp | 3 +- src/mame/drivers/dm7000.cpp | 2 +- src/mame/drivers/dmax8000.cpp | 3 +- src/mame/drivers/dmndrby.cpp | 3 +- src/mame/drivers/dms5000.cpp | 3 +- src/mame/drivers/dms86.cpp | 3 +- src/mame/drivers/dmv.cpp | 3 +- src/mame/drivers/docastle.cpp | 6 +- src/mame/drivers/dogfgt.cpp | 2 +- src/mame/drivers/dolphunk.cpp | 3 +- src/mame/drivers/dominob.cpp | 3 +- src/mame/drivers/dooyong.cpp | 40 ++- src/mame/drivers/dorachan.cpp | 3 +- src/mame/drivers/dotrikun.cpp | 3 +- src/mame/drivers/dps1.cpp | 3 +- src/mame/drivers/dragon.cpp | 14 +- src/mame/drivers/dragrace.cpp | 2 +- src/mame/drivers/dreambal.cpp | 3 +- src/mame/drivers/dreamwld.cpp | 6 +- src/mame/drivers/drgnmst.cpp | 2 +- src/mame/drivers/dribling.cpp | 2 +- src/mame/drivers/drmicro.cpp | 2 +- src/mame/drivers/drtomy.cpp | 3 +- src/mame/drivers/drw80pkr.cpp | 3 +- src/mame/drivers/dsb46.cpp | 3 +- src/mame/drivers/dual68.cpp | 3 +- src/mame/drivers/dunhuang.cpp | 3 +- src/mame/drivers/dvk_kcgd.cpp | 3 +- src/mame/drivers/dvk_ksm.cpp | 3 +- src/mame/drivers/dwarfd.cpp | 9 +- src/mame/drivers/dynadice.cpp | 3 +- src/mame/drivers/dynax.cpp | 42 +-- src/mame/drivers/dynduke.cpp | 4 +- src/mame/drivers/e100.cpp | 3 +- src/mame/drivers/eacc.cpp | 3 +- src/mame/drivers/ec184x.cpp | 9 +- src/mame/drivers/ec65.cpp | 6 +- src/mame/drivers/ecoinf1.cpp | 3 +- src/mame/drivers/ecoinf2.cpp | 3 +- src/mame/drivers/ecoinf3.cpp | 3 +- src/mame/drivers/ecoinfr.cpp | 3 +- src/mame/drivers/egghunt.cpp | 3 +- src/mame/drivers/einstein.cpp | 3 +- src/mame/drivers/electra.cpp | 3 +- src/mame/drivers/electron.cpp | 4 +- src/mame/drivers/elekscmp.cpp | 3 +- src/mame/drivers/elektronmono.cpp | 3 +- src/mame/drivers/elf.cpp | 2 +- src/mame/drivers/elwro800.cpp | 3 +- src/mame/drivers/embargo.cpp | 3 +- src/mame/drivers/enigma2.cpp | 6 +- src/mame/drivers/enmirage.cpp | 3 +- src/mame/drivers/eolith.cpp | 6 +- src/mame/drivers/eolith16.cpp | 3 +- src/mame/drivers/ep64.cpp | 6 +- src/mame/drivers/epos.cpp | 4 +- src/mame/drivers/eprom.cpp | 6 +- src/mame/drivers/equites.cpp | 10 +- src/mame/drivers/ertictac.cpp | 3 +- src/mame/drivers/esd16.cpp | 12 +- src/mame/drivers/esh.cpp | 3 +- src/mame/drivers/espial.cpp | 4 +- src/mame/drivers/esprit.cpp | 6 +- src/mame/drivers/esq1.cpp | 6 +- src/mame/drivers/esq5505.cpp | 15 +- src/mame/drivers/esqasr.cpp | 6 +- src/mame/drivers/esqkt.cpp | 3 +- src/mame/drivers/esqmr.cpp | 3 +- src/mame/drivers/esripsys.cpp | 2 +- src/mame/drivers/et3400.cpp | 3 +- src/mame/drivers/eti660.cpp | 2 +- src/mame/drivers/ettrivia.cpp | 3 +- src/mame/drivers/eurocom2.cpp | 6 +- src/mame/drivers/europc.cpp | 24 +- src/mame/drivers/eva.cpp | 10 +- src/mame/drivers/evmbug.cpp | 3 +- src/mame/drivers/excali64.cpp | 3 +- src/mame/drivers/exedexes.cpp | 2 +- src/mame/drivers/exelv.cpp | 6 +- src/mame/drivers/exerion.cpp | 2 +- src/mame/drivers/exidy.cpp | 21 +- src/mame/drivers/exidy440.cpp | 4 +- src/mame/drivers/exidyttl.cpp | 6 +- src/mame/drivers/exp85.cpp | 2 +- src/mame/drivers/expro02.cpp | 27 +- src/mame/drivers/exprraid.cpp | 4 +- src/mame/drivers/exterm.cpp | 2 +- src/mame/drivers/extrema.cpp | 3 +- src/mame/drivers/exzisus.cpp | 2 +- src/mame/drivers/ez2d.cpp | 3 +- src/mame/drivers/f-32.cpp | 6 +- src/mame/drivers/f1gp.cpp | 6 +- src/mame/drivers/famibox.cpp | 3 +- src/mame/drivers/fantland.cpp | 8 +- src/mame/drivers/fanucs15.cpp | 3 +- src/mame/drivers/fanucspmg.cpp | 6 +- src/mame/drivers/fastfred.cpp | 6 +- src/mame/drivers/fastinvaders.cpp | 9 +- src/mame/drivers/fastlane.cpp | 2 +- src/mame/drivers/fb01.cpp | 3 +- src/mame/drivers/fc100.cpp | 3 +- src/mame/drivers/fccpu20.cpp | 21 +- src/mame/drivers/fccpu30.cpp | 30 +- src/mame/drivers/fcombat.cpp | 2 +- src/mame/drivers/fcrash.cpp | 24 +- src/mame/drivers/feversoc.cpp | 3 +- src/mame/drivers/fgoal.cpp | 2 +- src/mame/drivers/fidel6502.cpp | 75 ++-- src/mame/drivers/fidel68k.cpp | 31 +- src/mame/drivers/fidelmcs48.cpp | 3 +- src/mame/drivers/fidelz80.cpp | 21 +- src/mame/drivers/finalizr.cpp | 2 +- src/mame/drivers/fireball.cpp | 3 +- src/mame/drivers/firebeat.cpp | 17 +- src/mame/drivers/firefox.cpp | 3 +- src/mame/drivers/firetrap.cpp | 4 +- src/mame/drivers/firetrk.cpp | 6 +- src/mame/drivers/fitfight.cpp | 4 +- src/mame/drivers/fk1.cpp | 3 +- src/mame/drivers/flicker.cpp | 3 +- src/mame/drivers/flipjack.cpp | 3 +- src/mame/drivers/flkatck.cpp | 2 +- src/mame/drivers/flower.cpp | 3 +- src/mame/drivers/flstory.cpp | 10 +- src/mame/drivers/flyball.cpp | 3 +- src/mame/drivers/fm7.cpp | 10 +- src/mame/drivers/fmtowns.cpp | 14 +- src/mame/drivers/fontwriter.cpp | 3 +- src/mame/drivers/foodf.cpp | 2 +- src/mame/drivers/force68k.cpp | 16 +- src/mame/drivers/forte2.cpp | 3 +- src/mame/drivers/fortecar.cpp | 3 +- src/mame/drivers/fp1100.cpp | 3 +- src/mame/drivers/fp200.cpp | 3 +- src/mame/drivers/fp6000.cpp | 3 +- src/mame/drivers/freekick.cpp | 16 +- src/mame/drivers/fresh.cpp | 3 +- src/mame/drivers/fromanc2.cpp | 6 +- src/mame/drivers/fromance.cpp | 6 +- src/mame/drivers/fruitpc.cpp | 11 +- src/mame/drivers/ft68m.cpp | 3 +- src/mame/drivers/fungames.cpp | 3 +- src/mame/drivers/funkball.cpp | 3 +- src/mame/drivers/funkybee.cpp | 2 +- src/mame/drivers/funkyjet.cpp | 2 +- src/mame/drivers/funtech.cpp | 3 +- src/mame/drivers/funworld.cpp | 28 +- src/mame/drivers/funybubl.cpp | 2 +- src/mame/drivers/fuukifg2.cpp | 2 +- src/mame/drivers/fuukifg3.cpp | 2 +- src/mame/drivers/g627.cpp | 3 +- src/mame/drivers/gaelco.cpp | 8 +- src/mame/drivers/gaelco2.cpp | 46 +-- src/mame/drivers/gaelco3d.cpp | 6 +- src/mame/drivers/gaelcopc.cpp | 3 +- src/mame/drivers/gaiden.cpp | 8 +- src/mame/drivers/gal3.cpp | 3 +- src/mame/drivers/galaga.cpp | 16 +- src/mame/drivers/galastrm.cpp | 2 +- src/mame/drivers/galaxi.cpp | 9 +- src/mame/drivers/galaxia.cpp | 4 +- src/mame/drivers/galaxian.cpp | 84 ++--- src/mame/drivers/galaxold.cpp | 52 +-- src/mame/drivers/galaxy.cpp | 4 +- src/mame/drivers/galeb.cpp | 2 +- src/mame/drivers/galgame.cpp | 3 +- src/mame/drivers/galgames.cpp | 18 +- src/mame/drivers/galivan.cpp | 6 +- src/mame/drivers/galpani2.cpp | 2 +- src/mame/drivers/galpani3.cpp | 3 +- src/mame/drivers/galpanic.cpp | 4 +- src/mame/drivers/galspnbl.cpp | 2 +- src/mame/drivers/gamate.cpp | 3 +- src/mame/drivers/gambl186.cpp | 10 +- src/mame/drivers/gamecom.cpp | 2 +- src/mame/drivers/gamecstl.cpp | 3 +- src/mame/drivers/gamecube.cpp | 3 +- src/mame/drivers/gameking.cpp | 9 +- src/mame/drivers/gameplan.cpp | 4 +- src/mame/drivers/gamepock.cpp | 2 +- src/mame/drivers/gammagic.cpp | 3 +- src/mame/drivers/gamtor.cpp | 10 +- src/mame/drivers/gaplus.cpp | 6 +- src/mame/drivers/gatron.cpp | 2 +- src/mame/drivers/gauntlet.cpp | 10 +- src/mame/drivers/gb.cpp | 12 +- src/mame/drivers/gba.cpp | 2 +- src/mame/drivers/gberet.cpp | 6 +- src/mame/drivers/gcpinbal.cpp | 2 +- src/mame/drivers/gei.cpp | 30 +- src/mame/drivers/geneve.cpp | 3 +- src/mame/drivers/geniusiq.cpp | 9 +- src/mame/drivers/genpc.cpp | 15 +- src/mame/drivers/ggconnie.cpp | 3 +- src/mame/drivers/ghosteo.cpp | 9 +- src/mame/drivers/giclassic.cpp | 6 +- src/mame/drivers/gijoe.cpp | 2 +- src/mame/drivers/gimix.cpp | 3 +- src/mame/drivers/ginganin.cpp | 2 +- src/mame/drivers/gizmondo.cpp | 3 +- src/mame/drivers/gkigt.cpp | 3 +- src/mame/drivers/gladiatr.cpp | 4 +- src/mame/drivers/glasgow.cpp | 9 +- src/mame/drivers/glass.cpp | 4 +- src/mame/drivers/globalfr.cpp | 3 +- src/mame/drivers/globalvr.cpp | 3 +- src/mame/drivers/gluck2.cpp | 3 +- src/mame/drivers/gmaster.cpp | 3 +- src/mame/drivers/gng.cpp | 4 +- src/mame/drivers/go2000.cpp | 3 +- src/mame/drivers/goal92.cpp | 2 +- src/mame/drivers/goindol.cpp | 2 +- src/mame/drivers/gokidetor.cpp | 3 +- src/mame/drivers/goldngam.cpp | 6 +- src/mame/drivers/goldnpkr.cpp | 39 ++- src/mame/drivers/goldstar.cpp | 70 ++-- src/mame/drivers/gomoku.cpp | 2 +- src/mame/drivers/good.cpp | 3 +- src/mame/drivers/goodejan.cpp | 6 +- src/mame/drivers/gotcha.cpp | 2 +- src/mame/drivers/gottlieb.cpp | 26 +- src/mame/drivers/gotya.cpp | 2 +- src/mame/drivers/goupil.cpp | 6 +- src/mame/drivers/gp2x.cpp | 3 +- src/mame/drivers/gp32.cpp | 2 +- src/mame/drivers/gp_1.cpp | 6 +- src/mame/drivers/gp_2.cpp | 3 +- src/mame/drivers/gpworld.cpp | 3 +- src/mame/drivers/gradius3.cpp | 2 +- src/mame/drivers/grchamp.cpp | 2 +- src/mame/drivers/grfd2301.cpp | 3 +- src/mame/drivers/gridcomp.cpp | 18 +- src/mame/drivers/gridlee.cpp | 2 +- src/mame/drivers/groundfx.cpp | 2 +- src/mame/drivers/gstream.cpp | 6 +- src/mame/drivers/gstriker.cpp | 6 +- src/mame/drivers/gsword.cpp | 4 +- src/mame/drivers/gticlub.cpp | 12 +- src/mame/drivers/gts1.cpp | 3 +- src/mame/drivers/gts3.cpp | 7 +- src/mame/drivers/gts3a.cpp | 7 +- src/mame/drivers/gts80.cpp | 12 +- src/mame/drivers/gts80a.cpp | 12 +- src/mame/drivers/gts80b.cpp | 18 +- src/mame/drivers/guab.cpp | 3 +- src/mame/drivers/gumbo.cpp | 6 +- src/mame/drivers/gunbustr.cpp | 2 +- src/mame/drivers/gundealr.cpp | 6 +- src/mame/drivers/gunpey.cpp | 3 +- src/mame/drivers/gunsmoke.cpp | 2 +- src/mame/drivers/gyruss.cpp | 2 +- src/mame/drivers/h19.cpp | 3 +- src/mame/drivers/h8.cpp | 3 +- src/mame/drivers/h89.cpp | 3 +- src/mame/drivers/halleys.cpp | 6 +- src/mame/drivers/hanaawas.cpp | 2 +- src/mame/drivers/hankin.cpp | 3 +- src/mame/drivers/hapyfish.cpp | 3 +- src/mame/drivers/harddriv.cpp | 78 +++-- src/mame/drivers/harriet.cpp | 3 +- src/mame/drivers/hazelgr.cpp | 3 +- src/mame/drivers/hazeltin.cpp | 3 +- src/mame/drivers/hcastle.cpp | 2 +- src/mame/drivers/headonb.cpp | 3 +- src/mame/drivers/hec2hrp.cpp | 12 +- src/mame/drivers/hexion.cpp | 4 +- src/mame/drivers/hh_amis2k.cpp | 3 +- src/mame/drivers/hh_cop400.cpp | 42 ++- src/mame/drivers/hh_hmcs40.cpp | 93 +++-- src/mame/drivers/hh_melps4.cpp | 6 +- src/mame/drivers/hh_pic16.cpp | 36 +- src/mame/drivers/hh_sm510.cpp | 153 +++++--- src/mame/drivers/hh_tms1k.cpp | 207 +++++++---- src/mame/drivers/hh_ucom4.cpp | 66 ++-- src/mame/drivers/hideseek.cpp | 3 +- src/mame/drivers/higemaru.cpp | 2 +- src/mame/drivers/highvdeo.cpp | 27 +- src/mame/drivers/hikaru.cpp | 3 +- src/mame/drivers/himesiki.cpp | 2 +- src/mame/drivers/hitme.cpp | 4 +- src/mame/drivers/hitpoker.cpp | 3 +- src/mame/drivers/hk68v10.cpp | 3 +- src/mame/drivers/hnayayoi.cpp | 6 +- src/mame/drivers/hng64.cpp | 5 +- src/mame/drivers/holeland.cpp | 4 +- src/mame/drivers/homedata.cpp | 12 +- src/mame/drivers/homelab.cpp | 9 +- src/mame/drivers/homerun.cpp | 6 +- src/mame/drivers/homez80.cpp | 3 +- src/mame/drivers/horizon.cpp | 6 +- src/mame/drivers/hornet.cpp | 15 +- src/mame/drivers/hotblock.cpp | 3 +- src/mame/drivers/hotstuff.cpp | 3 +- src/mame/drivers/hp16500.cpp | 12 +- src/mame/drivers/hp2100.cpp | 3 +- src/mame/drivers/hp2620.cpp | 3 +- src/mame/drivers/hp2640.cpp | 4 +- src/mame/drivers/hp48.cpp | 14 +- src/mame/drivers/hp49gp.cpp | 3 +- src/mame/drivers/hp64k.cpp | 3 +- src/mame/drivers/hp700.cpp | 3 +- src/mame/drivers/hp80.cpp | 3 +- src/mame/drivers/hp9845.cpp | 17 +- src/mame/drivers/hp9k.cpp | 3 +- src/mame/drivers/hp9k_3xx.cpp | 24 +- src/mame/drivers/hp_ipc.cpp | 3 +- src/mame/drivers/hprot1.cpp | 9 +- src/mame/drivers/hpz80unk.cpp | 3 +- src/mame/drivers/ht68k.cpp | 3 +- src/mame/drivers/huebler.cpp | 2 +- src/mame/drivers/hunter2.cpp | 3 +- src/mame/drivers/hvyunit.cpp | 3 +- src/mame/drivers/hx20.cpp | 4 +- src/mame/drivers/hyhoo.cpp | 4 +- src/mame/drivers/hyperscan.cpp | 3 +- src/mame/drivers/hyperspt.cpp | 40 ++- src/mame/drivers/hyprduel.cpp | 4 +- src/mame/drivers/i7000.cpp | 3 +- src/mame/drivers/ibm3153.cpp | 3 +- src/mame/drivers/ibm6580.cpp | 3 +- src/mame/drivers/ibmpc.cpp | 9 +- src/mame/drivers/ibmpcjr.cpp | 6 +- src/mame/drivers/icatel.cpp | 3 +- src/mame/drivers/ice_bozopail.cpp | 3 +- src/mame/drivers/ice_tbd.cpp | 3 +- src/mame/drivers/icecold.cpp | 3 +- src/mame/drivers/ichiban.cpp | 3 +- src/mame/drivers/idsa.cpp | 6 +- src/mame/drivers/ie15.cpp | 3 +- src/mame/drivers/if800.cpp | 3 +- src/mame/drivers/igs009.cpp | 6 +- src/mame/drivers/igs011.cpp | 30 +- src/mame/drivers/igs017.cpp | 30 +- src/mame/drivers/igs_fear.cpp | 3 +- src/mame/drivers/igs_m027.cpp | 6 +- src/mame/drivers/igs_m036.cpp | 6 +- src/mame/drivers/igspc.cpp | 3 +- src/mame/drivers/igspoker.cpp | 21 +- src/mame/drivers/ikki.cpp | 2 +- src/mame/drivers/imds.cpp | 3 +- src/mame/drivers/imds2.cpp | 2 +- src/mame/drivers/imolagp.cpp | 3 +- src/mame/drivers/imsai.cpp | 3 +- src/mame/drivers/inder.cpp | 12 +- src/mame/drivers/inderp.cpp | 3 +- src/mame/drivers/indiana.cpp | 3 +- src/mame/drivers/indigo.cpp | 16 +- src/mame/drivers/indy_indigo2.cpp | 23 +- src/mame/drivers/instantm.cpp | 3 +- src/mame/drivers/instruct.cpp | 3 +- src/mame/drivers/intellec4.cpp | 9 +- src/mame/drivers/interact.cpp | 6 +- src/mame/drivers/interpro.cpp | 37 +- src/mame/drivers/intrscti.cpp | 3 +- src/mame/drivers/intv.cpp | 10 +- src/mame/drivers/inufuku.cpp | 4 +- src/mame/drivers/invqix.cpp | 3 +- src/mame/drivers/ipc.cpp | 3 +- src/mame/drivers/ipds.cpp | 3 +- src/mame/drivers/iq151.cpp | 3 +- src/mame/drivers/iqblock.cpp | 2 +- src/mame/drivers/iris3130.cpp | 3 +- src/mame/drivers/irisha.cpp | 3 +- src/mame/drivers/irobot.cpp | 2 +- src/mame/drivers/ironhors.cpp | 4 +- src/mame/drivers/isbc.cpp | 18 +- src/mame/drivers/isbc8010.cpp | 9 +- src/mame/drivers/isbc8030.cpp | 3 +- src/mame/drivers/iskr103x.cpp | 6 +- src/mame/drivers/istellar.cpp | 3 +- src/mame/drivers/istrebiteli.cpp | 3 +- src/mame/drivers/iteagle.cpp | 36 +- src/mame/drivers/itech32.cpp | 10 +- src/mame/drivers/itech8.cpp | 38 +- src/mame/drivers/itgambl2.cpp | 3 +- src/mame/drivers/itgambl3.cpp | 3 +- src/mame/drivers/itgamble.cpp | 6 +- src/mame/drivers/itt3030.cpp | 3 +- src/mame/drivers/jack.cpp | 10 +- src/mame/drivers/jackal.cpp | 2 +- src/mame/drivers/jackie.cpp | 3 +- src/mame/drivers/jackpool.cpp | 3 +- src/mame/drivers/jade.cpp | 3 +- src/mame/drivers/jaguar.cpp | 10 +- src/mame/drivers/jailbrek.cpp | 2 +- src/mame/drivers/jalmah.cpp | 6 +- src/mame/drivers/jangou.cpp | 12 +- src/mame/drivers/jankenmn.cpp | 3 +- src/mame/drivers/jantotsu.cpp | 3 +- src/mame/drivers/jchan.cpp | 3 +- src/mame/drivers/jclub2.cpp | 9 +- src/mame/drivers/jedi.cpp | 2 +- src/mame/drivers/jeutel.cpp | 3 +- src/mame/drivers/joctronic.cpp | 9 +- src/mame/drivers/jokrwild.cpp | 3 +- src/mame/drivers/jollyjgr.cpp | 6 +- src/mame/drivers/jongkyo.cpp | 3 +- src/mame/drivers/jonos.cpp | 3 +- src/mame/drivers/joystand.cpp | 3 +- src/mame/drivers/jp.cpp | 6 +- src/mame/drivers/jpmimpct.cpp | 4 +- src/mame/drivers/jpmimpctsw.cpp | 1 - src/mame/drivers/jpmmps.cpp | 3 +- src/mame/drivers/jpms80.cpp | 3 +- src/mame/drivers/jpmsru.cpp | 6 +- src/mame/drivers/jpmsys5.cpp | 6 +- src/mame/drivers/jpmsys5sw.cpp | 2 - src/mame/drivers/jpmsys7.cpp | 3 +- src/mame/drivers/jr100.cpp | 3 +- src/mame/drivers/jr200.cpp | 3 +- src/mame/drivers/jrpacman.cpp | 3 +- src/mame/drivers/jtc.cpp | 15 +- src/mame/drivers/jubilee.cpp | 3 +- src/mame/drivers/juicebox.cpp | 3 +- src/mame/drivers/jungleyo.cpp | 3 +- src/mame/drivers/junior.cpp | 3 +- src/mame/drivers/junofrst.cpp | 3 +- src/mame/drivers/jupace.cpp | 3 +- src/mame/drivers/jupiter.cpp | 6 +- src/mame/drivers/jvh.cpp | 6 +- src/mame/drivers/k1003.cpp | 3 +- src/mame/drivers/k28.cpp | 3 +- src/mame/drivers/k8915.cpp | 3 +- src/mame/drivers/kaneko16.cpp | 24 +- src/mame/drivers/kangaroo.cpp | 4 +- src/mame/drivers/karnov.cpp | 8 +- src/mame/drivers/kas89.cpp | 3 +- src/mame/drivers/kaypro.cpp | 14 +- src/mame/drivers/kc.cpp | 6 +- src/mame/drivers/kchamp.cpp | 4 +- src/mame/drivers/kdt6.cpp | 3 +- src/mame/drivers/kenseim.cpp | 3 +- src/mame/drivers/kickgoal.cpp | 4 +- src/mame/drivers/kim1.cpp | 2 +- src/mame/drivers/kingdrby.cpp | 9 +- src/mame/drivers/kingobox.cpp | 4 +- src/mame/drivers/kingpin.cpp | 3 +- src/mame/drivers/kinst.cpp | 3 +- src/mame/drivers/kissproto.cpp | 3 +- src/mame/drivers/klax.cpp | 4 +- src/mame/drivers/kncljoe.cpp | 2 +- src/mame/drivers/koftball.cpp | 3 +- src/mame/drivers/koikoi.cpp | 3 +- src/mame/drivers/konamigq.cpp | 7 +- src/mame/drivers/konamigv.cpp | 31 +- src/mame/drivers/konamigx.cpp | 32 +- src/mame/drivers/konamim2.cpp | 10 +- src/mame/drivers/konendev.cpp | 3 +- src/mame/drivers/konin.cpp | 3 +- src/mame/drivers/konmedal.cpp | 9 +- src/mame/drivers/kontest.cpp | 3 +- src/mame/drivers/kopunch.cpp | 2 +- src/mame/drivers/kramermc.cpp | 2 +- src/mame/drivers/kron.cpp | 3 +- src/mame/drivers/krz2000.cpp | 3 +- src/mame/drivers/ksayakyu.cpp | 2 +- src/mame/drivers/ksys573.cpp | 199 +++++++---- src/mame/drivers/kungfur.cpp | 3 +- src/mame/drivers/kurukuru.cpp | 6 +- src/mame/drivers/kyocera.cpp | 12 +- src/mame/drivers/kyugo.cpp | 12 +- src/mame/drivers/labyrunr.cpp | 2 +- src/mame/drivers/ladybug.cpp | 4 +- src/mame/drivers/ladyfrog.cpp | 4 +- src/mame/drivers/laser3k.cpp | 3 +- src/mame/drivers/laserbas.cpp | 3 +- src/mame/drivers/laserbat.cpp | 6 +- src/mame/drivers/lasso.cpp | 10 +- src/mame/drivers/lastbank.cpp | 3 +- src/mame/drivers/lastduel.cpp | 4 +- src/mame/drivers/lastfght.cpp | 3 +- src/mame/drivers/laz_aftrshok.cpp | 3 +- src/mame/drivers/laz_awetoss.cpp | 3 +- src/mame/drivers/laz_ribrac.cpp | 3 +- src/mame/drivers/lazercmd.cpp | 6 +- src/mame/drivers/lb186.cpp | 13 +- src/mame/drivers/lbeach.cpp | 3 +- src/mame/drivers/lc80.cpp | 4 +- src/mame/drivers/lcmate2.cpp | 3 +- src/mame/drivers/ldplayer.cpp | 10 +- src/mame/drivers/leapster.cpp | 3 +- src/mame/drivers/learnwin.cpp | 3 +- src/mame/drivers/legionna.cpp | 14 +- src/mame/drivers/leland.cpp | 12 +- src/mame/drivers/lemmings.cpp | 2 +- src/mame/drivers/lethal.cpp | 4 +- src/mame/drivers/lethalj.cpp | 4 +- src/mame/drivers/lft.cpp | 3 +- src/mame/drivers/lg-dvd.cpp | 3 +- src/mame/drivers/lgp.cpp | 3 +- src/mame/drivers/liberate.cpp | 12 +- src/mame/drivers/liberatr.cpp | 4 +- src/mame/drivers/lilith.cpp | 3 +- src/mame/drivers/limenko.cpp | 6 +- src/mame/drivers/lindbergh.cpp | 3 +- src/mame/drivers/lisa.cpp | 6 +- src/mame/drivers/littlerb.cpp | 3 +- src/mame/drivers/lkage.cpp | 4 +- src/mame/drivers/llc.cpp | 4 +- src/mame/drivers/lockon.cpp | 2 +- src/mame/drivers/lola8a.cpp | 3 +- src/mame/drivers/looping.cpp | 3 +- src/mame/drivers/lordgun.cpp | 4 +- src/mame/drivers/lsasquad.cpp | 6 +- src/mame/drivers/ltcasino.cpp | 3 +- src/mame/drivers/ltd.cpp | 6 +- src/mame/drivers/luckgrln.cpp | 6 +- src/mame/drivers/lucky74.cpp | 2 +- src/mame/drivers/luckybal.cpp | 4 +- src/mame/drivers/lvcards.cpp | 6 +- src/mame/drivers/lviv.cpp | 2 +- src/mame/drivers/lwings.cpp | 10 +- src/mame/drivers/lwriter.cpp | 3 +- src/mame/drivers/lynx.cpp | 2 +- src/mame/drivers/m10.cpp | 8 +- src/mame/drivers/m107.cpp | 8 +- src/mame/drivers/m14.cpp | 3 +- src/mame/drivers/m20.cpp | 3 +- src/mame/drivers/m24.cpp | 16 +- src/mame/drivers/m3.cpp | 3 +- src/mame/drivers/m5.cpp | 8 +- src/mame/drivers/m52.cpp | 4 +- src/mame/drivers/m57.cpp | 2 +- src/mame/drivers/m58.cpp | 2 +- src/mame/drivers/m62.cpp | 24 +- src/mame/drivers/m63.cpp | 9 +- src/mame/drivers/m6805evs.cpp | 3 +- src/mame/drivers/m68705prg.cpp | 22 +- src/mame/drivers/m72.cpp | 32 +- src/mame/drivers/m79152pc.cpp | 3 +- src/mame/drivers/m79amb.cpp | 2 +- src/mame/drivers/m90.cpp | 20 +- src/mame/drivers/m92.cpp | 32 +- src/mame/drivers/mac.cpp | 60 ++-- src/mame/drivers/mac128.cpp | 9 +- src/mame/drivers/macp.cpp | 9 +- src/mame/drivers/macpci.cpp | 2 +- src/mame/drivers/macrossp.cpp | 4 +- src/mame/drivers/macs.cpp | 3 +- src/mame/drivers/madalien.cpp | 2 +- src/mame/drivers/madmotor.cpp | 2 +- src/mame/drivers/magic10.cpp | 15 +- src/mame/drivers/magicard.cpp | 6 +- src/mame/drivers/magicfly.cpp | 11 +- src/mame/drivers/magictg.cpp | 3 +- src/mame/drivers/magmax.cpp | 2 +- src/mame/drivers/magnum.cpp | 3 +- src/mame/drivers/magreel.cpp | 3 +- src/mame/drivers/magtouch.cpp | 11 +- src/mame/drivers/mainevt.cpp | 4 +- src/mame/drivers/mainsnk.cpp | 2 +- src/mame/drivers/majorpkr.cpp | 3 +- src/mame/drivers/malzak.cpp | 4 +- src/mame/drivers/manohman.cpp | 3 +- src/mame/drivers/mappy.cpp | 20 +- src/mame/drivers/marineb.cpp | 14 +- src/mame/drivers/marinedt.cpp | 3 +- src/mame/drivers/mario.cpp | 6 +- src/mame/drivers/markham.cpp | 2 +- src/mame/drivers/marywu.cpp | 3 +- src/mame/drivers/mastboy.cpp | 3 +- src/mame/drivers/matmania.cpp | 4 +- src/mame/drivers/maxaflex.cpp | 3 +- src/mame/drivers/maygay1b.cpp | 6 +- src/mame/drivers/maygayep.cpp | 3 +- src/mame/drivers/maygaysw.cpp | 3 +- src/mame/drivers/maygayv1.cpp | 3 +- src/mame/drivers/mazerbla.cpp | 6 +- src/mame/drivers/mbc200.cpp | 3 +- src/mame/drivers/mbc55x.cpp | 2 +- src/mame/drivers/mbee.cpp | 18 +- src/mame/drivers/mc10.cpp | 9 +- src/mame/drivers/mc1000.cpp | 3 +- src/mame/drivers/mc1502.cpp | 2 +- src/mame/drivers/mc8020.cpp | 3 +- src/mame/drivers/mc8030.cpp | 3 +- src/mame/drivers/mcatadv.cpp | 4 +- src/mame/drivers/mcb216.cpp | 6 +- src/mame/drivers/mccpm.cpp | 3 +- src/mame/drivers/mcr.cpp | 18 +- src/mame/drivers/mcr3.cpp | 12 +- src/mame/drivers/mcr68.cpp | 14 +- src/mame/drivers/meadows.cpp | 6 +- src/mame/drivers/meadwttl.cpp | 3 +- src/mame/drivers/mediagx.cpp | 3 +- src/mame/drivers/megadriv.cpp | 26 +- src/mame/drivers/megadrvb.cpp | 6 +- src/mame/drivers/megaphx.cpp | 3 +- src/mame/drivers/megaplay.cpp | 3 +- src/mame/drivers/megasys1.cpp | 24 +- src/mame/drivers/megatech.cpp | 9 +- src/mame/drivers/megazone.cpp | 2 +- src/mame/drivers/meijinsn.cpp | 3 +- src/mame/drivers/mekd2.cpp | 3 +- src/mame/drivers/mephisto.cpp | 12 +- src/mame/drivers/mephisto_montec.cpp | 18 +- src/mame/drivers/mephistp.cpp | 3 +- src/mame/drivers/merit.cpp | 33 +- src/mame/drivers/meritm.cpp | 12 +- src/mame/drivers/mermaid.cpp | 4 +- src/mame/drivers/mes.cpp | 3 +- src/mame/drivers/metalmx.cpp | 2 +- src/mame/drivers/metlclsh.cpp | 2 +- src/mame/drivers/metlfrzr.cpp | 3 +- src/mame/drivers/metro.cpp | 72 ++-- src/mame/drivers/mexico86.cpp | 6 +- src/mame/drivers/meyc8080.cpp | 3 +- src/mame/drivers/meyc8088.cpp | 3 +- src/mame/drivers/mfabfz.cpp | 6 +- src/mame/drivers/mgames.cpp | 3 +- src/mame/drivers/mgavegas.cpp | 3 +- src/mame/drivers/mgolf.cpp | 3 +- src/mame/drivers/mhavoc.cpp | 6 +- src/mame/drivers/mice.cpp | 6 +- src/mame/drivers/micral.cpp | 3 +- src/mame/drivers/micro20.cpp | 3 +- src/mame/drivers/micro3d.cpp | 4 +- src/mame/drivers/microdec.cpp | 3 +- src/mame/drivers/microkit.cpp | 3 +- src/mame/drivers/micronic.cpp | 2 +- src/mame/drivers/micropin.cpp | 6 +- src/mame/drivers/microtan.cpp | 2 +- src/mame/drivers/microterm.cpp | 6 +- src/mame/drivers/microvsn.cpp | 3 +- src/mame/drivers/midas.cpp | 6 +- src/mame/drivers/midqslvr.cpp | 3 +- src/mame/drivers/midtunit.cpp | 6 +- src/mame/drivers/midvunit.cpp | 10 +- src/mame/drivers/midwunit.cpp | 6 +- src/mame/drivers/midxunit.cpp | 2 +- src/mame/drivers/midyunit.cpp | 18 +- src/mame/drivers/midzeus.cpp | 14 +- src/mame/drivers/mightyframe.cpp | 3 +- src/mame/drivers/mikie.cpp | 2 +- src/mame/drivers/mikro80.cpp | 6 +- src/mame/drivers/mikromik.cpp | 6 +- src/mame/drivers/mikrosha.cpp | 3 +- src/mame/drivers/mil4000.cpp | 6 +- src/mame/drivers/milwaukee.cpp | 3 +- src/mame/drivers/mini2440.cpp | 3 +- src/mame/drivers/miniboy7.cpp | 3 +- src/mame/drivers/minicom.cpp | 3 +- src/mame/drivers/miniforce.cpp | 3 +- src/mame/drivers/miniframe.cpp | 3 +- src/mame/drivers/minitel_2_rpic.cpp | 3 +- src/mame/drivers/minivadr.cpp | 3 +- src/mame/drivers/mirage.cpp | 3 +- src/mame/drivers/mirax.cpp | 3 +- src/mame/drivers/missb2.cpp | 6 +- src/mame/drivers/missile.cpp | 9 +- src/mame/drivers/mitchell.cpp | 16 +- src/mame/drivers/mits680b.cpp | 3 +- src/mame/drivers/mjkjidai.cpp | 2 +- src/mame/drivers/mjsenpu.cpp | 3 +- src/mame/drivers/mjsister.cpp | 3 +- src/mame/drivers/mk1.cpp | 3 +- src/mame/drivers/mk14.cpp | 3 +- src/mame/drivers/mk2.cpp | 3 +- src/mame/drivers/mk85.cpp | 3 +- src/mame/drivers/mk90.cpp | 3 +- src/mame/drivers/mkit09.cpp | 6 +- src/mame/drivers/mlanding.cpp | 3 +- src/mame/drivers/mmagic.cpp | 3 +- src/mame/drivers/mmd1.cpp | 6 +- src/mame/drivers/mmm.cpp | 3 +- src/mame/drivers/mmodular.cpp | 18 +- src/mame/drivers/mod8.cpp | 3 +- src/mame/drivers/model1.cpp | 8 +- src/mame/drivers/model2.cpp | 36 +- src/mame/drivers/model3.cpp | 14 +- src/mame/drivers/modellot.cpp | 3 +- src/mame/drivers/mogura.cpp | 3 +- src/mame/drivers/mole.cpp | 3 +- src/mame/drivers/molecular.cpp | 3 +- src/mame/drivers/momoko.cpp | 2 +- src/mame/drivers/monacogp.cpp | 3 +- src/mame/drivers/monty.cpp | 6 +- src/mame/drivers/monzagp.cpp | 3 +- src/mame/drivers/moo.cpp | 6 +- src/mame/drivers/mosaic.cpp | 4 +- src/mame/drivers/mouser.cpp | 2 +- src/mame/drivers/mpf1.cpp | 6 +- src/mame/drivers/mps1230.cpp | 6 +- src/mame/drivers/mpu12wbk.cpp | 3 +- src/mame/drivers/mpu2.cpp | 3 +- src/mame/drivers/mpu3.cpp | 3 +- src/mame/drivers/mpu4.cpp | 6 - src/mame/drivers/mpu4avan.cpp | 1 - src/mame/drivers/mpu4bwb.cpp | 3 - src/mame/drivers/mpu4concept.cpp | 1 - src/mame/drivers/mpu4crystal.cpp | 2 - src/mame/drivers/mpu4dealem.cpp | 3 +- src/mame/drivers/mpu4empire.cpp | 1 - src/mame/drivers/mpu4mdm.cpp | 1 - src/mame/drivers/mpu4misc.cpp | 1 - src/mame/drivers/mpu4mod2sw.cpp | 1 - src/mame/drivers/mpu4mod4yam.cpp | 1 - src/mame/drivers/mpu4plasma.cpp | 7 +- src/mame/drivers/mpu4sw.cpp | 3 - src/mame/drivers/mpu4union.cpp | 2 - src/mame/drivers/mpu4vid.cpp | 15 +- src/mame/drivers/mpu5.cpp | 3 +- src/mame/drivers/mpu5.hxx | 1 - src/mame/drivers/mpz80.cpp | 2 +- src/mame/drivers/mquake.cpp | 3 +- src/mame/drivers/mrdo.cpp | 4 +- src/mame/drivers/mrflea.cpp | 2 +- src/mame/drivers/mrgame.cpp | 3 +- src/mame/drivers/mrjong.cpp | 2 +- src/mame/drivers/ms0515.cpp | 3 +- src/mame/drivers/ms32.cpp | 4 +- src/mame/drivers/ms6102.cpp | 3 +- src/mame/drivers/ms9540.cpp | 3 +- src/mame/drivers/msbc1.cpp | 3 +- src/mame/drivers/msisaac.cpp | 2 +- src/mame/drivers/mstation.cpp | 3 +- src/mame/drivers/msx.cpp | 544 ++++++++++++++--------------- src/mame/drivers/mt735.cpp | 3 +- src/mame/drivers/mtouchxl.cpp | 21 +- src/mame/drivers/mtx.cpp | 6 +- src/mame/drivers/mugsmash.cpp | 2 +- src/mame/drivers/multfish.cpp | 4 +- src/mame/drivers/multi16.cpp | 3 +- src/mame/drivers/multi8.cpp | 3 +- src/mame/drivers/multigam.cpp | 12 +- src/mame/drivers/munchmo.cpp | 2 +- src/mame/drivers/murogem.cpp | 3 +- src/mame/drivers/murogmbl.cpp | 6 +- src/mame/drivers/mustache.cpp | 2 +- src/mame/drivers/mvme147.cpp | 3 +- src/mame/drivers/mw18w.cpp | 3 +- src/mame/drivers/mw8080bw.cpp | 44 +-- src/mame/drivers/mwarr.cpp | 3 +- src/mame/drivers/mwsub.cpp | 3 +- src/mame/drivers/mx2178.cpp | 3 +- src/mame/drivers/myb3k.cpp | 9 +- src/mame/drivers/mycom.cpp | 3 +- src/mame/drivers/mystston.cpp | 2 +- src/mame/drivers/mystwarr.cpp | 12 +- src/mame/drivers/myvision.cpp | 3 +- src/mame/drivers/mz2000.cpp | 6 +- src/mame/drivers/mz2500.cpp | 3 +- src/mame/drivers/mz3500.cpp | 3 +- src/mame/drivers/mz6500.cpp | 3 +- src/mame/drivers/mz700.cpp | 4 +- src/mame/drivers/mz80.cpp | 6 +- src/mame/drivers/mzr8105.cpp | 3 +- src/mame/drivers/n64.cpp | 6 +- src/mame/drivers/n8080.cpp | 8 +- src/mame/drivers/nakajies.cpp | 12 +- src/mame/drivers/namcofl.cpp | 2 +- src/mame/drivers/namcona1.cpp | 8 +- src/mame/drivers/namconb1.cpp | 4 +- src/mame/drivers/namcond1.cpp | 4 +- src/mame/drivers/namcops2.cpp | 6 +- src/mame/drivers/namcos1.cpp | 2 +- src/mame/drivers/namcos10.cpp | 30 +- src/mame/drivers/namcos11.cpp | 42 ++- src/mame/drivers/namcos12.cpp | 25 +- src/mame/drivers/namcos2.cpp | 82 ++--- src/mame/drivers/namcos21.cpp | 8 +- src/mame/drivers/namcos22.cpp | 24 +- src/mame/drivers/namcos23.cpp | 21 +- src/mame/drivers/namcos86.cpp | 10 +- src/mame/drivers/nanos.cpp | 3 +- src/mame/drivers/naomi.cpp | 30 +- src/mame/drivers/nascom1.cpp | 10 +- src/mame/drivers/naughtyb.cpp | 4 +- src/mame/drivers/nbmj8688.cpp | 86 ++--- src/mame/drivers/nbmj8891.cpp | 56 +-- src/mame/drivers/nbmj8900.cpp | 4 +- src/mame/drivers/nbmj8991.cpp | 42 +-- src/mame/drivers/nbmj9195.cpp | 66 ++-- src/mame/drivers/nc.cpp | 4 +- src/mame/drivers/nds.cpp | 2 +- src/mame/drivers/nemesis.cpp | 20 +- src/mame/drivers/neogeo.cpp | 138 ++++---- src/mame/drivers/neogeocd.cpp | 3 +- src/mame/drivers/neopcb.cpp | 2 +- src/mame/drivers/neoprint.cpp | 6 +- src/mame/drivers/neptunp2.cpp | 3 +- src/mame/drivers/nes.cpp | 16 +- src/mame/drivers/nes_vt.cpp | 9 +- src/mame/drivers/newbrain.cpp | 8 +- src/mame/drivers/news.cpp | 2 +- src/mame/drivers/next.cpp | 27 +- src/mame/drivers/nexus3d.cpp | 3 +- src/mame/drivers/ngen.cpp | 11 +- src/mame/drivers/ngp.cpp | 9 +- src/mame/drivers/nibble.cpp | 3 +- src/mame/drivers/nightgal.cpp | 15 +- src/mame/drivers/ninjakd2.cpp | 14 +- src/mame/drivers/ninjaw.cpp | 4 +- src/mame/drivers/nitedrvr.cpp | 2 +- src/mame/drivers/niyanpai.cpp | 8 +- src/mame/drivers/nmg5.cpp | 17 +- src/mame/drivers/nmk16.cpp | 66 ++-- src/mame/drivers/nmkmedal.cpp | 3 +- src/mame/drivers/nokia_3310.cpp | 15 +- src/mame/drivers/norautp.cpp | 28 +- src/mame/drivers/notechan.cpp | 3 +- src/mame/drivers/notetaker.cpp | 3 +- src/mame/drivers/nova2001.cpp | 8 +- src/mame/drivers/novag6502.cpp | 12 +- src/mame/drivers/novag68k.cpp | 3 +- src/mame/drivers/novagf8.cpp | 3 +- src/mame/drivers/novagmcs48.cpp | 6 +- src/mame/drivers/nsg6809.cpp | 3 +- src/mame/drivers/nsm.cpp | 3 +- src/mame/drivers/nsmpoker.cpp | 3 +- src/mame/drivers/nss.cpp | 3 +- src/mame/drivers/nwk-tr.cpp | 6 +- src/mame/drivers/nycaptor.cpp | 6 +- src/mame/drivers/nyny.cpp | 3 +- src/mame/drivers/ob68k1a.cpp | 2 +- src/mame/drivers/octopus.cpp | 3 +- src/mame/drivers/odyssey.cpp | 3 +- src/mame/drivers/odyssey2.cpp | 15 +- src/mame/drivers/offtwall.cpp | 2 +- src/mame/drivers/ohmygod.cpp | 2 +- src/mame/drivers/ojankohs.cpp | 8 +- src/mame/drivers/okean240.cpp | 9 +- src/mame/drivers/olibochu.cpp | 3 +- src/mame/drivers/omegrace.cpp | 3 +- src/mame/drivers/ondra.cpp | 2 +- src/mame/drivers/oneshot.cpp | 4 +- src/mame/drivers/onetwo.cpp | 3 +- src/mame/drivers/onyx.cpp | 6 +- src/mame/drivers/opwolf.cpp | 6 +- src/mame/drivers/orao.cpp | 2 +- src/mame/drivers/orbit.cpp | 2 +- src/mame/drivers/oric.cpp | 9 +- src/mame/drivers/orion.cpp | 10 +- src/mame/drivers/osbexec.cpp | 3 +- src/mame/drivers/osborne1.cpp | 4 +- src/mame/drivers/osi.cpp | 8 +- src/mame/drivers/othello.cpp | 3 +- src/mame/drivers/othunder.cpp | 2 +- src/mame/drivers/otomedius.cpp | 3 +- src/mame/drivers/overdriv.cpp | 2 +- src/mame/drivers/p112.cpp | 3 +- src/mame/drivers/p2000t.cpp | 4 +- src/mame/drivers/p8k.cpp | 6 +- src/mame/drivers/pachifev.cpp | 3 +- src/mame/drivers/pacland.cpp | 2 +- src/mame/drivers/pacman.cpp | 54 +-- src/mame/drivers/palm.cpp | 21 +- src/mame/drivers/palmz22.cpp | 3 +- src/mame/drivers/pandoras.cpp | 2 +- src/mame/drivers/pangofun.cpp | 3 +- src/mame/drivers/panicr.cpp | 3 +- src/mame/drivers/paradise.cpp | 12 +- src/mame/drivers/paranoia.cpp | 3 +- src/mame/drivers/parodius.cpp | 2 +- src/mame/drivers/partner.cpp | 2 +- src/mame/drivers/pasha2.cpp | 3 +- src/mame/drivers/paso1600.cpp | 3 +- src/mame/drivers/pasogo.cpp | 3 +- src/mame/drivers/pasopia.cpp | 3 +- src/mame/drivers/pasopia7.cpp | 9 +- src/mame/drivers/pass.cpp | 2 +- src/mame/drivers/pastelg.cpp | 4 +- src/mame/drivers/patapata.cpp | 3 +- src/mame/drivers/patinho_feio.cpp | 2 +- src/mame/drivers/pb1000.cpp | 6 +- src/mame/drivers/pbaction.cpp | 4 +- src/mame/drivers/pc.cpp | 98 ++++-- src/mame/drivers/pc100.cpp | 3 +- src/mame/drivers/pc1500.cpp | 3 +- src/mame/drivers/pc1512.cpp | 12 +- src/mame/drivers/pc2000.cpp | 18 +- src/mame/drivers/pc4.cpp | 2 +- src/mame/drivers/pc6001.cpp | 12 +- src/mame/drivers/pc8001.cpp | 4 +- src/mame/drivers/pc8401a.cpp | 4 +- src/mame/drivers/pc8801.cpp | 12 +- src/mame/drivers/pc88va.cpp | 3 +- src/mame/drivers/pc9801.cpp | 28 +- src/mame/drivers/pcat_dyn.cpp | 11 +- src/mame/drivers/pcat_nit.cpp | 6 +- src/mame/drivers/pcd.cpp | 6 +- src/mame/drivers/pce.cpp | 8 +- src/mame/drivers/pce220.cpp | 9 +- src/mame/drivers/pcfx.cpp | 3 +- src/mame/drivers/pcipc.cpp | 6 +- src/mame/drivers/pcktgal.cpp | 6 +- src/mame/drivers/pcm.cpp | 3 +- src/mame/drivers/pcw.cpp | 8 +- src/mame/drivers/pcw16.cpp | 2 +- src/mame/drivers/pcxt.cpp | 6 +- src/mame/drivers/pda600.cpp | 3 +- src/mame/drivers/pdp1.cpp | 2 +- src/mame/drivers/pdp11.cpp | 9 +- src/mame/drivers/pecom.cpp | 2 +- src/mame/drivers/pegasus.cpp | 6 +- src/mame/drivers/pencil2.cpp | 3 +- src/mame/drivers/pengadvb.cpp | 3 +- src/mame/drivers/pengo.cpp | 12 +- src/mame/drivers/pentagon.cpp | 6 +- src/mame/drivers/peoplepc.cpp | 3 +- src/mame/drivers/peplus.cpp | 3 +- src/mame/drivers/perq.cpp | 3 +- src/mame/drivers/pes.cpp | 2 +- src/mame/drivers/pet.cpp | 157 +++++---- src/mame/drivers/peyper.cpp | 3 +- src/mame/drivers/pg685.cpp | 15 +- src/mame/drivers/pgm.cpp | 4 +- src/mame/drivers/pgm2.cpp | 8 +- src/mame/drivers/pgm3.cpp | 3 +- src/mame/drivers/phc25.cpp | 6 +- src/mame/drivers/phoenix.cpp | 8 +- src/mame/drivers/photon.cpp | 3 +- src/mame/drivers/photon2.cpp | 3 +- src/mame/drivers/photoply.cpp | 3 +- src/mame/drivers/phunsy.cpp | 3 +- src/mame/drivers/picno.cpp | 3 +- src/mame/drivers/piggypas.cpp | 3 +- src/mame/drivers/pimps.cpp | 3 +- src/mame/drivers/pinball2k.cpp | 3 +- src/mame/drivers/pingpong.cpp | 4 +- src/mame/drivers/pinkiri8.cpp | 3 +- src/mame/drivers/pipbug.cpp | 3 +- src/mame/drivers/pipedrm.cpp | 6 +- src/mame/drivers/pipeline.cpp | 3 +- src/mame/drivers/pirates.cpp | 2 +- src/mame/drivers/piratesh.cpp | 3 +- src/mame/drivers/pitagjr.cpp | 3 +- src/mame/drivers/pitnrun.cpp | 4 +- src/mame/drivers/pk8000.cpp | 3 +- src/mame/drivers/pk8020.cpp | 2 +- src/mame/drivers/pkscram.cpp | 3 +- src/mame/drivers/pktgaldx.cpp | 4 +- src/mame/drivers/plan80.cpp | 3 +- src/mame/drivers/play_1.cpp | 6 +- src/mame/drivers/play_2.cpp | 6 +- src/mame/drivers/play_3.cpp | 9 +- src/mame/drivers/playch10.cpp | 6 +- src/mame/drivers/playmark.cpp | 14 +- src/mame/drivers/plus4.cpp | 22 +- src/mame/drivers/pluto5.cpp | 3 +- src/mame/drivers/plygonet.cpp | 2 +- src/mame/drivers/pm68k.cpp | 3 +- src/mame/drivers/pmd85.cpp | 14 +- src/mame/drivers/pmi80.cpp | 3 +- src/mame/drivers/pntnpuzl.cpp | 10 +- src/mame/drivers/pockchal.cpp | 3 +- src/mame/drivers/pocketc.cpp | 22 +- src/mame/drivers/pockstat.cpp | 3 +- src/mame/drivers/pofo.cpp | 3 +- src/mame/drivers/poisk1.cpp | 3 +- src/mame/drivers/pokechmp.cpp | 2 +- src/mame/drivers/pokemini.cpp | 3 +- src/mame/drivers/poker72.cpp | 3 +- src/mame/drivers/polepos.cpp | 6 +- src/mame/drivers/polgar.cpp | 21 +- src/mame/drivers/policetr.cpp | 4 +- src/mame/drivers/poly.cpp | 3 +- src/mame/drivers/poly88.cpp | 4 +- src/mame/drivers/poly880.cpp | 2 +- src/mame/drivers/polyplay.cpp | 4 +- src/mame/drivers/pong.cpp | 12 +- src/mame/drivers/poolshrk.cpp | 2 +- src/mame/drivers/pooyan.cpp | 48 ++- src/mame/drivers/popeye.cpp | 8 +- src/mame/drivers/popobear.cpp | 3 +- src/mame/drivers/popper.cpp | 3 +- src/mame/drivers/portrait.cpp | 2 +- src/mame/drivers/potgoldu.cpp | 3 +- src/mame/drivers/powerbal.cpp | 6 +- src/mame/drivers/powerins.cpp | 6 +- src/mame/drivers/powerstack.cpp | 3 +- src/mame/drivers/pp01.cpp | 2 +- src/mame/drivers/ppmast93.cpp | 3 +- src/mame/drivers/prehisle.cpp | 2 +- src/mame/drivers/prestige.cpp | 27 +- src/mame/drivers/primo.cpp | 14 +- src/mame/drivers/pro80.cpp | 3 +- src/mame/drivers/proconn.cpp | 3 +- src/mame/drivers/prodigy.cpp | 3 +- src/mame/drivers/prof180x.cpp | 2 +- src/mame/drivers/prof80.cpp | 2 +- src/mame/drivers/progolf.cpp | 6 +- src/mame/drivers/prophet600.cpp | 3 +- src/mame/drivers/proteus3.cpp | 3 +- src/mame/drivers/ps2.cpp | 15 +- src/mame/drivers/ps2sony.cpp | 3 +- src/mame/drivers/pse.cpp | 3 +- src/mame/drivers/psikyo.cpp | 10 +- src/mame/drivers/psikyo4.cpp | 4 +- src/mame/drivers/psikyosh.cpp | 6 +- src/mame/drivers/psion.cpp | 16 +- src/mame/drivers/psx.cpp | 17 +- src/mame/drivers/psychic5.cpp | 4 +- src/mame/drivers/pt68k4.cpp | 6 +- src/mame/drivers/ptcsol.cpp | 3 +- src/mame/drivers/pturn.cpp | 3 +- src/mame/drivers/puckpkmn.cpp | 6 +- src/mame/drivers/pulsar.cpp | 3 +- src/mame/drivers/punchout.cpp | 6 +- src/mame/drivers/pv1000.cpp | 3 +- src/mame/drivers/pv2000.cpp | 3 +- src/mame/drivers/pv9234.cpp | 3 +- src/mame/drivers/pve500.cpp | 3 +- src/mame/drivers/pwrview.cpp | 3 +- src/mame/drivers/px4.cpp | 6 +- src/mame/drivers/px8.cpp | 2 +- src/mame/drivers/pyl601.cpp | 6 +- src/mame/drivers/pyson.cpp | 3 +- src/mame/drivers/pzletime.cpp | 3 +- src/mame/drivers/qdrmfgp.cpp | 4 +- src/mame/drivers/qix.cpp | 12 +- src/mame/drivers/ql.cpp | 9 +- src/mame/drivers/qtsbc.cpp | 3 +- src/mame/drivers/quakeat.cpp | 3 +- src/mame/drivers/quantum.cpp | 3 +- src/mame/drivers/quasar.cpp | 2 +- src/mame/drivers/queen.cpp | 3 +- src/mame/drivers/quickpick5.cpp | 3 +- src/mame/drivers/quizdna.cpp | 6 +- src/mame/drivers/quizo.cpp | 3 +- src/mame/drivers/quizpani.cpp | 2 +- src/mame/drivers/quizpun2.cpp | 6 +- src/mame/drivers/quizshow.cpp | 3 +- src/mame/drivers/qvt103.cpp | 3 +- src/mame/drivers/qvt201.cpp | 3 +- src/mame/drivers/qvt6800.cpp | 6 +- src/mame/drivers/qx10.cpp | 3 +- src/mame/drivers/r2dtank.cpp | 3 +- src/mame/drivers/r2dx_v33.cpp | 9 +- src/mame/drivers/r9751.cpp | 3 +- src/mame/drivers/rabbit.cpp | 3 +- src/mame/drivers/radicasi.cpp | 5 +- src/mame/drivers/radio86.cpp | 16 +- src/mame/drivers/raiden.cpp | 8 +- src/mame/drivers/raiden2.cpp | 8 +- src/mame/drivers/rainbow.cpp | 3 +- src/mame/drivers/rallyx.cpp | 35 +- src/mame/drivers/rambo.cpp | 3 +- src/mame/drivers/rampart.cpp | 2 +- src/mame/drivers/ramtek.cpp | 3 +- src/mame/drivers/rastan.cpp | 2 +- src/mame/drivers/rastersp.cpp | 11 +- src/mame/drivers/ravens.cpp | 6 +- src/mame/drivers/rbisland.cpp | 6 +- src/mame/drivers/rbmk.cpp | 6 +- src/mame/drivers/rc702.cpp | 3 +- src/mame/drivers/rc759.cpp | 3 +- src/mame/drivers/rcorsair.cpp | 3 +- src/mame/drivers/rd100.cpp | 3 +- src/mame/drivers/rd110.cpp | 3 +- src/mame/drivers/re900.cpp | 6 +- src/mame/drivers/realbrk.cpp | 8 +- src/mame/drivers/redalert.cpp | 8 +- src/mame/drivers/redclash.cpp | 6 +- src/mame/drivers/relief.cpp | 2 +- src/mame/drivers/renegade.cpp | 4 +- src/mame/drivers/replicator.cpp | 3 +- src/mame/drivers/retofinv.cpp | 8 +- src/mame/drivers/rex6000.cpp | 6 +- src/mame/drivers/rgum.cpp | 3 +- src/mame/drivers/risc2500.cpp | 3 +- src/mame/drivers/riscpc.cpp | 18 +- src/mame/drivers/rltennis.cpp | 2 +- src/mame/drivers/rm380z.cpp | 4 +- src/mame/drivers/rmhaihai.cpp | 9 +- src/mame/drivers/rmnimbus.cpp | 2 +- src/mame/drivers/rmt32.cpp | 3 +- src/mame/drivers/rockrage.cpp | 2 +- src/mame/drivers/rocnrope.cpp | 47 ++- src/mame/drivers/rohga.cpp | 10 +- src/mame/drivers/rollerg.cpp | 2 +- src/mame/drivers/rollext.cpp | 3 +- src/mame/drivers/rollrace.cpp | 4 +- src/mame/drivers/ron.cpp | 3 +- src/mame/drivers/rotaryf.cpp | 3 +- src/mame/drivers/roul.cpp | 3 +- src/mame/drivers/route16.cpp | 12 +- src/mame/drivers/rowamet.cpp | 3 +- src/mame/drivers/royalmah.cpp | 72 ++-- src/mame/drivers/rpunch.cpp | 6 +- src/mame/drivers/rsc55.cpp | 3 +- src/mame/drivers/rt1715.cpp | 6 +- src/mame/drivers/runaway.cpp | 4 +- src/mame/drivers/rungun.cpp | 4 +- src/mame/drivers/rvoice.cpp | 3 +- src/mame/drivers/rx78.cpp | 3 +- src/mame/drivers/rzone.cpp | 6 +- src/mame/drivers/s11.cpp | 2 +- src/mame/drivers/s11a.cpp | 2 +- src/mame/drivers/s11b.cpp | 2 +- src/mame/drivers/s11c.cpp | 2 +- src/mame/drivers/s3.cpp | 6 +- src/mame/drivers/s4.cpp | 6 +- src/mame/drivers/s6.cpp | 3 +- src/mame/drivers/s6a.cpp | 3 +- src/mame/drivers/s7.cpp | 3 +- src/mame/drivers/s8.cpp | 3 +- src/mame/drivers/s8a.cpp | 3 +- src/mame/drivers/s9.cpp | 3 +- src/mame/drivers/sacstate.cpp | 3 +- src/mame/drivers/safarir.cpp | 6 +- src/mame/drivers/sage2.cpp | 2 +- src/mame/drivers/sam.cpp | 3 +- src/mame/drivers/samcoupe.cpp | 2 +- src/mame/drivers/sandscrp.cpp | 3 +- src/mame/drivers/sangho.cpp | 6 +- src/mame/drivers/sanremmg.cpp | 3 +- src/mame/drivers/sanremo.cpp | 3 +- src/mame/drivers/sansa_fuze.cpp | 3 +- src/mame/drivers/sapi1.cpp | 15 +- src/mame/drivers/sartorius.cpp | 4 +- src/mame/drivers/saturn.cpp | 12 +- src/mame/drivers/sauro.cpp | 8 +- src/mame/drivers/savia84.cpp | 3 +- src/mame/drivers/savquest.cpp | 3 +- src/mame/drivers/sbasketb.cpp | 4 +- src/mame/drivers/sbc6510.cpp | 3 +- src/mame/drivers/sbowling.cpp | 3 +- src/mame/drivers/sbrain.cpp | 3 +- src/mame/drivers/sbrkout.cpp | 6 +- src/mame/drivers/sbugger.cpp | 2 +- src/mame/drivers/sc1.cpp | 3 +- src/mame/drivers/sc2.cpp | 3 +- src/mame/drivers/scm_500.cpp | 3 +- src/mame/drivers/scobra.cpp | 42 ++- src/mame/drivers/scopus.cpp | 3 +- src/mame/drivers/scorpion.cpp | 9 +- src/mame/drivers/scotrsht.cpp | 2 +- src/mame/drivers/scramble.cpp | 32 +- src/mame/drivers/scregg.cpp | 6 +- src/mame/drivers/scv.cpp | 6 +- src/mame/drivers/scyclone.cpp | 3 +- src/mame/drivers/sderby.cpp | 12 +- src/mame/drivers/sderby2.cpp | 3 +- src/mame/drivers/sdk80.cpp | 3 +- src/mame/drivers/sdk85.cpp | 3 +- src/mame/drivers/sdk86.cpp | 3 +- src/mame/drivers/seabattl.cpp | 3 +- src/mame/drivers/sealy.cpp | 3 +- src/mame/drivers/seattle.cpp | 60 ++-- src/mame/drivers/seattlecmp.cpp | 3 +- src/mame/drivers/sega_sawatte.cpp | 3 +- src/mame/drivers/segac2.cpp | 6 +- src/mame/drivers/segacoin.cpp | 3 +- src/mame/drivers/segae.cpp | 18 +- src/mame/drivers/segag80r.cpp | 20 +- src/mame/drivers/segag80v.cpp | 12 +- src/mame/drivers/segahang.cpp | 36 +- src/mame/drivers/segajw.cpp | 3 +- src/mame/drivers/segald.cpp | 3 +- src/mame/drivers/segam1.cpp | 6 +- src/mame/drivers/segaorun.cpp | 14 +- src/mame/drivers/segapico.cpp | 9 +- src/mame/drivers/segapm.cpp | 3 +- src/mame/drivers/segas16a.cpp | 22 +- src/mame/drivers/segas16b.cpp | 36 +- src/mame/drivers/segas18.cpp | 16 +- src/mame/drivers/segas24.cpp | 16 +- src/mame/drivers/segas32.cpp | 64 ++-- src/mame/drivers/segasp.cpp | 2 +- src/mame/drivers/segaufo.cpp | 12 +- src/mame/drivers/segaxbd.cpp | 45 ++- src/mame/drivers/segaybd.cpp | 6 +- src/mame/drivers/seibucats.cpp | 3 +- src/mame/drivers/seibuspi.cpp | 16 +- src/mame/drivers/seicross.cpp | 6 +- src/mame/drivers/seicupbl.cpp | 3 +- src/mame/drivers/selz80.cpp | 6 +- src/mame/drivers/sengokmj.cpp | 3 +- src/mame/drivers/senjyo.cpp | 8 +- src/mame/drivers/seta.cpp | 96 ++--- src/mame/drivers/seta2.cpp | 34 +- src/mame/drivers/sf.cpp | 8 +- src/mame/drivers/sfbonus.cpp | 3 +- src/mame/drivers/sfcbox.cpp | 3 +- src/mame/drivers/sfkick.cpp | 3 +- src/mame/drivers/sg1000.cpp | 8 +- src/mame/drivers/sg1000a.cpp | 9 +- src/mame/drivers/sh4robot.cpp | 3 +- src/mame/drivers/shadfrce.cpp | 2 +- src/mame/drivers/shangha3.cpp | 6 +- src/mame/drivers/shanghai.cpp | 9 +- src/mame/drivers/shangkid.cpp | 6 +- src/mame/drivers/shaolins.cpp | 2 +- src/mame/drivers/shisen.cpp | 2 +- src/mame/drivers/shootaway2.cpp | 3 +- src/mame/drivers/shootout.cpp | 6 +- src/mame/drivers/shougi.cpp | 3 +- src/mame/drivers/shtzone.cpp | 3 +- src/mame/drivers/shuuz.cpp | 2 +- src/mame/drivers/sidearms.cpp | 6 +- src/mame/drivers/sidepckt.cpp | 4 +- src/mame/drivers/sigmab52.cpp | 3 +- src/mame/drivers/sigmab98.cpp | 33 +- src/mame/drivers/silkroad.cpp | 2 +- src/mame/drivers/silvmil.cpp | 9 +- src/mame/drivers/simpl156.cpp | 10 +- src/mame/drivers/simple_st0016.cpp | 6 +- src/mame/drivers/simpsons.cpp | 2 +- src/mame/drivers/sitcom.cpp | 6 +- src/mame/drivers/skeetsht.cpp | 3 +- src/mame/drivers/skimaxx.cpp | 3 +- src/mame/drivers/skullxbo.cpp | 2 +- src/mame/drivers/skyarmy.cpp | 3 +- src/mame/drivers/skydiver.cpp | 2 +- src/mame/drivers/skyfox.cpp | 2 +- src/mame/drivers/skykid.cpp | 2 +- src/mame/drivers/skylncr.cpp | 15 +- src/mame/drivers/skyraid.cpp | 2 +- src/mame/drivers/slapfght.cpp | 18 +- src/mame/drivers/slapshot.cpp | 4 +- src/mame/drivers/slc1.cpp | 3 +- src/mame/drivers/sleic.cpp | 3 +- src/mame/drivers/slicer.cpp | 3 +- src/mame/drivers/sliver.cpp | 3 +- src/mame/drivers/slotcarn.cpp | 3 +- src/mame/drivers/sm1800.cpp | 3 +- src/mame/drivers/sm7238.cpp | 3 +- src/mame/drivers/smc777.cpp | 3 +- src/mame/drivers/sms.cpp | 38 +- src/mame/drivers/sms_bootleg.cpp | 2 +- src/mame/drivers/smsmcorp.cpp | 6 +- src/mame/drivers/snes.cpp | 6 +- src/mame/drivers/snesb.cpp | 9 +- src/mame/drivers/snk.cpp | 42 +-- src/mame/drivers/snk6502.cpp | 12 +- src/mame/drivers/snk68.cpp | 6 +- src/mame/drivers/snookr10.cpp | 8 +- src/mame/drivers/snowbros.cpp | 22 +- src/mame/drivers/socrates.cpp | 9 +- src/mame/drivers/softbox.cpp | 2 +- src/mame/drivers/solbourne.cpp | 3 +- src/mame/drivers/solomon.cpp | 2 +- src/mame/drivers/sonson.cpp | 2 +- src/mame/drivers/sorcerer.cpp | 4 +- src/mame/drivers/sothello.cpp | 3 +- src/mame/drivers/spacefb.cpp | 2 +- src/mame/drivers/spaceg.cpp | 3 +- src/mame/drivers/spartanxtec.cpp | 3 +- src/mame/drivers/spbactn.cpp | 4 +- src/mame/drivers/spc1000.cpp | 3 +- src/mame/drivers/spc1500.cpp | 3 +- src/mame/drivers/spcforce.cpp | 4 +- src/mame/drivers/spdodgeb.cpp | 2 +- src/mame/drivers/spec128.cpp | 2 +- src/mame/drivers/special.cpp | 10 +- src/mame/drivers/specpls3.cpp | 2 +- src/mame/drivers/spectra.cpp | 3 +- src/mame/drivers/spectrum.cpp | 4 +- src/mame/drivers/speedatk.cpp | 2 +- src/mame/drivers/speedbal.cpp | 2 +- src/mame/drivers/speedspn.cpp | 2 +- src/mame/drivers/speglsht.cpp | 3 +- src/mame/drivers/spiders.cpp | 2 +- src/mame/drivers/spinb.cpp | 9 +- src/mame/drivers/spirit76.cpp | 3 +- src/mame/drivers/splash.cpp | 6 +- src/mame/drivers/splus.cpp | 3 +- src/mame/drivers/spoker.cpp | 8 +- src/mame/drivers/spool99.cpp | 6 +- src/mame/drivers/sprcros2.cpp | 3 +- src/mame/drivers/sprint2.cpp | 8 +- src/mame/drivers/sprint4.cpp | 2 +- src/mame/drivers/sprint8.cpp | 2 +- src/mame/drivers/spy.cpp | 2 +- src/mame/drivers/spyhuntertec.cpp | 3 +- src/mame/drivers/squale.cpp | 3 +- src/mame/drivers/srmp2.cpp | 8 +- src/mame/drivers/srmp5.cpp | 3 +- src/mame/drivers/srmp6.cpp | 3 +- src/mame/drivers/srumbler.cpp | 2 +- src/mame/drivers/ssem.cpp | 3 +- src/mame/drivers/ssfindo.cpp | 9 +- src/mame/drivers/sshangha.cpp | 4 +- src/mame/drivers/sshot.cpp | 3 +- src/mame/drivers/ssingles.cpp | 6 +- src/mame/drivers/sslam.cpp | 4 +- src/mame/drivers/ssozumo.cpp | 2 +- src/mame/drivers/sspeedr.cpp | 2 +- src/mame/drivers/ssrj.cpp | 2 +- src/mame/drivers/sstrangr.cpp | 6 +- src/mame/drivers/ssv.cpp | 46 +-- src/mame/drivers/ssystem3.cpp | 2 +- src/mame/drivers/st17xx.cpp | 3 +- src/mame/drivers/st_mp100.cpp | 3 +- src/mame/drivers/st_mp200.cpp | 6 +- src/mame/drivers/stactics.cpp | 2 +- src/mame/drivers/stadhero.cpp | 2 +- src/mame/drivers/starcrus.cpp | 2 +- src/mame/drivers/starfire.cpp | 4 +- src/mame/drivers/stargame.cpp | 3 +- src/mame/drivers/starshp1.cpp | 2 +- src/mame/drivers/starwars.cpp | 4 +- src/mame/drivers/statriv2.cpp | 9 +- src/mame/drivers/stellafr.cpp | 3 +- src/mame/drivers/stfight.cpp | 6 +- src/mame/drivers/stlforce.cpp | 4 +- src/mame/drivers/stratos.cpp | 3 +- src/mame/drivers/strkzn.cpp | 3 +- src/mame/drivers/strnskil.cpp | 4 +- src/mame/drivers/studio2.cpp | 12 +- src/mame/drivers/stuntair.cpp | 3 +- src/mame/drivers/stv.cpp | 14 +- src/mame/drivers/su2000.cpp | 3 +- src/mame/drivers/sub.cpp | 3 +- src/mame/drivers/subhuntr.cpp | 3 +- src/mame/drivers/subs.cpp | 2 +- src/mame/drivers/subsino.cpp | 24 +- src/mame/drivers/subsino2.cpp | 24 +- src/mame/drivers/summit.cpp | 3 +- src/mame/drivers/sumt8035.cpp | 3 +- src/mame/drivers/sun1.cpp | 3 +- src/mame/drivers/sun2.cpp | 6 +- src/mame/drivers/sun3.cpp | 15 +- src/mame/drivers/sun3x.cpp | 6 +- src/mame/drivers/sun4.cpp | 14 +- src/mame/drivers/suna16.cpp | 8 +- src/mame/drivers/suna8.cpp | 16 +- src/mame/drivers/supbtime.cpp | 9 +- src/mame/drivers/supdrapo.cpp | 3 +- src/mame/drivers/supduck.cpp | 3 +- src/mame/drivers/super6.cpp | 2 +- src/mame/drivers/super80.cpp | 12 +- src/mame/drivers/superchs.cpp | 4 +- src/mame/drivers/supercrd.cpp | 3 +- src/mame/drivers/superdq.cpp | 3 +- src/mame/drivers/superqix.cpp | 8 +- src/mame/drivers/superslave.cpp | 3 +- src/mame/drivers/supertnk.cpp | 3 +- src/mame/drivers/superwng.cpp | 3 +- src/mame/drivers/supracan.cpp | 3 +- src/mame/drivers/suprgolf.cpp | 3 +- src/mame/drivers/suprloco.cpp | 2 +- src/mame/drivers/suprnova.cpp | 12 +- src/mame/drivers/suprridr.cpp | 2 +- src/mame/drivers/suprslam.cpp | 2 +- src/mame/drivers/supstarf.cpp | 3 +- src/mame/drivers/surpratk.cpp | 2 +- src/mame/drivers/sv8000.cpp | 3 +- src/mame/drivers/svi318.cpp | 12 +- src/mame/drivers/svision.cpp | 10 +- src/mame/drivers/svmu.cpp | 3 +- src/mame/drivers/swtpc.cpp | 6 +- src/mame/drivers/swtpc09.cpp | 10 +- src/mame/drivers/swyft.cpp | 3 +- src/mame/drivers/sym1.cpp | 3 +- src/mame/drivers/symbolics.cpp | 3 +- src/mame/drivers/sys2900.cpp | 3 +- src/mame/drivers/sys9002.cpp | 3 +- src/mame/drivers/systec.cpp | 3 +- src/mame/drivers/system1.cpp | 90 ++--- src/mame/drivers/system16.cpp | 56 +-- src/mame/drivers/tagteam.cpp | 2 +- src/mame/drivers/tail2nos.cpp | 2 +- src/mame/drivers/taito.cpp | 21 +- src/mame/drivers/taito_b.cpp | 38 +- src/mame/drivers/taito_f2.cpp | 74 ++-- src/mame/drivers/taito_f3.cpp | 14 +- src/mame/drivers/taito_h.cpp | 8 +- src/mame/drivers/taito_l.cpp | 24 +- src/mame/drivers/taito_o.cpp | 2 +- src/mame/drivers/taito_x.cpp | 8 +- src/mame/drivers/taito_z.cpp | 22 +- src/mame/drivers/taitoair.cpp | 2 +- src/mame/drivers/taitogn.cpp | 35 +- src/mame/drivers/taitojc.cpp | 4 +- src/mame/drivers/taitopjc.cpp | 3 +- src/mame/drivers/taitosj.cpp | 6 +- src/mame/drivers/taitottl.cpp | 3 +- src/mame/drivers/taitotx.cpp | 3 +- src/mame/drivers/taitotz.cpp | 6 +- src/mame/drivers/taitowlf.cpp | 3 +- src/mame/drivers/tamag1.cpp | 3 +- src/mame/drivers/tandy1t.cpp | 52 +-- src/mame/drivers/tandy2k.cpp | 4 +- src/mame/drivers/tank8.cpp | 2 +- src/mame/drivers/tankbatt.cpp | 2 +- src/mame/drivers/tankbust.cpp | 2 +- src/mame/drivers/taotaido.cpp | 2 +- src/mame/drivers/tapatune.cpp | 6 +- src/mame/drivers/targeth.cpp | 2 +- src/mame/drivers/tasman.cpp | 3 +- src/mame/drivers/tatsumi.cpp | 8 +- src/mame/drivers/tattack.cpp | 3 +- src/mame/drivers/tavernie.cpp | 6 +- src/mame/drivers/taxidriv.cpp | 2 +- src/mame/drivers/tb303.cpp | 3 +- src/mame/drivers/tbowl.cpp | 2 +- src/mame/drivers/tceptor.cpp | 2 +- src/mame/drivers/tcl.cpp | 3 +- src/mame/drivers/tdv2324.cpp | 2 +- src/mame/drivers/tec1.cpp | 6 +- src/mame/drivers/techno.cpp | 3 +- src/mame/drivers/tecmo.cpp | 10 +- src/mame/drivers/tecmo16.cpp | 6 +- src/mame/drivers/tecmosys.cpp | 2 +- src/mame/drivers/tecnbras.cpp | 3 +- src/mame/drivers/tehkanwc.cpp | 4 +- src/mame/drivers/tek405x.cpp | 6 +- src/mame/drivers/tek410x.cpp | 6 +- src/mame/drivers/tek440x.cpp | 3 +- src/mame/drivers/tekxp33x.cpp | 3 +- src/mame/drivers/tempest.cpp | 3 +- src/mame/drivers/terak.cpp | 3 +- src/mame/drivers/terco.cpp | 3 +- src/mame/drivers/terminals.cpp | 3 +- src/mame/drivers/terracre.cpp | 8 +- src/mame/drivers/test_t400.cpp | 6 +- src/mame/drivers/testconsole.cpp | 3 +- src/mame/drivers/tetrisp2.cpp | 12 +- src/mame/drivers/tg100.cpp | 3 +- src/mame/drivers/tgtpanic.cpp | 3 +- src/mame/drivers/thayers.cpp | 3 +- src/mame/drivers/thedealr.cpp | 3 +- src/mame/drivers/thedeep.cpp | 2 +- src/mame/drivers/thepit.cpp | 10 +- src/mame/drivers/thief.cpp | 6 +- src/mame/drivers/thomson.cpp | 26 +- src/mame/drivers/thoop2.cpp | 2 +- src/mame/drivers/thunderj.cpp | 2 +- src/mame/drivers/thunderx.cpp | 6 +- src/mame/drivers/ti630.cpp | 3 +- src/mame/drivers/ti74.cpp | 6 +- src/mame/drivers/ti85.cpp | 24 +- src/mame/drivers/ti89.cpp | 10 +- src/mame/drivers/ti990_10.cpp | 3 +- src/mame/drivers/ti990_4.cpp | 6 +- src/mame/drivers/ti99_2.cpp | 3 +- src/mame/drivers/ti99_4p.cpp | 3 +- src/mame/drivers/ti99_4x.cpp | 27 +- src/mame/drivers/ti99_8.cpp | 9 +- src/mame/drivers/tiamc1.cpp | 4 +- src/mame/drivers/ticalc1x.cpp | 36 +- src/mame/drivers/tickee.cpp | 12 +- src/mame/drivers/tigeroad.cpp | 10 +- src/mame/drivers/tiki100.cpp | 6 +- src/mame/drivers/tim011.cpp | 3 +- src/mame/drivers/tim100.cpp | 3 +- src/mame/drivers/timelimt.cpp | 2 +- src/mame/drivers/timeplt.cpp | 29 +- src/mame/drivers/timetrv.cpp | 3 +- src/mame/drivers/timex.cpp | 6 +- src/mame/drivers/tispeak.cpp | 43 ++- src/mame/drivers/tispellb.cpp | 6 +- src/mame/drivers/tk2000.cpp | 3 +- src/mame/drivers/tk80.cpp | 15 +- src/mame/drivers/tk80bs.cpp | 3 +- src/mame/drivers/tm990189.cpp | 6 +- src/mame/drivers/tmaster.cpp | 6 +- src/mame/drivers/tmc1800.cpp | 8 +- src/mame/drivers/tmc2000e.cpp | 2 +- src/mame/drivers/tmc600.cpp | 2 +- src/mame/drivers/tmmjprd.cpp | 6 +- src/mame/drivers/tmnt.cpp | 24 +- src/mame/drivers/tmspoker.cpp | 3 +- src/mame/drivers/tnzs.cpp | 22 +- src/mame/drivers/toaplan1.cpp | 18 +- src/mame/drivers/toaplan2.cpp | 44 +-- src/mame/drivers/toki.cpp | 6 +- src/mame/drivers/tomcat.cpp | 3 +- src/mame/drivers/tonton.cpp | 3 +- src/mame/drivers/toobin.cpp | 2 +- src/mame/drivers/topspeed.cpp | 2 +- src/mame/drivers/toratora.cpp | 3 +- src/mame/drivers/tosh1000.cpp | 17 +- src/mame/drivers/tourtabl.cpp | 3 +- src/mame/drivers/tourvis.cpp | 3 +- src/mame/drivers/toypop.cpp | 6 +- src/mame/drivers/tp84.cpp | 4 +- src/mame/drivers/tr175.cpp | 3 +- src/mame/drivers/tr606.cpp | 3 +- src/mame/drivers/trackfld.cpp | 48 ++- src/mame/drivers/tranz330.cpp | 2 +- src/mame/drivers/travrusa.cpp | 6 +- src/mame/drivers/tricep.cpp | 3 +- src/mame/drivers/triforce.cpp | 6 +- src/mame/drivers/triplhnt.cpp | 2 +- src/mame/drivers/trs80.cpp | 22 +- src/mame/drivers/trs80dt1.cpp | 3 +- src/mame/drivers/trs80m2.cpp | 4 +- src/mame/drivers/truco.cpp | 2 +- src/mame/drivers/trucocl.cpp | 2 +- src/mame/drivers/trvmadns.cpp | 3 +- src/mame/drivers/trvquest.cpp | 2 +- src/mame/drivers/tryout.cpp | 2 +- src/mame/drivers/ts3000.cpp | 3 +- src/mame/drivers/ts802.cpp | 3 +- src/mame/drivers/ts803.cpp | 3 +- src/mame/drivers/ts816.cpp | 3 +- src/mame/drivers/tsamurai.cpp | 6 +- src/mame/drivers/tsispch.cpp | 2 +- src/mame/drivers/ttchamp.cpp | 3 +- src/mame/drivers/tti.cpp | 3 +- src/mame/drivers/tubep.cpp | 6 +- src/mame/drivers/tugboat.cpp | 3 +- src/mame/drivers/tumbleb.cpp | 28 +- src/mame/drivers/tunhunt.cpp | 2 +- src/mame/drivers/turbo.cpp | 10 +- src/mame/drivers/turrett.cpp | 2 +- src/mame/drivers/tutankhm.cpp | 48 ++- src/mame/drivers/tutor.cpp | 6 +- src/mame/drivers/tv910.cpp | 3 +- src/mame/drivers/tv912.cpp | 3 +- src/mame/drivers/tv950.cpp | 3 +- src/mame/drivers/tv990.cpp | 3 +- src/mame/drivers/tvc.cpp | 3 +- src/mame/drivers/tvcapcom.cpp | 3 +- src/mame/drivers/tvgame.cpp | 3 +- src/mame/drivers/twin16.cpp | 10 +- src/mame/drivers/twincobr.cpp | 6 +- src/mame/drivers/twinkle.cpp | 22 +- src/mame/drivers/twins.cpp | 9 +- src/mame/drivers/tx0.cpp | 4 +- src/mame/drivers/tx1.cpp | 6 +- src/mame/drivers/uapce.cpp | 3 +- src/mame/drivers/uknc.cpp | 3 +- src/mame/drivers/ultraman.cpp | 2 +- src/mame/drivers/ultratnk.cpp | 2 +- src/mame/drivers/ultrsprt.cpp | 3 +- src/mame/drivers/umipoker.cpp | 3 +- src/mame/drivers/undrfire.cpp | 4 +- src/mame/drivers/unianapc.cpp | 3 +- src/mame/drivers/unichamp.cpp | 3 +- src/mame/drivers/unico.cpp | 6 +- src/mame/drivers/unior.cpp | 3 +- src/mame/drivers/unistar.cpp | 3 +- src/mame/drivers/univac.cpp | 3 +- src/mame/drivers/unixpc.cpp | 3 +- src/mame/drivers/unkhorse.cpp | 3 +- src/mame/drivers/upscope.cpp | 3 +- src/mame/drivers/usbilliards.cpp | 3 +- src/mame/drivers/usgames.cpp | 4 +- src/mame/drivers/ut88.cpp | 4 +- src/mame/drivers/uzebox.cpp | 3 +- src/mame/drivers/v100.cpp | 3 +- src/mame/drivers/v102.cpp | 3 +- src/mame/drivers/v1050.cpp | 2 +- src/mame/drivers/v6809.cpp | 3 +- src/mame/drivers/vamphalf.cpp | 48 ++- src/mame/drivers/vaportra.cpp | 2 +- src/mame/drivers/vastar.cpp | 2 +- src/mame/drivers/vax11.cpp | 3 +- src/mame/drivers/vball.cpp | 2 +- src/mame/drivers/vboy.cpp | 3 +- src/mame/drivers/vc4000.cpp | 14 +- src/mame/drivers/vcombat.cpp | 6 +- src/mame/drivers/vcs80.cpp | 2 +- src/mame/drivers/vd.cpp | 7 +- src/mame/drivers/vector06.cpp | 2 +- src/mame/drivers/vector4.cpp | 3 +- src/mame/drivers/vectrex.cpp | 4 +- src/mame/drivers/vectrix.cpp | 3 +- src/mame/drivers/vega.cpp | 3 +- src/mame/drivers/vegaeo.cpp | 3 +- src/mame/drivers/vegas.cpp | 59 ++-- src/mame/drivers/vendetta.cpp | 4 +- src/mame/drivers/vertigo.cpp | 46 ++- src/mame/drivers/vg5k.cpp | 3 +- src/mame/drivers/vgmplay.cpp | 3 +- src/mame/drivers/vic10.cpp | 3 +- src/mame/drivers/vic20.cpp | 9 +- src/mame/drivers/vicdual.cpp | 60 ++-- src/mame/drivers/victor9k.cpp | 3 +- src/mame/drivers/victory.cpp | 2 +- src/mame/drivers/vidbrain.cpp | 2 +- src/mame/drivers/videopin.cpp | 2 +- src/mame/drivers/videopkr.cpp | 18 +- src/mame/drivers/vigilant.cpp | 6 +- src/mame/drivers/vii.cpp | 12 +- src/mame/drivers/vindictr.cpp | 2 +- src/mame/drivers/vip.cpp | 4 +- src/mame/drivers/viper.cpp | 3 +- src/mame/drivers/vis.cpp | 7 +- src/mame/drivers/vixen.cpp | 2 +- src/mame/drivers/vk100.cpp | 3 +- src/mame/drivers/vlc.cpp | 3 +- src/mame/drivers/volfied.cpp | 2 +- src/mame/drivers/votrpss.cpp | 3 +- src/mame/drivers/votrtnt.cpp | 3 +- src/mame/drivers/voyager.cpp | 3 +- src/mame/drivers/vp101.cpp | 6 +- src/mame/drivers/vp122.cpp | 3 +- src/mame/drivers/vp60.cpp | 3 +- src/mame/drivers/vpoker.cpp | 3 +- src/mame/drivers/vroulet.cpp | 3 +- src/mame/drivers/vsmilepro.cpp | 3 +- src/mame/drivers/vsnes.cpp | 16 +- src/mame/drivers/vt100.cpp | 9 +- src/mame/drivers/vt220.cpp | 3 +- src/mame/drivers/vt240.cpp | 6 +- src/mame/drivers/vt320.cpp | 3 +- src/mame/drivers/vt520.cpp | 6 +- src/mame/drivers/vta2000.cpp | 3 +- src/mame/drivers/vtech1.cpp | 15 +- src/mame/drivers/vtech2.cpp | 6 +- src/mame/drivers/vulgus.cpp | 2 +- src/mame/drivers/wacky_gator.cpp | 3 +- src/mame/drivers/wallc.cpp | 6 +- src/mame/drivers/wangpc.cpp | 3 +- src/mame/drivers/wardner.cpp | 3 +- src/mame/drivers/warpsped.cpp | 3 +- src/mame/drivers/warpwarp.cpp | 10 +- src/mame/drivers/warriorb.cpp | 4 +- src/mame/drivers/wc90.cpp | 6 +- src/mame/drivers/wc90b.cpp | 2 +- src/mame/drivers/wecleman.cpp | 4 +- src/mame/drivers/welltris.cpp | 4 +- src/mame/drivers/wgp.cpp | 4 +- src/mame/drivers/wheelfir.cpp | 3 +- src/mame/drivers/white_mod.cpp | 3 +- src/mame/drivers/whitestar.cpp | 3 +- src/mame/drivers/wicat.cpp | 3 +- src/mame/drivers/wico.cpp | 3 +- src/mame/drivers/wildpkr.cpp | 6 +- src/mame/drivers/williams.cpp | 30 +- src/mame/drivers/wink.cpp | 3 +- src/mame/drivers/wiping.cpp | 2 +- src/mame/drivers/witch.cpp | 3 +- src/mame/drivers/wiz.cpp | 8 +- src/mame/drivers/wmg.cpp | 3 +- src/mame/drivers/wms.cpp | 3 +- src/mame/drivers/wolfpack.cpp | 2 +- src/mame/drivers/wpc_95.cpp | 3 +- src/mame/drivers/wpc_an.cpp | 9 +- src/mame/drivers/wpc_dcs.cpp | 3 +- src/mame/drivers/wpc_dot.cpp | 2 +- src/mame/drivers/wpc_flip1.cpp | 2 +- src/mame/drivers/wpc_flip2.cpp | 2 +- src/mame/drivers/wpc_s.cpp | 3 +- src/mame/drivers/wrally.cpp | 2 +- src/mame/drivers/wswan.cpp | 4 +- src/mame/drivers/wwfsstar.cpp | 2 +- src/mame/drivers/wyse.cpp | 3 +- src/mame/drivers/wyvernf0.cpp | 3 +- src/mame/drivers/x07.cpp | 2 +- src/mame/drivers/x1.cpp | 4 +- src/mame/drivers/x1twin.cpp | 3 +- src/mame/drivers/x68k.cpp | 8 +- src/mame/drivers/xain.cpp | 4 +- src/mame/drivers/xavix.cpp | 3 +- src/mame/drivers/xbox.cpp | 3 +- src/mame/drivers/xerox820.cpp | 10 +- src/mame/drivers/xexex.cpp | 2 +- src/mame/drivers/xmen.cpp | 4 +- src/mame/drivers/xor100.cpp | 2 +- src/mame/drivers/xorworld.cpp | 2 +- src/mame/drivers/xtheball.cpp | 3 +- src/mame/drivers/xtom3d.cpp | 3 +- src/mame/drivers/xxmissio.cpp | 2 +- src/mame/drivers/xybots.cpp | 2 +- src/mame/drivers/xyonix.cpp | 2 +- src/mame/drivers/yiear.cpp | 2 +- src/mame/drivers/ymmu100.cpp | 3 +- src/mame/drivers/yunsun16.cpp | 4 +- src/mame/drivers/yunsung8.cpp | 2 +- src/mame/drivers/yuvomz80.cpp | 6 +- src/mame/drivers/z100.cpp | 3 +- src/mame/drivers/z1013.cpp | 6 +- src/mame/drivers/z80dev.cpp | 3 +- src/mame/drivers/z80ne.cpp | 8 +- src/mame/drivers/z88.cpp | 2 +- src/mame/drivers/z9001.cpp | 3 +- src/mame/drivers/zac2650.cpp | 2 +- src/mame/drivers/zac_1.cpp | 6 +- src/mame/drivers/zac_2.cpp | 3 +- src/mame/drivers/zac_proto.cpp | 3 +- src/mame/drivers/zaccaria.cpp | 2 +- src/mame/drivers/zapcomputer.cpp | 3 +- src/mame/drivers/zaurus.cpp | 3 +- src/mame/drivers/zaxxon.cpp | 16 +- src/mame/drivers/zerozone.cpp | 2 +- src/mame/drivers/zexall.cpp | 3 +- src/mame/drivers/zms8085.cpp | 3 +- src/mame/drivers/zn.cpp | 117 ++++--- src/mame/drivers/zodiack.cpp | 2 +- src/mame/drivers/zorba.cpp | 6 +- src/mame/drivers/zr107.cpp | 6 +- src/mame/drivers/zrt80.cpp | 3 +- src/mame/drivers/zsbc3.cpp | 3 +- src/mame/drivers/zt8802.cpp | 3 +- src/mame/drivers/zwackery.cpp | 3 +- src/mame/drivers/zx.cpp | 14 +- src/mame/etc/korgm1.cpp | 4 +- src/mame/etc/template_device.cpp | 2 +- src/mame/etc/template_driver.cpp | 4 +- src/mame/etc/unkfr.cpp | 4 +- src/mame/includes/1942.h | 2 + src/mame/includes/1943.h | 1 + src/mame/includes/20pacgal.h | 6 +- src/mame/includes/3do.h | 2 + src/mame/includes/40love.h | 2 + src/mame/includes/4enraya.h | 2 + src/mame/includes/8080bw.h | 30 ++ src/mame/includes/88games.h | 1 + src/mame/includes/abc1600.h | 1 + src/mame/includes/abc80.h | 6 +- src/mame/includes/abc80x.h | 10 + src/mame/includes/ac1.h | 2 + src/mame/includes/actfancr.h | 2 + src/mame/includes/adam.h | 1 + src/mame/includes/advision.h | 1 + src/mame/includes/aeroboto.h | 1 + src/mame/includes/aerofgt.h | 14 + src/mame/includes/aim65.h | 1 + src/mame/includes/airbustr.h | 2 + src/mame/includes/ajax.h | 1 + src/mame/includes/alesis.h | 3 + src/mame/includes/aliens.h | 1 + src/mame/includes/alpha68k.h | 10 + src/mame/includes/amiga.h | 6 +- src/mame/includes/ampoker2.h | 2 + src/mame/includes/amspdwy.h | 1 + src/mame/includes/amstrad.h | 9 + src/mame/includes/angelkds.h | 2 + src/mame/includes/apollo.h | 24 +- src/mame/includes/apple2gs.h | 2 + src/mame/includes/apple3.h | 1 + src/mame/includes/appoooh.h | 4 + src/mame/includes/aquarium.h | 1 + src/mame/includes/aquarius.h | 1 + src/mame/includes/arabian.h | 1 + src/mame/includes/arcadecl.h | 2 + src/mame/includes/arcadia.h | 1 + src/mame/includes/argus.h | 3 + src/mame/includes/arkanoid.h | 8 + src/mame/includes/armedf.h | 10 + src/mame/includes/artmagic.h | 4 + src/mame/includes/ashnojoe.h | 1 + src/mame/includes/asterix.h | 1 + src/mame/includes/asteroid.h | 13 +- src/mame/includes/astrocde.h | 13 + src/mame/includes/astrof.h | 16 +- src/mame/includes/asuka.h | 6 + src/mame/includes/atarifb.h | 4 + src/mame/includes/atarig1.h | 8 + src/mame/includes/atarig42.h | 3 + src/mame/includes/atarigt.h | 4 + src/mame/includes/atarigx2.h | 3 + src/mame/includes/atarist.h | 7 + src/mame/includes/atarisy1.h | 7 + src/mame/includes/atarisy2.h | 6 + src/mame/includes/atetris.h | 3 + src/mame/includes/atom.h | 3 + src/mame/includes/aussiebyte.h | 1 + src/mame/includes/avalnche.h | 11 +- src/mame/includes/avigo.h | 1 + src/mame/includes/aztarac.h | 1 + src/mame/includes/b2m.h | 2 + src/mame/includes/badlands.h | 2 + src/mame/includes/bagman.h | 6 + src/mame/includes/balsente.h | 2 + src/mame/includes/bankp.h | 1 + src/mame/includes/baraduke.h | 1 + src/mame/includes/batman.h | 1 + src/mame/includes/battlane.h | 1 + src/mame/includes/battlera.h | 1 + src/mame/includes/battlex.h | 2 + src/mame/includes/battlnts.h | 1 + src/mame/includes/bbc.h | 27 ++ src/mame/includes/bbusters.h | 2 + src/mame/includes/beathead.h | 1 + src/mame/includes/bebox.h | 3 + src/mame/includes/bfm_ad5.h | 1 + src/mame/includes/bfm_sc4.h | 49 +-- src/mame/includes/bfm_sc5.h | 1 + src/mame/includes/bigevglf.h | 1 + src/mame/includes/bigstrkb.h | 1 + src/mame/includes/bionicc.h | 1 + src/mame/includes/bishi.h | 2 + src/mame/includes/bk.h | 2 + src/mame/includes/bking.h | 2 + src/mame/includes/bladestl.h | 1 + src/mame/includes/blktiger.h | 2 + src/mame/includes/blmbycar.h | 2 + src/mame/includes/blockout.h | 2 + src/mame/includes/bloodbro.h | 3 + src/mame/includes/blstroid.h | 1 + src/mame/includes/blueprnt.h | 2 + src/mame/includes/bogeyman.h | 1 + src/mame/includes/bombjack.h | 1 + src/mame/includes/boogwing.h | 1 + src/mame/includes/bosco.h | 1 + src/mame/includes/bottom9.h | 1 + src/mame/includes/brkthru.h | 2 + src/mame/includes/bsktball.h | 1 + src/mame/includes/btime.h | 10 + src/mame/includes/btoads.h | 1 + src/mame/includes/bublbobl.h | 7 + src/mame/includes/buggychl.h | 1 + src/mame/includes/bullet.h | 2 + src/mame/includes/busicom.h | 1 + src/mame/includes/bw12.h | 4 + src/mame/includes/bw2.h | 1 + src/mame/includes/bwidow.h | 13 +- src/mame/includes/bwing.h | 1 + src/mame/includes/bzone.h | 8 +- src/mame/includes/c80.h | 1 + src/mame/includes/cabal.h | 4 + src/mame/includes/calomega.h | 4 + src/mame/includes/canyon.h | 1 + src/mame/includes/capbowl.h | 2 + src/mame/includes/carpolo.h | 1 + src/mame/includes/cave.h | 20 ++ src/mame/includes/cbasebal.h | 1 + src/mame/includes/cbuster.h | 1 + src/mame/includes/ccastles.h | 1 + src/mame/includes/cchasm.h | 1 + src/mame/includes/cclimber.h | 10 + src/mame/includes/cdi.h | 9 + src/mame/includes/centiped.h | 10 + src/mame/includes/cgc7900.h | 6 +- src/mame/includes/chaknpop.h | 1 + src/mame/includes/champbas.h | 9 + src/mame/includes/changela.h | 1 + src/mame/includes/channelf.h | 5 + src/mame/includes/cheekyms.h | 1 + src/mame/includes/chqflag.h | 1 + src/mame/includes/cidelsa.h | 13 +- src/mame/includes/cinemat.h | 54 ++- src/mame/includes/circus.h | 4 + src/mame/includes/circusc.h | 1 + src/mame/includes/cischeat.h | 8 + src/mame/includes/citycon.h | 1 + src/mame/includes/cloak.h | 1 + src/mame/includes/cloud9.h | 1 + src/mame/includes/clshroad.h | 2 + src/mame/includes/cninja.h | 7 + src/mame/includes/coco.h | 7 +- src/mame/includes/coco12.h | 7 + src/mame/includes/coco3.h | 4 + src/mame/includes/coleco.h | 4 + src/mame/includes/combatsc.h | 2 + src/mame/includes/commando.h | 1 + src/mame/includes/compgolf.h | 1 + src/mame/includes/comquest.h | 1 + src/mame/includes/comx35.h | 10 +- src/mame/includes/concept.h | 1 + src/mame/includes/contra.h | 1 + src/mame/includes/coolpool.h | 3 + src/mame/includes/cop01.h | 2 + src/mame/includes/copsnrob.h | 5 +- src/mame/includes/cosmic.h | 7 + src/mame/includes/cosmicos.h | 1 + src/mame/includes/cps1.h | 26 +- src/mame/includes/cps3.h | 14 + src/mame/includes/crbaloon.h | 7 +- src/mame/includes/crgolf.h | 7 +- src/mame/includes/crimfght.h | 1 + src/mame/includes/crospang.h | 3 + src/mame/includes/crshrace.h | 1 + src/mame/includes/crvision.h | 4 + src/mame/includes/cvs.h | 1 + src/mame/includes/cxhumax.h | 1 + src/mame/includes/cyberbal.h | 3 + src/mame/includes/cybiko.h | 3 + src/mame/includes/cybstorm.h | 2 + src/mame/includes/dai.h | 1 + src/mame/includes/darius.h | 1 + src/mame/includes/darkmist.h | 1 + src/mame/includes/darkseal.h | 1 + src/mame/includes/dassault.h | 1 + src/mame/includes/dbz.h | 1 + src/mame/includes/dc.h | 2 + src/mame/includes/dccons.h | 2 + src/mame/includes/dcheese.h | 2 + src/mame/includes/dcon.h | 2 + src/mame/includes/dday.h | 1 + src/mame/includes/ddragon.h | 7 + src/mame/includes/ddragon3.h | 5 + src/mame/includes/ddribble.h | 1 + src/mame/includes/deadang.h | 1 + src/mame/includes/dec0.h | 17 + src/mame/includes/dec8.h | 10 + src/mame/includes/deco32.h | 10 + src/mame/includes/deco_mlc.h | 4 + src/mame/includes/decocass.h | 32 ++ src/mame/includes/deniam.h | 2 + src/mame/includes/dgn_beta.h | 1 + src/mame/includes/dgnalpha.h | 1 + src/mame/includes/dietgo.h | 1 + src/mame/includes/digdug.h | 2 + src/mame/includes/divebomb.h | 1 + src/mame/includes/djboy.h | 1 + src/mame/includes/djmain.h | 3 + src/mame/includes/dkong.h | 28 +- src/mame/includes/dm7000.h | 1 + src/mame/includes/docastle.h | 3 + src/mame/includes/dogfgt.h | 1 + src/mame/includes/dragon.h | 6 + src/mame/includes/dragrace.h | 1 + src/mame/includes/drgnmst.h | 1 + src/mame/includes/dribling.h | 1 + src/mame/includes/drmicro.h | 1 + src/mame/includes/dynax.h | 21 ++ src/mame/includes/dynduke.h | 2 + src/mame/includes/electron.h | 2 + src/mame/includes/elf.h | 1 + src/mame/includes/eolith.h | 3 + src/mame/includes/epos.h | 2 + src/mame/includes/eprom.h | 3 + src/mame/includes/equites.h | 5 + src/mame/includes/esd16.h | 6 + src/mame/includes/espial.h | 2 + src/mame/includes/esripsys.h | 1 + src/mame/includes/eti660.h | 1 + src/mame/includes/exedexes.h | 1 + src/mame/includes/exerion.h | 1 + src/mame/includes/exidy.h | 14 + src/mame/includes/exidy440.h | 10 +- src/mame/includes/exp85.h | 1 + src/mame/includes/exprraid.h | 2 + src/mame/includes/exterm.h | 1 + src/mame/includes/exzisus.h | 1 + src/mame/includes/f1gp.h | 3 + src/mame/includes/fantland.h | 4 + src/mame/includes/fastfred.h | 3 + src/mame/includes/fastlane.h | 1 + src/mame/includes/fcombat.h | 1 + src/mame/includes/fgoal.h | 1 + src/mame/includes/finalizr.h | 1 + src/mame/includes/firetrap.h | 2 + src/mame/includes/firetrk.h | 3 + src/mame/includes/fitfight.h | 2 + src/mame/includes/flkatck.h | 1 + src/mame/includes/flstory.h | 5 + src/mame/includes/fm7.h | 5 + src/mame/includes/fmtowns.h | 7 + src/mame/includes/foodf.h | 1 + src/mame/includes/freekick.h | 8 + src/mame/includes/fromanc2.h | 3 + src/mame/includes/fromance.h | 3 + src/mame/includes/funkybee.h | 1 + src/mame/includes/funkyjet.h | 1 + src/mame/includes/funworld.h | 14 + src/mame/includes/funybubl.h | 1 + src/mame/includes/fuukifg2.h | 1 + src/mame/includes/fuukifg3.h | 1 + src/mame/includes/gaelco.h | 4 + src/mame/includes/gaelco2.h | 10 + src/mame/includes/gaelco3d.h | 3 + src/mame/includes/gaiden.h | 4 + src/mame/includes/galaga.h | 3 + src/mame/includes/galastrm.h | 1 + src/mame/includes/galaxia.h | 2 + src/mame/includes/galaxian.h | 46 ++- src/mame/includes/galaxold.h | 27 ++ src/mame/includes/galaxy.h | 2 + src/mame/includes/galeb.h | 1 + src/mame/includes/galivan.h | 3 + src/mame/includes/galpani2.h | 1 + src/mame/includes/galpanic.h | 2 + src/mame/includes/galspnbl.h | 1 + src/mame/includes/gamecom.h | 1 + src/mame/includes/gameplan.h | 12 +- src/mame/includes/gamepock.h | 1 + src/mame/includes/gaplus.h | 3 + src/mame/includes/gatron.h | 1 + src/mame/includes/gauntlet.h | 5 + src/mame/includes/gb.h | 6 + src/mame/includes/gba.h | 1 + src/mame/includes/gberet.h | 3 + src/mame/includes/gcpinbal.h | 1 + src/mame/includes/gijoe.h | 1 + src/mame/includes/ginganin.h | 1 + src/mame/includes/gladiatr.h | 2 + src/mame/includes/glass.h | 2 + src/mame/includes/gng.h | 2 + src/mame/includes/goal92.h | 1 + src/mame/includes/goindol.h | 1 + src/mame/includes/goldstar.h | 35 ++ src/mame/includes/gomoku.h | 1 + src/mame/includes/gotcha.h | 1 + src/mame/includes/gottlieb.h | 11 + src/mame/includes/gotya.h | 1 + src/mame/includes/gp32.h | 1 + src/mame/includes/gradius3.h | 1 + src/mame/includes/grchamp.h | 1 + src/mame/includes/gridlee.h | 1 + src/mame/includes/groundfx.h | 1 + src/mame/includes/gstriker.h | 3 + src/mame/includes/gsword.h | 2 + src/mame/includes/gumbo.h | 3 + src/mame/includes/gunbustr.h | 1 + src/mame/includes/gundealr.h | 3 + src/mame/includes/gunsmoke.h | 1 + src/mame/includes/gyruss.h | 1 + src/mame/includes/hanaawas.h | 1 + src/mame/includes/harddriv.h | 10 + src/mame/includes/hcastle.h | 1 + src/mame/includes/hec2hrp.h | 9 +- src/mame/includes/hexion.h | 2 + src/mame/includes/higemaru.h | 1 + src/mame/includes/himesiki.h | 1 + src/mame/includes/hitme.h | 2 + src/mame/includes/hnayayoi.h | 3 + src/mame/includes/hng64.h | 3 + src/mame/includes/holeland.h | 2 + src/mame/includes/homedata.h | 6 + src/mame/includes/homerun.h | 3 + src/mame/includes/hp48.h | 7 + src/mame/includes/hp9845.h | 2 + src/mame/includes/huebler.h | 1 + src/mame/includes/hx20.h | 2 + src/mame/includes/hyhoo.h | 2 + src/mame/includes/hyperspt.h | 3 + src/mame/includes/hyprduel.h | 2 + src/mame/includes/ikki.h | 1 + src/mame/includes/imds2.h | 1 + src/mame/includes/interpro.h | 12 + src/mame/includes/intv.h | 5 + src/mame/includes/inufuku.h | 2 + src/mame/includes/iqblock.h | 1 + src/mame/includes/irobot.h | 1 + src/mame/includes/ironhors.h | 2 + src/mame/includes/itech32.h | 5 + src/mame/includes/itech8.h | 19 + src/mame/includes/jack.h | 5 + src/mame/includes/jackal.h | 1 + src/mame/includes/jaguar.h | 5 + src/mame/includes/jailbrek.h | 1 + src/mame/includes/jedi.h | 9 +- src/mame/includes/jpmimpct.h | 2 + src/mame/includes/jpmsys5.h | 3 + src/mame/includes/kaneko16.h | 12 + src/mame/includes/kangaroo.h | 2 + src/mame/includes/karnov.h | 4 + src/mame/includes/kaypro.h | 7 + src/mame/includes/kc.h | 3 + src/mame/includes/kchamp.h | 2 + src/mame/includes/kickgoal.h | 2 + src/mame/includes/kim1.h | 1 + src/mame/includes/kingobox.h | 2 + src/mame/includes/klax.h | 2 + src/mame/includes/kncljoe.h | 1 + src/mame/includes/konamigx.h | 16 + src/mame/includes/kopunch.h | 1 + src/mame/includes/kramermc.h | 1 + src/mame/includes/ksayakyu.h | 1 + src/mame/includes/kyocera.h | 13 +- src/mame/includes/kyugo.h | 6 + src/mame/includes/labyrunr.h | 1 + src/mame/includes/ladybug.h | 2 + src/mame/includes/ladyfrog.h | 2 + src/mame/includes/laserbat.h | 3 + src/mame/includes/lasso.h | 5 + src/mame/includes/lastduel.h | 2 + src/mame/includes/lazercmd.h | 3 + src/mame/includes/lc80.h | 2 + src/mame/includes/legionna.h | 7 + src/mame/includes/leland.h | 14 +- src/mame/includes/lemmings.h | 1 + src/mame/includes/lethal.h | 2 + src/mame/includes/lethalj.h | 2 + src/mame/includes/liberate.h | 6 + src/mame/includes/liberatr.h | 2 + src/mame/includes/lisa.h | 3 + src/mame/includes/lkage.h | 2 + src/mame/includes/llc.h | 2 + src/mame/includes/lockon.h | 1 + src/mame/includes/lordgun.h | 2 + src/mame/includes/lsasquad.h | 3 + src/mame/includes/lucky74.h | 1 + src/mame/includes/lvcards.h | 3 + src/mame/includes/lviv.h | 1 + src/mame/includes/lwings.h | 5 + src/mame/includes/lynx.h | 1 + src/mame/includes/m10.h | 4 + src/mame/includes/m107.h | 4 + src/mame/includes/m5.h | 4 + src/mame/includes/m52.h | 2 + src/mame/includes/m57.h | 1 + src/mame/includes/m58.h | 1 + src/mame/includes/m62.h | 12 + src/mame/includes/m72.h | 16 + src/mame/includes/m79amb.h | 1 + src/mame/includes/m90.h | 10 + src/mame/includes/m92.h | 16 + src/mame/includes/mac.h | 30 ++ src/mame/includes/macpci.h | 1 + src/mame/includes/macrossp.h | 2 + src/mame/includes/madalien.h | 5 +- src/mame/includes/madmotor.h | 1 + src/mame/includes/magmax.h | 1 + src/mame/includes/mainevt.h | 2 + src/mame/includes/mainsnk.h | 1 + src/mame/includes/malzak.h | 2 + src/mame/includes/mappy.h | 10 + src/mame/includes/marineb.h | 7 + src/mame/includes/mario.h | 10 +- src/mame/includes/markham.h | 1 + src/mame/includes/matmania.h | 2 + src/mame/includes/maygay1b.h | 9 +- src/mame/includes/mbc55x.h | 1 + src/mame/includes/mbee.h | 9 + src/mame/includes/mc1502.h | 1 + src/mame/includes/mcatadv.h | 2 + src/mame/includes/mcr.h | 9 + src/mame/includes/mcr3.h | 6 + src/mame/includes/mcr68.h | 7 + src/mame/includes/meadows.h | 3 + src/mame/includes/megadriv.h | 26 +- src/mame/includes/megadrvb.h | 6 + src/mame/includes/megasys1.h | 12 + src/mame/includes/megazone.h | 1 + src/mame/includes/mermaid.h | 2 + src/mame/includes/metalmx.h | 1 + src/mame/includes/metlclsh.h | 1 + src/mame/includes/metro.h | 35 ++ src/mame/includes/mexico86.h | 3 + src/mame/includes/mhavoc.h | 3 + src/mame/includes/micro3d.h | 2 + src/mame/includes/micronic.h | 1 + src/mame/includes/microtan.h | 1 + src/mame/includes/midtunit.h | 3 + src/mame/includes/midvunit.h | 5 + src/mame/includes/midwunit.h | 3 + src/mame/includes/midxunit.h | 1 + src/mame/includes/midyunit.h | 9 + src/mame/includes/midzeus.h | 4 + src/mame/includes/mikie.h | 1 + src/mame/includes/mikro80.h | 3 + src/mame/includes/mikromik.h | 10 +- src/mame/includes/mitchell.h | 8 + src/mame/includes/mjkjidai.h | 1 + src/mame/includes/model1.h | 4 + src/mame/includes/model2.h | 19 + src/mame/includes/model3.h | 7 + src/mame/includes/momoko.h | 1 + src/mame/includes/moo.h | 3 + src/mame/includes/mosaic.h | 2 + src/mame/includes/mouser.h | 1 + src/mame/includes/mpf1.h | 3 + src/mame/includes/mpu4.h | 45 ++- src/mame/includes/mpz80.h | 1 + src/mame/includes/mrdo.h | 2 + src/mame/includes/mrflea.h | 1 + src/mame/includes/mrjong.h | 1 + src/mame/includes/ms32.h | 2 + src/mame/includes/msisaac.h | 1 + src/mame/includes/msx.h | 306 +++++++++++++++- src/mame/includes/mtx.h | 3 + src/mame/includes/mugsmash.h | 1 + src/mame/includes/multfish.h | 4 +- src/mame/includes/munchmo.h | 1 + src/mame/includes/mustache.h | 1 + src/mame/includes/mw8080bw.h | 91 +++-- src/mame/includes/mystston.h | 6 +- src/mame/includes/mystwarr.h | 6 + src/mame/includes/mz700.h | 2 + src/mame/includes/mz80.h | 3 + src/mame/includes/n8080.h | 13 +- src/mame/includes/namcofl.h | 1 + src/mame/includes/namcona1.h | 4 + src/mame/includes/namconb1.h | 2 + src/mame/includes/namcond1.h | 2 + src/mame/includes/namcos1.h | 1 + src/mame/includes/namcos2.h | 11 + src/mame/includes/namcos21.h | 4 + src/mame/includes/namcos22.h | 12 + src/mame/includes/namcos86.h | 5 + src/mame/includes/naomi.h | 16 +- src/mame/includes/naughtyb.h | 2 + src/mame/includes/nbmj8688.h | 43 +++ src/mame/includes/nbmj8891.h | 28 ++ src/mame/includes/nbmj8900.h | 2 + src/mame/includes/nbmj8991.h | 21 ++ src/mame/includes/nbmj9195.h | 33 ++ src/mame/includes/nc.h | 2 + src/mame/includes/nds.h | 1 + src/mame/includes/nemesis.h | 10 + src/mame/includes/neogeo.h | 72 +++- src/mame/includes/nes.h | 8 + src/mame/includes/newbrain.h | 10 +- src/mame/includes/news.h | 1 + src/mame/includes/next.h | 11 + src/mame/includes/ninjakd2.h | 7 + src/mame/includes/ninjaw.h | 2 + src/mame/includes/nitedrvr.h | 1 + src/mame/includes/niyanpai.h | 4 + src/mame/includes/nmk16.h | 33 ++ src/mame/includes/norautp.h | 14 + src/mame/includes/nova2001.h | 4 + src/mame/includes/nycaptor.h | 3 + src/mame/includes/ob68k1a.h | 1 + src/mame/includes/offtwall.h | 1 + src/mame/includes/ohmygod.h | 1 + src/mame/includes/ojankohs.h | 4 + src/mame/includes/ondra.h | 1 + src/mame/includes/oneshot.h | 2 + src/mame/includes/opwolf.h | 3 + src/mame/includes/orao.h | 1 + src/mame/includes/orbit.h | 1 + src/mame/includes/orion.h | 5 + src/mame/includes/osborne1.h | 2 + src/mame/includes/osi.h | 13 +- src/mame/includes/othunder.h | 1 + src/mame/includes/overdriv.h | 1 + src/mame/includes/p2000t.h | 2 + src/mame/includes/pacland.h | 1 + src/mame/includes/pacman.h | 27 ++ src/mame/includes/pandoras.h | 1 + src/mame/includes/paradise.h | 6 + src/mame/includes/parodius.h | 1 + src/mame/includes/partner.h | 1 + src/mame/includes/pass.h | 1 + src/mame/includes/pastelg.h | 2 + src/mame/includes/patinhofeio.h | 1 + src/mame/includes/pbaction.h | 2 + src/mame/includes/pc1251.h | 5 + src/mame/includes/pc1350.h | 1 + src/mame/includes/pc1401.h | 2 + src/mame/includes/pc1403.h | 2 + src/mame/includes/pc1512.h | 9 +- src/mame/includes/pc4.h | 1 + src/mame/includes/pc8001.h | 2 + src/mame/includes/pc8401a.h | 9 +- src/mame/includes/pc9801.h | 14 + src/mame/includes/pce.h | 4 + src/mame/includes/pcktgal.h | 3 + src/mame/includes/pcw.h | 4 + src/mame/includes/pcw16.h | 1 + src/mame/includes/pdp1.h | 1 + src/mame/includes/pecom.h | 6 +- src/mame/includes/pes.h | 1 + src/mame/includes/pgm.h | 5 +- src/mame/includes/pgm2.h | 4 + src/mame/includes/phc25.h | 3 + src/mame/includes/phoenix.h | 4 + src/mame/includes/pingpong.h | 2 + src/mame/includes/pirates.h | 1 + src/mame/includes/pitnrun.h | 2 + src/mame/includes/pk8020.h | 1 + src/mame/includes/pktgaldx.h | 2 + src/mame/includes/playch10.h | 3 + src/mame/includes/playmark.h | 7 + src/mame/includes/plygonet.h | 1 + src/mame/includes/pmd85.h | 7 + src/mame/includes/pocketc.h | 1 + src/mame/includes/pokechmp.h | 1 + src/mame/includes/polepos.h | 3 + src/mame/includes/policetr.h | 2 + src/mame/includes/poly88.h | 2 + src/mame/includes/poly880.h | 1 + src/mame/includes/polyplay.h | 2 + src/mame/includes/poolshrk.h | 1 + src/mame/includes/pooyan.h | 1 + src/mame/includes/popeye.h | 4 + src/mame/includes/portrait.h | 1 + src/mame/includes/powerins.h | 3 + src/mame/includes/pp01.h | 1 + src/mame/includes/prehisle.h | 1 + src/mame/includes/primo.h | 7 + src/mame/includes/prof180x.h | 1 + src/mame/includes/prof80.h | 1 + src/mame/includes/psikyo.h | 5 + src/mame/includes/psikyo4.h | 2 + src/mame/includes/psikyosh.h | 3 + src/mame/includes/psion.h | 8 + src/mame/includes/psychic5.h | 2 + src/mame/includes/punchout.h | 3 + src/mame/includes/px8.h | 1 + src/mame/includes/qdrmfgp.h | 2 + src/mame/includes/qix.h | 24 +- src/mame/includes/quasar.h | 1 + src/mame/includes/quizdna.h | 3 + src/mame/includes/quizpani.h | 1 + src/mame/includes/radio86.h | 8 + src/mame/includes/raiden.h | 4 + src/mame/includes/raiden2.h | 4 + src/mame/includes/rallyx.h | 5 + src/mame/includes/rampart.h | 1 + src/mame/includes/rastan.h | 1 + src/mame/includes/rbisland.h | 3 + src/mame/includes/realbrk.h | 4 + src/mame/includes/redalert.h | 26 +- src/mame/includes/redclash.h | 3 + src/mame/includes/relief.h | 1 + src/mame/includes/renegade.h | 2 + src/mame/includes/retofinv.h | 4 + src/mame/includes/rltennis.h | 1 + src/mame/includes/rm380z.h | 2 + src/mame/includes/rmnimbus.h | 1 + src/mame/includes/rockrage.h | 1 + src/mame/includes/rocnrope.h | 1 + src/mame/includes/rohga.h | 5 + src/mame/includes/rollerg.h | 1 + src/mame/includes/rollrace.h | 2 + src/mame/includes/route16.h | 6 + src/mame/includes/rpunch.h | 3 + src/mame/includes/runaway.h | 2 + src/mame/includes/rungun.h | 2 + src/mame/includes/s11.h | 1 + src/mame/includes/s11a.h | 1 + src/mame/includes/s11b.h | 1 + src/mame/includes/s11c.h | 1 + src/mame/includes/sage2.h | 1 + src/mame/includes/samcoupe.h | 1 + src/mame/includes/sauro.h | 4 + src/mame/includes/sbasketb.h | 2 + src/mame/includes/sbugger.h | 1 + src/mame/includes/scotrsht.h | 1 + src/mame/includes/scramble.h | 21 +- src/mame/includes/sderby.h | 6 + src/mame/includes/segag80r.h | 19 +- src/mame/includes/segag80v.h | 7 + src/mame/includes/segahang.h | 18 + src/mame/includes/segaorun.h | 7 + src/mame/includes/segas16a.h | 11 + src/mame/includes/segas16b.h | 18 + src/mame/includes/segas18.h | 8 + src/mame/includes/segas24.h | 8 + src/mame/includes/segas32.h | 1 + src/mame/includes/segasp.h | 1 + src/mame/includes/segaybd.h | 3 + src/mame/includes/seibuspi.h | 8 + src/mame/includes/seicross.h | 3 + src/mame/includes/senjyo.h | 4 + src/mame/includes/seta.h | 48 +++ src/mame/includes/seta2.h | 17 + src/mame/includes/sf.h | 4 + src/mame/includes/sg1000.h | 4 + src/mame/includes/shadfrce.h | 1 + src/mame/includes/shangha3.h | 3 + src/mame/includes/shangkid.h | 3 + src/mame/includes/shaolins.h | 1 + src/mame/includes/shisen.h | 1 + src/mame/includes/shootout.h | 3 + src/mame/includes/shuuz.h | 1 + src/mame/includes/sidearms.h | 3 + src/mame/includes/sidepckt.h | 2 + src/mame/includes/silkroad.h | 1 + src/mame/includes/simpl156.h | 5 + src/mame/includes/simple_st0016.h | 3 + src/mame/includes/simpsons.h | 1 + src/mame/includes/skullxbo.h | 1 + src/mame/includes/skydiver.h | 1 + src/mame/includes/skyfox.h | 1 + src/mame/includes/skykid.h | 1 + src/mame/includes/skyraid.h | 1 + src/mame/includes/slapfght.h | 9 + src/mame/includes/slapshot.h | 2 + src/mame/includes/sms.h | 19 + src/mame/includes/sms_bootleg.h | 1 + src/mame/includes/snk.h | 21 ++ src/mame/includes/snk6502.h | 6 + src/mame/includes/snk68.h | 3 + src/mame/includes/snookr10.h | 4 + src/mame/includes/snowbros.h | 11 + src/mame/includes/softbox.h | 1 + src/mame/includes/solomon.h | 1 + src/mame/includes/sonson.h | 1 + src/mame/includes/sorcerer.h | 2 + src/mame/includes/spacefb.h | 5 +- src/mame/includes/spbactn.h | 2 + src/mame/includes/spcforce.h | 2 + src/mame/includes/spdodgeb.h | 1 + src/mame/includes/spec128.h | 2 - src/mame/includes/special.h | 5 + src/mame/includes/spectrum.h | 9 +- src/mame/includes/speedatk.h | 1 + src/mame/includes/speedbal.h | 1 + src/mame/includes/speedspn.h | 1 + src/mame/includes/spiders.h | 5 +- src/mame/includes/splash.h | 3 + src/mame/includes/sprint2.h | 4 + src/mame/includes/sprint4.h | 1 + src/mame/includes/sprint8.h | 3 +- src/mame/includes/spy.h | 1 + src/mame/includes/srmp2.h | 4 + src/mame/includes/srumbler.h | 1 + src/mame/includes/sshangha.h | 2 + src/mame/includes/sslam.h | 2 + src/mame/includes/ssozumo.h | 1 + src/mame/includes/sspeedr.h | 1 + src/mame/includes/ssrj.h | 1 + src/mame/includes/ssv.h | 23 ++ src/mame/includes/ssystem3.h | 1 + src/mame/includes/stactics.h | 4 +- src/mame/includes/stadhero.h | 1 + src/mame/includes/starcrus.h | 1 + src/mame/includes/starfire.h | 2 + src/mame/includes/starshp1.h | 1 + src/mame/includes/starwars.h | 2 + src/mame/includes/stfight.h | 3 + src/mame/includes/stlforce.h | 2 + src/mame/includes/strnskil.h | 2 + src/mame/includes/stv.h | 7 + src/mame/includes/subs.h | 1 + src/mame/includes/suna16.h | 4 + src/mame/includes/suna8.h | 8 + src/mame/includes/super6.h | 1 + src/mame/includes/super80.h | 6 + src/mame/includes/superchs.h | 2 + src/mame/includes/superqix.h | 4 + src/mame/includes/suprloco.h | 1 + src/mame/includes/suprnova.h | 6 + src/mame/includes/suprridr.h | 1 + src/mame/includes/suprslam.h | 1 + src/mame/includes/surpratk.h | 1 + src/mame/includes/svision.h | 5 + src/mame/includes/swtpc09.h | 5 + src/mame/includes/system1.h | 45 +++ src/mame/includes/system16.h | 28 ++ src/mame/includes/tagteam.h | 1 + src/mame/includes/tail2nos.h | 1 + src/mame/includes/taito_b.h | 19 + src/mame/includes/taito_f2.h | 37 ++ src/mame/includes/taito_f3.h | 7 + src/mame/includes/taito_h.h | 4 + src/mame/includes/taito_l.h | 12 + src/mame/includes/taito_o.h | 1 + src/mame/includes/taito_x.h | 4 + src/mame/includes/taito_z.h | 11 + src/mame/includes/taitoair.h | 1 + src/mame/includes/taitojc.h | 2 + src/mame/includes/taitosj.h | 3 + src/mame/includes/tandy2k.h | 2 + src/mame/includes/tank8.h | 1 + src/mame/includes/tankbatt.h | 1 + src/mame/includes/tankbust.h | 1 + src/mame/includes/taotaido.h | 1 + src/mame/includes/targeth.h | 1 + src/mame/includes/tatsumi.h | 4 + src/mame/includes/taxidriv.h | 1 + src/mame/includes/tbowl.h | 1 + src/mame/includes/tceptor.h | 1 + src/mame/includes/tdv2324.h | 1 + src/mame/includes/tecmo.h | 5 + src/mame/includes/tecmo16.h | 3 + src/mame/includes/tecmosys.h | 1 + src/mame/includes/tehkanwc.h | 2 + src/mame/includes/tek405x.h | 2 + src/mame/includes/terracre.h | 4 + src/mame/includes/tetrisp2.h | 6 + src/mame/includes/thedeep.h | 1 + src/mame/includes/thepit.h | 5 + src/mame/includes/thief.h | 3 + src/mame/includes/thomson.h | 13 + src/mame/includes/thoop2.h | 1 + src/mame/includes/thunderj.h | 1 + src/mame/includes/thunderx.h | 3 + src/mame/includes/ti85.h | 12 + src/mame/includes/ti89.h | 5 + src/mame/includes/tiamc1.h | 2 + src/mame/includes/tigeroad.h | 5 + src/mame/includes/tiki100.h | 3 +- src/mame/includes/timelimt.h | 1 + src/mame/includes/timeplt.h | 4 + src/mame/includes/tmc1800.h | 15 +- src/mame/includes/tmc2000e.h | 1 + src/mame/includes/tmc600.h | 6 +- src/mame/includes/tmnt.h | 12 + src/mame/includes/tnzs.h | 12 + src/mame/includes/toaplan1.h | 9 + src/mame/includes/toaplan2.h | 22 ++ src/mame/includes/toki.h | 3 + src/mame/includes/toobin.h | 1 + src/mame/includes/topspeed.h | 1 + src/mame/includes/tp84.h | 2 + src/mame/includes/trackfld.h | 7 + src/mame/includes/tranz330.h | 1 + src/mame/includes/travrusa.h | 3 + src/mame/includes/triplhnt.h | 1 + src/mame/includes/trs80.h | 11 + src/mame/includes/trs80m2.h | 2 + src/mame/includes/truco.h | 1 + src/mame/includes/trucocl.h | 1 + src/mame/includes/tryout.h | 1 + src/mame/includes/tsamurai.h | 3 + src/mame/includes/tsispch.h | 1 + src/mame/includes/tubep.h | 3 + src/mame/includes/tumbleb.h | 14 + src/mame/includes/tunhunt.h | 1 + src/mame/includes/turbo.h | 14 +- src/mame/includes/turrett.h | 1 + src/mame/includes/tutankhm.h | 1 + src/mame/includes/twin16.h | 5 + src/mame/includes/twincobr.h | 3 + src/mame/includes/tx0.h | 2 + src/mame/includes/tx1.h | 3 + src/mame/includes/ultraman.h | 1 + src/mame/includes/ultratnk.h | 1 + src/mame/includes/undrfire.h | 2 + src/mame/includes/unico.h | 3 + src/mame/includes/usgames.h | 2 + src/mame/includes/ut88.h | 2 + src/mame/includes/v1050.h | 6 +- src/mame/includes/vaportra.h | 1 + src/mame/includes/vastar.h | 1 + src/mame/includes/vball.h | 1 + src/mame/includes/vc4000.h | 7 + src/mame/includes/vcs80.h | 1 + src/mame/includes/vector06.h | 1 + src/mame/includes/vectrex.h | 2 + src/mame/includes/vendetta.h | 2 + src/mame/includes/vertigo.h | 2 + src/mame/includes/vicdual.h | 35 ++ src/mame/includes/victory.h | 2 + src/mame/includes/vidbrain.h | 6 +- src/mame/includes/videopin.h | 1 + src/mame/includes/vigilant.h | 3 + src/mame/includes/vindictr.h | 1 + src/mame/includes/vip.h | 2 + src/mame/includes/vixen.h | 1 + src/mame/includes/volfied.h | 1 + src/mame/includes/vsnes.h | 8 + src/mame/includes/vtech2.h | 3 + src/mame/includes/vulgus.h | 1 + src/mame/includes/warpwarp.h | 5 + src/mame/includes/warriorb.h | 2 + src/mame/includes/wc90.h | 3 + src/mame/includes/wc90b.h | 1 + src/mame/includes/wecleman.h | 2 + src/mame/includes/welltris.h | 2 + src/mame/includes/wgp.h | 2 + src/mame/includes/williams.h | 15 + src/mame/includes/wiping.h | 1 + src/mame/includes/wiz.h | 4 + src/mame/includes/wolfpack.h | 1 + src/mame/includes/wpc_dot.h | 1 + src/mame/includes/wpc_flip1.h | 1 + src/mame/includes/wpc_flip2.h | 1 + src/mame/includes/wrally.h | 1 + src/mame/includes/wswan.h | 2 + src/mame/includes/wwfsstar.h | 1 + src/mame/includes/x07.h | 1 + src/mame/includes/x1.h | 2 + src/mame/includes/x68k.h | 4 + src/mame/includes/xain.h | 2 + src/mame/includes/xbox.h | 2 +- src/mame/includes/xerox820.h | 5 + src/mame/includes/xevious.h | 2 + src/mame/includes/xexex.h | 1 + src/mame/includes/xmen.h | 2 + src/mame/includes/xor100.h | 1 + src/mame/includes/xorworld.h | 1 + src/mame/includes/xxmissio.h | 1 + src/mame/includes/xybots.h | 1 + src/mame/includes/xyonix.h | 1 + src/mame/includes/yiear.h | 1 + src/mame/includes/yunsun16.h | 2 + src/mame/includes/yunsung8.h | 1 + src/mame/includes/z80ne.h | 4 + src/mame/includes/z88.h | 1 + src/mame/includes/zac2650.h | 1 + src/mame/includes/zaccaria.h | 1 + src/mame/includes/zaxxon.h | 14 +- src/mame/includes/zerozone.h | 1 + src/mame/includes/zodiack.h | 1 + src/mame/includes/zorba.h | 1 + src/mame/includes/zx.h | 7 + src/mame/machine/abc1600mac.cpp | 2 +- src/mame/machine/abc80kb.cpp | 2 +- src/mame/machine/acs8600_ics.cpp | 2 +- src/mame/machine/alpha8201.cpp | 2 +- src/mame/machine/apollo.cpp | 6 +- src/mame/machine/apricotkb.cpp | 2 +- src/mame/machine/asic65.cpp | 2 +- src/mame/machine/at.cpp | 4 +- src/mame/machine/at.h | 2 +- src/mame/machine/atarifdc.cpp | 2 +- src/mame/machine/beta.cpp | 2 +- src/mame/machine/c117.cpp | 2 +- src/mame/machine/cedar_magnet_flop.cpp | 2 +- src/mame/machine/cedar_magnet_plane.cpp | 2 +- src/mame/machine/cedar_magnet_sprite.cpp | 2 +- src/mame/machine/compiskb.cpp | 2 +- src/mame/machine/cuda.cpp | 2 +- src/mame/machine/dec_lk201.cpp | 2 +- src/mame/machine/decopincpu.cpp | 4 +- src/mame/machine/dmv_keyb.cpp | 2 +- src/mame/machine/egret.cpp | 2 +- src/mame/machine/esqlcd.cpp | 2 +- src/mame/machine/esqpanel.cpp | 8 +- src/mame/machine/esqvfd.cpp | 6 +- src/mame/machine/gaelco_ds5002fp.cpp | 2 +- src/mame/machine/genpin.cpp | 2 +- src/mame/machine/genpin.h | 5 +- src/mame/machine/hec2hrp.cpp | 2 +- src/mame/machine/hng64_net.cpp | 2 +- src/mame/machine/hng64_net.h | 4 - src/mame/machine/hp9845_printer.cpp | 2 +- src/mame/machine/ibm6580_fdc.cpp | 2 +- src/mame/machine/ibm6580_kbd.cpp | 2 +- src/mame/machine/inder_sb.cpp | 2 +- src/mame/machine/inder_vid.cpp | 2 +- src/mame/machine/isbc_208.cpp | 2 +- src/mame/machine/isbc_215g.cpp | 2 +- src/mame/machine/iteagle_fpga.cpp | 6 +- src/mame/machine/jvs13551.cpp | 2 +- src/mame/machine/k573cass.cpp | 10 +- src/mame/machine/k573dio.cpp | 2 +- src/mame/machine/k7659kb.cpp | 2 +- src/mame/machine/kay_kbd.cpp | 2 +- src/mame/machine/km035.cpp | 2 +- src/mame/machine/lisa.cpp | 4 +- src/mame/machine/m1comm.cpp | 2 +- src/mame/machine/m20_8086.cpp | 2 +- src/mame/machine/m24_kbd.cpp | 2 +- src/mame/machine/m24_z8000.cpp | 2 +- src/mame/machine/m2comm.cpp | 2 +- src/mame/machine/m3comm.cpp | 2 +- src/mame/machine/mackbd.cpp | 2 +- src/mame/machine/mega32x.cpp | 4 +- src/mame/machine/megacd.cpp | 2 +- src/mame/machine/megacdcd.cpp | 2 +- src/mame/machine/megadriv.cpp | 10 +- src/mame/machine/midwayic.cpp | 2 +- src/mame/machine/mie.cpp | 2 +- src/mame/machine/mm1kb.cpp | 2 +- src/mame/machine/mmboard.cpp | 2 +- src/mame/machine/mpu4.cpp | 72 ++-- src/mame/machine/ms7004.cpp | 2 +- src/mame/machine/namco50.cpp | 2 +- src/mame/machine/namco51.cpp | 2 +- src/mame/machine/namco53.cpp | 2 +- src/mame/machine/namco62.cpp | 2 +- src/mame/machine/naomim2.cpp | 2 +- src/mame/machine/nmk004.cpp | 2 +- src/mame/machine/pc1512kb.cpp | 2 +- src/mame/machine/pcd_kbd.cpp | 2 +- src/mame/machine/pce_cd.cpp | 2 +- src/mame/machine/pcshare.cpp | 53 ++- src/mame/machine/pcshare.h | 8 +- src/mame/machine/pgmprot_igs025_igs012.cpp | 2 +- src/mame/machine/pgmprot_igs025_igs012.h | 3 +- src/mame/machine/pgmprot_igs025_igs022.cpp | 6 +- src/mame/machine/pgmprot_igs025_igs022.h | 6 +- src/mame/machine/pgmprot_igs025_igs028.cpp | 2 +- src/mame/machine/pgmprot_igs025_igs028.h | 2 +- src/mame/machine/pgmprot_igs027a_type1.cpp | 6 +- src/mame/machine/pgmprot_igs027a_type1.h | 7 +- src/mame/machine/pgmprot_igs027a_type2.cpp | 2 +- src/mame/machine/pgmprot_igs027a_type2.h | 4 +- src/mame/machine/pgmprot_igs027a_type3.cpp | 2 +- src/mame/machine/pgmprot_igs027a_type3.h | 2 +- src/mame/machine/pgmprot_orlegend.cpp | 2 +- src/mame/machine/pgmprot_orlegend.h | 2 +- src/mame/machine/rx01.cpp | 2 +- src/mame/machine/s32comm.cpp | 2 +- src/mame/machine/saturn_cdb.cpp | 2 +- src/mame/machine/st0016.cpp | 2 +- src/mame/machine/st0016.h | 2 +- src/mame/machine/taito68705interface.cpp | 6 +- src/mame/machine/taitocchip.cpp | 2 +- src/mame/machine/taitoio.cpp | 8 +- src/mame/machine/taitosjsec.cpp | 2 +- src/mame/machine/tandy2kb.cpp | 2 +- src/mame/machine/teleprinter.cpp | 2 +- src/mame/machine/thomson.cpp | 2 +- src/mame/machine/trs80m2kb.cpp | 2 +- src/mame/machine/upd65031.h | 4 +- src/mame/machine/v1050kb.cpp | 2 +- src/mame/machine/victor9k_fdc.cpp | 2 +- src/mame/machine/victor9k_kb.cpp | 2 +- src/mame/machine/vt100_kbd.cpp | 2 +- src/mame/machine/wangpckb.cpp | 2 +- src/mame/machine/x820kb.cpp | 2 +- src/mame/machine/xbox.cpp | 2 +- src/mame/machine/xbox_pci.cpp | 2 +- src/mame/machine/zorbakbd.cpp | 2 +- src/mame/video/20pacgal.cpp | 2 +- src/mame/video/733_asr.cpp | 2 +- src/mame/video/911_vdt.cpp | 2 +- src/mame/video/abc1600.cpp | 2 +- src/mame/video/abc80.cpp | 2 +- src/mame/video/abc800.cpp | 4 +- src/mame/video/abc800.h | 11 - src/mame/video/abc802.cpp | 2 +- src/mame/video/abc802.h | 10 - src/mame/video/abc806.cpp | 2 +- src/mame/video/abc806.h | 10 - src/mame/video/agat7.cpp | 2 +- src/mame/video/airraid_dev.cpp | 2 +- src/mame/video/amiga.cpp | 4 +- src/mame/video/apollo.cpp | 4 +- src/mame/video/bfm_adr2.cpp | 2 +- src/mame/video/bfm_dm01.cpp | 2 +- src/mame/video/cgc7900.cpp | 2 +- src/mame/video/cidelsa.cpp | 6 +- src/mame/video/comx35.cpp | 4 +- src/mame/video/deco16ic.h | 4 +- src/mame/video/decodmd1.cpp | 2 +- src/mame/video/decodmd2.cpp | 2 +- src/mame/video/decodmd3.cpp | 2 +- src/mame/video/decospr.h | 4 +- src/mame/video/decrmc3.h | 2 +- src/mame/video/exidy440.cpp | 4 +- src/mame/video/gamate.cpp | 2 +- src/mame/video/gameplan.cpp | 6 +- src/mame/video/jedi.cpp | 2 +- src/mame/video/k007342.h | 2 +- src/mame/video/k007420.h | 2 +- src/mame/video/k051316.h | 2 +- src/mame/video/k051960.h | 2 +- src/mame/video/k052109.h | 2 +- src/mame/video/k053244_k053245.h | 2 +- src/mame/video/k053246_k053247_k055673.h | 4 +- src/mame/video/k054156_k054157_k056832.h | 2 +- src/mame/video/k1ge.cpp | 4 +- src/mame/video/kyocera.cpp | 4 +- src/mame/video/leland.cpp | 4 +- src/mame/video/madalien.cpp | 2 +- src/mame/video/mikromik.cpp | 2 +- src/mame/video/mystston.cpp | 2 +- src/mame/video/newbrain.cpp | 2 +- src/mame/video/osi.cpp | 6 +- src/mame/video/pc1512.cpp | 2 +- src/mame/video/pc8401a.cpp | 4 +- src/mame/video/pc_t1t.cpp | 4 +- src/mame/video/pcd.cpp | 4 +- src/mame/video/pecom.cpp | 2 +- src/mame/video/qix.cpp | 8 +- src/mame/video/redalert.cpp | 10 +- src/mame/video/seta001.h | 2 +- src/mame/video/stactics.cpp | 2 +- src/mame/video/stfight_dev.cpp | 2 +- src/mame/video/tia.cpp | 4 +- src/mame/video/tmc1800.cpp | 8 +- src/mame/video/tmc600.cpp | 2 +- src/mame/video/v1050.cpp | 2 +- src/mame/video/vtvideo.cpp | 4 +- src/mame/video/wpc_dmd.cpp | 2 +- src/mame/video/wswan.h | 4 +- 3292 files changed, 14645 insertions(+), 7967 deletions(-) delete mode 100644 src/mame/audio/carnival.h delete mode 100644 src/mame/audio/depthch.h delete mode 100644 src/mame/audio/invinco.h delete mode 100644 src/mame/audio/llander.h delete mode 100644 src/mame/audio/pulsar.h delete mode 100644 src/mame/audio/targ.h delete mode 100644 src/mame/audio/tranqgun.h delete mode 100644 src/mame/audio/vicdual.h delete mode 100644 src/mame/machine/hng64_net.h delete mode 100644 src/mame/video/abc800.h delete mode 100644 src/mame/video/abc802.h delete mode 100644 src/mame/video/abc806.h (limited to 'src/mame') diff --git a/src/mame/audio/alesis.cpp b/src/mame/audio/alesis.cpp index 83eb55712fd..e677c3b8ebe 100644 --- a/src/mame/audio/alesis.cpp +++ b/src/mame/audio/alesis.cpp @@ -41,7 +41,7 @@ alesis_dm3ag_device::alesis_dm3ag_device(const machine_config &mconfig, const ch // device_add_mconfig //------------------------------------------------- -MACHINE_CONFIG_MEMBER( alesis_dm3ag_device::device_add_mconfig ) +MACHINE_CONFIG_START(alesis_dm3ag_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_STEREO("lspeaker1", "rspeaker1") MCFG_SPEAKER_STANDARD_STEREO("lspeaker2", "rspeaker2") MCFG_SOUND_ADD("dac", PCM54HP, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker1", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker1", 1.0) // PCM54HP DAC + R63/R73-75 + Sample and hold diff --git a/src/mame/audio/asteroid.cpp b/src/mame/audio/asteroid.cpp index 3bce9a4ca31..6c8b0400070 100644 --- a/src/mame/audio/asteroid.cpp +++ b/src/mame/audio/asteroid.cpp @@ -315,7 +315,7 @@ WRITE8_MEMBER(asteroid_state::asteroid_noise_reset_w) } -MACHINE_CONFIG_START(asteroid_sound) +MACHINE_CONFIG_START(asteroid_state::asteroid_sound) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) @@ -332,7 +332,7 @@ MACHINE_CONFIG_START(asteroid_sound) MACHINE_CONFIG_END -MACHINE_CONFIG_START(astdelux_sound) +MACHINE_CONFIG_START(asteroid_state::astdelux_sound) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) diff --git a/src/mame/audio/astrof.cpp b/src/mame/audio/astrof.cpp index aaa3a40f147..a1339992889 100644 --- a/src/mame/audio/astrof.cpp +++ b/src/mame/audio/astrof.cpp @@ -139,7 +139,7 @@ static const char *const astrof_sample_names[] = nullptr }; -MACHINE_CONFIG_START( astrof_audio ) +MACHINE_CONFIG_START(astrof_state::astrof_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(4) @@ -161,7 +161,7 @@ WRITE8_MEMBER(astrof_state::spfghmk2_audio_w) } -MACHINE_CONFIG_START( spfghmk2_audio ) +MACHINE_CONFIG_START(astrof_state::spfghmk2_audio) /* nothing yet */ MACHINE_CONFIG_END @@ -195,7 +195,7 @@ WRITE8_MEMBER(astrof_state::tomahawk_audio_w) } -MACHINE_CONFIG_START( tomahawk_audio ) +MACHINE_CONFIG_START(astrof_state::tomahawk_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("snsnd", SN76477, 0) MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp index 2202b74b21c..e3bf8c08acc 100644 --- a/src/mame/audio/atarijsa.cpp +++ b/src/mame/audio/atarijsa.cpp @@ -691,7 +691,7 @@ WRITE8_MEMBER( atari_jsa_i_device::pokey_w ) //------------------------------------------------- // Fully populated JSA-I, not used by anyone -MACHINE_CONFIG_MEMBER( atari_jsa_i_device::device_add_mconfig ) +MACHINE_CONFIG_START(atari_jsa_i_device::device_add_mconfig) // basic machine hardware MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2) @@ -821,7 +821,7 @@ READ8_MEMBER( atari_jsa_ii_device::rdio_r ) //------------------------------------------------- // Fully populated JSA-II -MACHINE_CONFIG_MEMBER( atari_jsa_ii_device::device_add_mconfig ) +MACHINE_CONFIG_START(atari_jsa_ii_device::device_add_mconfig) // basic machine hardware MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2) @@ -903,7 +903,7 @@ READ8_MEMBER( atari_jsa_iii_device::rdio_r ) //------------------------------------------------- // Fully populated JSA-III -MACHINE_CONFIG_MEMBER( atari_jsa_iii_device::device_add_mconfig ) +MACHINE_CONFIG_START(atari_jsa_iii_device::device_add_mconfig) // basic machine hardware MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2) @@ -955,7 +955,7 @@ atari_jsa_iiis_device::atari_jsa_iiis_device(const machine_config &mconfig, cons //------------------------------------------------- // Fully populated JSA_IIIs -MACHINE_CONFIG_MEMBER( atari_jsa_iiis_device::device_add_mconfig ) +MACHINE_CONFIG_START(atari_jsa_iiis_device::device_add_mconfig) atari_jsa_iii_device::device_add_mconfig(config); diff --git a/src/mame/audio/avalnche.cpp b/src/mame/audio/avalnche.cpp index 6d01a99077d..aaea71a4298 100644 --- a/src/mame/audio/avalnche.cpp +++ b/src/mame/audio/avalnche.cpp @@ -103,7 +103,7 @@ static DISCRETE_SOUND_START(avalnche) DISCRETE_SOUND_END -MACHINE_CONFIG_START( avalnche_sound ) +MACHINE_CONFIG_START(avalnche_state::avalnche_sound) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) @@ -118,7 +118,7 @@ MACHINE_CONFIG_START( avalnche_sound ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( catch_sound ) // just a stub here... +MACHINE_CONFIG_START(avalnche_state::acatch_sound) // just a stub here... MCFG_DEVICE_MODIFY("latch") MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // It is attract_enable just like avalnche, but not hooked up yet. MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(avalnche_state, catch_aud0_w)) diff --git a/src/mame/audio/bwidow.cpp b/src/mame/audio/bwidow.cpp index 5a1849dd6ee..4d0a656d410 100644 --- a/src/mame/audio/bwidow.cpp +++ b/src/mame/audio/bwidow.cpp @@ -148,7 +148,7 @@ static DISCRETE_SOUND_START(gravitar) DISCRETE_SOUND_END -MACHINE_CONFIG_START( bwidow_audio ) +MACHINE_CONFIG_START(bwidow_state::bwidow_audio) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -171,7 +171,7 @@ MACHINE_CONFIG_START( bwidow_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( gravitar_audio ) +MACHINE_CONFIG_START(bwidow_state::gravitar_audio) MCFG_SOUND_MODIFY("pokey1") MCFG_POKEY_OUTPUT_OPAMP_LOW_PASS(BW_R51, GRAV_C34, 5.0) /* BW_C31 ignored */ diff --git a/src/mame/audio/bzone.cpp b/src/mame/audio/bzone.cpp index bde95d02d83..3bbc89835a0 100644 --- a/src/mame/audio/bzone.cpp +++ b/src/mame/audio/bzone.cpp @@ -397,7 +397,7 @@ WRITE8_MEMBER(bzone_state::bzone_sounds_w) } -MACHINE_CONFIG_START( bzone_audio ) +MACHINE_CONFIG_START(bzone_state::bzone_audio) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/audio/cage.cpp b/src/mame/audio/cage.cpp index 25dc7c05304..4114c484ad5 100644 --- a/src/mame/audio/cage.cpp +++ b/src/mame/audio/cage.cpp @@ -623,7 +623,7 @@ ADDRESS_MAP_END // machine_add_config - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( atari_cage_device::device_add_mconfig ) +MACHINE_CONFIG_START(atari_cage_device::device_add_mconfig) /* basic machine hardware */ MCFG_CPU_ADD("cage", TMS32031, 33868800) @@ -679,7 +679,7 @@ atari_cage_seattle_device::atari_cage_seattle_device(const machine_config &mconf //------------------------------------------------- -MACHINE_CONFIG_MEMBER( atari_cage_seattle_device::device_add_mconfig ) +MACHINE_CONFIG_START(atari_cage_seattle_device::device_add_mconfig) atari_cage_device::device_add_mconfig(config); diff --git a/src/mame/audio/carnival.cpp b/src/mame/audio/carnival.cpp index 28aa4ffd5e0..c7717802963 100644 --- a/src/mame/audio/carnival.cpp +++ b/src/mame/audio/carnival.cpp @@ -196,7 +196,7 @@ static ADDRESS_MAP_START( mboard_map, AS_PROGRAM, 8, vicdual_state ) ADDRESS_MAP_END -MACHINE_CONFIG_START( carnival_audio ) +MACHINE_CONFIG_START(vicdual_state::carnival_audio) /* music board */ MCFG_CPU_ADD("audiocpu", I8039, XTAL_3_579545MHz) diff --git a/src/mame/audio/carnival.h b/src/mame/audio/carnival.h deleted file mode 100644 index 299d1e0e896..00000000000 --- a/src/mame/audio/carnival.h +++ /dev/null @@ -1,4 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Zsolt Vasvari, hap - -MACHINE_CONFIG_EXTERN( carnival_audio ); diff --git a/src/mame/audio/cclimber.cpp b/src/mame/audio/cclimber.cpp index ba6fe7bd70f..e29bc52071e 100644 --- a/src/mame/audio/cclimber.cpp +++ b/src/mame/audio/cclimber.cpp @@ -57,7 +57,7 @@ void cclimber_audio_device::device_start() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( cclimber_audio_device::device_add_mconfig ) +MACHINE_CONFIG_START(cclimber_audio_device::device_add_mconfig) MCFG_SOUND_ADD("aysnd", AY8910, SND_CLOCK/2) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(cclimber_audio_device, sample_select_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":speaker", 0.5) diff --git a/src/mame/audio/cheekyms.cpp b/src/mame/audio/cheekyms.cpp index 59687742be4..0ffa15a1079 100644 --- a/src/mame/audio/cheekyms.cpp +++ b/src/mame/audio/cheekyms.cpp @@ -37,7 +37,7 @@ WRITE_LINE_MEMBER(cheekyms_audio_device::pest_dies_w) { m_pest_dies->write_lin WRITE_LINE_MEMBER(cheekyms_audio_device::coin_extra_w) { m_coin_extra->write_line(state); } -MACHINE_CONFIG_MEMBER(cheekyms_audio_device::device_add_mconfig) +MACHINE_CONFIG_START(cheekyms_audio_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("sound_nl", NETLIST_SOUND, 48000) diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp index 7897c1e5eee..8211e4d2c39 100644 --- a/src/mame/audio/cinemat.cpp +++ b/src/mame/audio/cinemat.cpp @@ -151,7 +151,7 @@ WRITE_LINE_MEMBER(cinemat_state::spacewar_sound4_w) } } -MACHINE_CONFIG_START( spacewar_sound ) +MACHINE_CONFIG_START(cinemat_state::spacewar_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, spacewar_sound0_w)) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, spacewar_sound1_w)) @@ -205,7 +205,7 @@ WRITE_LINE_MEMBER(cinemat_state::barrier_sound2_w) m_samples->start(2, 2); } -MACHINE_CONFIG_START( barrier_sound ) +MACHINE_CONFIG_START(cinemat_state::barrier_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, barrier_sound0_w)) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, barrier_sound1_w)) @@ -262,7 +262,7 @@ WRITE_LINE_MEMBER(cinemat_state::speedfrk_start_led_w) output().set_led_value(0, !state); } -MACHINE_CONFIG_START( speedfrk_sound ) +MACHINE_CONFIG_START(cinemat_state::speedfrk_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, speedfrk_start_led_w)) MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cinemat_state, speedfrk_sound3_w)) @@ -344,7 +344,7 @@ WRITE_LINE_MEMBER(cinemat_state::starhawk_sound7_w) m_samples->stop(3); } -MACHINE_CONFIG_START( starhawk_sound ) +MACHINE_CONFIG_START(cinemat_state::starhawk_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, starhawk_sound0_w)) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, starhawk_sound1_w)) @@ -423,7 +423,7 @@ WRITE_LINE_MEMBER(cinemat_state::sundance_sound7_w) m_samples->start(5, 5); } -MACHINE_CONFIG_START( sundance_sound ) +MACHINE_CONFIG_START(cinemat_state::sundance_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, sundance_sound0_w)) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, sundance_sound1_w)) @@ -506,7 +506,7 @@ WRITE_LINE_MEMBER(cinemat_state::tailg_sound_w) } } -MACHINE_CONFIG_START( tailg_sound ) +MACHINE_CONFIG_START(cinemat_state::tailg_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, tailg_sound_w)) @@ -576,7 +576,7 @@ WRITE_LINE_MEMBER(cinemat_state::warrior_sound4_w) m_samples->start(4, 4); } -MACHINE_CONFIG_START( warrior_sound ) +MACHINE_CONFIG_START(cinemat_state::warrior_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, warrior_sound0_w)) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, warrior_sound1_w)) @@ -676,7 +676,7 @@ WRITE_LINE_MEMBER(cinemat_state::armora_sound3_w) m_samples->stop(6); } -MACHINE_CONFIG_START( armora_sound ) +MACHINE_CONFIG_START(cinemat_state::armora_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, armora_sound0_w)) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, armora_sound1_w)) @@ -773,7 +773,7 @@ WRITE_LINE_MEMBER(cinemat_state::ripoff_sound7_w) m_samples->start(4, 4); } -MACHINE_CONFIG_START( ripoff_sound ) +MACHINE_CONFIG_START(cinemat_state::ripoff_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, ripoff_sound1_w)) MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cinemat_state, ripoff_sound2_w)) @@ -890,7 +890,7 @@ WRITE_LINE_MEMBER(cinemat_state::starcas_sound3_w) m_samples->start(7, 7); } -MACHINE_CONFIG_START( starcas_sound ) +MACHINE_CONFIG_START(cinemat_state::starcas_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, starcas_sound0_w)) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, starcas_sound1_w)) @@ -1024,7 +1024,7 @@ WRITE_LINE_MEMBER(cinemat_state::solarq_sound0_w) } } -MACHINE_CONFIG_START( solarq_sound ) +MACHINE_CONFIG_START(cinemat_state::solarq_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, solarq_sound0_w)) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, solarq_sound1_w)) @@ -1162,7 +1162,7 @@ WRITE_LINE_MEMBER(cinemat_state::boxingb_sound3_w) m_samples->start(11, 11); } -MACHINE_CONFIG_START( boxingb_sound ) +MACHINE_CONFIG_START(cinemat_state::boxingb_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, boxingb_sound0_w)) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, boxingb_sound1_w)) @@ -1279,7 +1279,7 @@ WRITE_LINE_MEMBER(cinemat_state::wotw_sound3_w) m_samples->start(7, 7); } -MACHINE_CONFIG_START( wotw_sound ) +MACHINE_CONFIG_START(cinemat_state::wotw_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, wotw_sound0_w)) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, wotw_sound1_w)) @@ -1395,7 +1395,7 @@ static const z80_daisy_config daisy_chain[] = }; -MACHINE_CONFIG_START( demon_sound ) +MACHINE_CONFIG_START(cinemat_state::demon_sound) /* basic machine hardware */ MCFG_CPU_ADD("audiocpu", Z80, 3579545) @@ -1455,7 +1455,7 @@ SOUND_RESET_MEMBER( cinemat_state, qb3 ) } -MACHINE_CONFIG_DERIVED( qb3_sound, demon_sound ) +MACHINE_CONFIG_DERIVED(cinemat_state::qb3_sound, demon_sound) MCFG_SOUND_RESET_OVERRIDE(cinemat_state, qb3) MCFG_DEVICE_MODIFY("outlatch") diff --git a/src/mame/audio/copsnrob.cpp b/src/mame/audio/copsnrob.cpp index f1b98e62677..d611fa40088 100644 --- a/src/mame/audio/copsnrob.cpp +++ b/src/mame/audio/copsnrob.cpp @@ -695,7 +695,7 @@ WRITE_LINE_MEMBER(copsnrob_state::one_start_w) } -MACHINE_CONFIG_START( copsnrob_audio ) +MACHINE_CONFIG_START(copsnrob_state::copsnrob_audio) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/audio/crbaloon.cpp b/src/mame/audio/crbaloon.cpp index c0e049537b6..b0944b78657 100644 --- a/src/mame/audio/crbaloon.cpp +++ b/src/mame/audio/crbaloon.cpp @@ -138,7 +138,7 @@ static DISCRETE_SOUND_START(crbaloon) DISCRETE_SOUND_END -MACHINE_CONFIG_START( crbaloon_audio ) +MACHINE_CONFIG_START(crbaloon_state::crbaloon_audio) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/audio/csd.cpp b/src/mame/audio/csd.cpp index 3158de444db..7b2b250bf3f 100644 --- a/src/mame/audio/csd.cpp +++ b/src/mame/audio/csd.cpp @@ -35,7 +35,7 @@ ADDRESS_MAP_END // machine configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER(midway_cheap_squeak_deluxe_device::device_add_mconfig) +MACHINE_CONFIG_START(midway_cheap_squeak_deluxe_device::device_add_mconfig) MCFG_CPU_ADD("cpu", M68000, XTAL_16MHz/2) MCFG_CPU_PROGRAM_MAP(csdeluxe_map) diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp index ceeec3878d1..eda78986838 100644 --- a/src/mame/audio/dcs.cpp +++ b/src/mame/audio/dcs.cpp @@ -2441,7 +2441,7 @@ int dcs_audio_device::preprocess_write(uint16_t data) /* Basic DCS system with ADSP-2105 and 2k of SRAM (T-unit, V-unit, Killer Instinct) */ -MACHINE_CONFIG_MEMBER( dcs_audio_device::add_mconfig_dcs ) +MACHINE_CONFIG_START(dcs_audio_device::add_mconfig_dcs ) MCFG_CPU_ADD("dcs", ADSP2105, XTAL_10MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */ @@ -2468,7 +2468,7 @@ dcs_audio_2k_device::dcs_audio_2k_device(const machine_config &mconfig, const ch { } -MACHINE_CONFIG_MEMBER( dcs_audio_2k_device::device_add_mconfig ) +MACHINE_CONFIG_START(dcs_audio_2k_device::device_add_mconfig) dcs_audio_device::add_mconfig_dcs(config); MACHINE_CONFIG_END @@ -2485,7 +2485,7 @@ dcs_audio_2k_uart_device::dcs_audio_2k_uart_device(const machine_config &mconfig } /* Basic DCS system with ADSP-2105 and 2k of SRAM, using a UART for communications (X-unit) */ -MACHINE_CONFIG_MEMBER( dcs_audio_2k_uart_device::device_add_mconfig ) +MACHINE_CONFIG_START(dcs_audio_2k_uart_device::device_add_mconfig) dcs_audio_device::add_mconfig_dcs(config); @@ -2505,7 +2505,7 @@ dcs_audio_8k_device::dcs_audio_8k_device(const machine_config &mconfig, const ch } /* Basic DCS system with ADSP-2105 and 8k of SRAM (Wolf-unit) */ -MACHINE_CONFIG_MEMBER( dcs_audio_8k_device::device_add_mconfig ) +MACHINE_CONFIG_START(dcs_audio_8k_device::device_add_mconfig) dcs_audio_device::add_mconfig_dcs(config); @@ -2525,7 +2525,7 @@ dcs_audio_wpc_device::dcs_audio_wpc_device(const machine_config &mconfig, const { } -MACHINE_CONFIG_MEMBER( dcs_audio_wpc_device::device_add_mconfig ) +MACHINE_CONFIG_START(dcs_audio_wpc_device::device_add_mconfig) dcs_audio_device::add_mconfig_dcs(config); @@ -2544,7 +2544,7 @@ dcs2_audio_device::dcs2_audio_device(const machine_config &mconfig, device_type { } -MACHINE_CONFIG_MEMBER( dcs2_audio_device::add_mconfig_dcs2 ) +MACHINE_CONFIG_START(dcs2_audio_device::add_mconfig_dcs2 ) MCFG_CPU_ADD("dcs2", ADSP2115, XTAL_16MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */ @@ -2576,7 +2576,7 @@ dcs2_audio_2115_device::dcs2_audio_2115_device(const machine_config &mconfig, co { } -MACHINE_CONFIG_MEMBER( dcs2_audio_2115_device::device_add_mconfig ) +MACHINE_CONFIG_START(dcs2_audio_2115_device::device_add_mconfig) dcs2_audio_device::add_mconfig_dcs2(config); @@ -2594,7 +2594,7 @@ dcs2_audio_2104_device::dcs2_audio_2104_device(const machine_config &mconfig, co { } -MACHINE_CONFIG_MEMBER( dcs2_audio_2104_device::device_add_mconfig ) +MACHINE_CONFIG_START(dcs2_audio_2104_device::device_add_mconfig) dcs2_audio_device::add_mconfig_dcs2(config); @@ -2616,7 +2616,7 @@ dcs2_audio_dsio_device::dcs2_audio_dsio_device(const machine_config &mconfig, co { } -MACHINE_CONFIG_MEMBER( dcs2_audio_dsio_device::device_add_mconfig ) +MACHINE_CONFIG_START(dcs2_audio_dsio_device::device_add_mconfig) MCFG_CPU_ADD("dsio", ADSP2181, XTAL_32MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */ @@ -2657,7 +2657,7 @@ dcs2_audio_denver_device::dcs2_audio_denver_device(const machine_config &mconfig { } -MACHINE_CONFIG_MEMBER( dcs2_audio_denver_device::device_add_mconfig ) +MACHINE_CONFIG_START(dcs2_audio_denver_device::device_add_mconfig) MCFG_CPU_ADD("denver", ADSP2181, XTAL_33_333MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */ diff --git a/src/mame/audio/decobsmt.cpp b/src/mame/audio/decobsmt.cpp index 577243581bb..9ad72bab4e6 100644 --- a/src/mame/audio/decobsmt.cpp +++ b/src/mame/audio/decobsmt.cpp @@ -46,7 +46,7 @@ DEFINE_DEVICE_TYPE(DECOBSMT, decobsmt_device, "decobsmt", "Data East/Sega/Stern // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( decobsmt_device::device_add_mconfig ) +MACHINE_CONFIG_START(decobsmt_device::device_add_mconfig) MCFG_CPU_ADD(M6809_TAG, MC6809E, XTAL_24MHz / 12) // 68B09E U6 (E & Q = 2 MHz according to manual) MCFG_CPU_PROGRAM_MAP(decobsmt_map) MCFG_CPU_PERIODIC_INT_DRIVER(decobsmt_device, decobsmt_firq_interrupt, 489) /* Fixed FIRQ of 489Hz as measured on real (pinball) machine */ diff --git a/src/mame/audio/depthch.cpp b/src/mame/audio/depthch.cpp index 22b59fe0aea..84ad14d635d 100644 --- a/src/mame/audio/depthch.cpp +++ b/src/mame/audio/depthch.cpp @@ -83,7 +83,7 @@ WRITE8_MEMBER( vicdual_state::depthch_audio_w ) } -MACHINE_CONFIG_START( depthch_audio ) +MACHINE_CONFIG_START(vicdual_state::depthch_audio) /* samples */ MCFG_SOUND_ADD("samples", SAMPLES, 0) diff --git a/src/mame/audio/depthch.h b/src/mame/audio/depthch.h deleted file mode 100644 index 00138b49c70..00000000000 --- a/src/mame/audio/depthch.h +++ /dev/null @@ -1,4 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Zsolt Vasvari - -MACHINE_CONFIG_EXTERN( depthch_audio ); diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp index 752a8d5472b..952977885a7 100644 --- a/src/mame/audio/dkong.cpp +++ b/src/mame/audio/dkong.cpp @@ -1309,7 +1309,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_START( dkong2b_audio ) +MACHINE_CONFIG_START(dkong_state::dkong2b_audio) /* sound latches */ MCFG_LATCH8_ADD("ls175.3d") /* sound cmd latch */ @@ -1351,14 +1351,14 @@ MACHINE_CONFIG_START( dkong2b_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( radarscp_audio, dkong2b_audio ) +MACHINE_CONFIG_DERIVED(dkong_state::radarscp_audio, dkong2b_audio) MCFG_DISCRETE_REPLACE("discrete", 0, radarscp) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.7) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( radarscp1_audio, radarscp_audio ) +MACHINE_CONFIG_DERIVED(dkong_state::radarscp1_audio, radarscp_audio) MCFG_CPU_MODIFY("soundcpu") MCFG_CPU_IO_MAP(radarscp1_sound_io_map) @@ -1384,7 +1384,7 @@ MACHINE_CONFIG_DERIVED( radarscp1_audio, radarscp_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_START( dkongjr_audio ) +MACHINE_CONFIG_START(dkong_state::dkongjr_audio) /* sound latches */ MCFG_LATCH8_ADD("ls174.3d") @@ -1423,7 +1423,7 @@ MACHINE_CONFIG_START( dkongjr_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_START( dkong3_audio ) +MACHINE_CONFIG_START(dkong_state::dkong3_audio) MCFG_CPU_ADD("n2a03a", N2A03, NTSC_APU_CLOCK) MCFG_CPU_PROGRAM_MAP(dkong3_sound1_map) diff --git a/src/mame/audio/dsbz80.cpp b/src/mame/audio/dsbz80.cpp index 245d5d52032..b655354d357 100644 --- a/src/mame/audio/dsbz80.cpp +++ b/src/mame/audio/dsbz80.cpp @@ -43,7 +43,7 @@ DEFINE_DEVICE_TYPE(DSBZ80, dsbz80_device, "dsbz80_device", "Sega Z80-based Digit // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( dsbz80_device::device_add_mconfig ) +MACHINE_CONFIG_START(dsbz80_device::device_add_mconfig) MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) /* unknown clock, but probably pretty slow considering the z80 does like nothing */ MCFG_CPU_PROGRAM_MAP(dsbz80_map) MCFG_CPU_IO_MAP(dsbz80io_map) diff --git a/src/mame/audio/efo_zsu.cpp b/src/mame/audio/efo_zsu.cpp index 49ac5867a4e..74b1f0098c8 100644 --- a/src/mame/audio/efo_zsu.cpp +++ b/src/mame/audio/efo_zsu.cpp @@ -187,7 +187,7 @@ TIMER_CALLBACK_MEMBER(cedar_magnet_sound_device::reset_assert_callback) } -MACHINE_CONFIG_MEMBER( efo_zsu_device::device_add_mconfig ) +MACHINE_CONFIG_START(efo_zsu_device::device_add_mconfig) MCFG_CPU_ADD("soundcpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(zsu_map) MCFG_CPU_IO_MAP(zsu_io) @@ -236,7 +236,7 @@ MACHINE_CONFIG_MEMBER( efo_zsu_device::device_add_mconfig ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -MACHINE_CONFIG_MEMBER( cedar_magnet_sound_device::device_add_mconfig ) +MACHINE_CONFIG_START(cedar_magnet_sound_device::device_add_mconfig) efo_zsu_device::device_add_mconfig(config); MCFG_CPU_MODIFY("soundcpu") diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp index a40869dd62d..cc6c5649fbb 100644 --- a/src/mame/audio/exidy.cpp +++ b/src/mame/audio/exidy.cpp @@ -8,6 +8,8 @@ #include "emu.h" #include "audio/exidy.h" +#include "includes/exidy.h" +#include "includes/victory.h" #include "cpu/z80/z80.h" #include "machine/rescap.h" @@ -737,7 +739,7 @@ static ADDRESS_MAP_START( venture_audio_map, AS_PROGRAM, 8, venture_sound_device ADDRESS_MAP_END -MACHINE_CONFIG_START( venture_audio ) +MACHINE_CONFIG_START(exidy_state::venture_audio) MCFG_CPU_ADD("audiocpu", M6502, 3579545/4) MCFG_CPU_PROGRAM_MAP(venture_audio_map) @@ -816,7 +818,7 @@ static ADDRESS_MAP_START( cvsd_iomap, AS_IO, 8, venture_sound_device ) ADDRESS_MAP_END -MACHINE_CONFIG_START( mtrap_cvsd_audio ) +MACHINE_CONFIG_START(exidy_state::mtrap_cvsd_audio) MCFG_CPU_ADD("cvsdcpu", Z80, CVSD_Z80_CLOCK) MCFG_CPU_PROGRAM_MAP(cvsd_map) @@ -991,7 +993,7 @@ static ADDRESS_MAP_START( victory_audio_map, AS_PROGRAM, 8, venture_sound_device ADDRESS_MAP_END -MACHINE_CONFIG_START( victory_audio ) +MACHINE_CONFIG_START(victory_state::victory_audio) MCFG_CPU_ADD("audiocpu", M6502, VICTORY_AUDIO_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(victory_audio_map) diff --git a/src/mame/audio/exidy.h b/src/mame/audio/exidy.h index 02d1aafabd6..e09b32e58e2 100644 --- a/src/mame/audio/exidy.h +++ b/src/mame/audio/exidy.h @@ -60,6 +60,8 @@ public: DECLARE_WRITE8_MEMBER( sh8253_w ); DECLARE_READ8_MEMBER( sh8253_r ); + void mtrap_cvsd_audio(machine_config &config); + protected: exidy_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -129,6 +131,7 @@ public: DECLARE_WRITE8_MEMBER( filter_w ); + void venture_audio(machine_config &config); protected: // device-level overrides virtual void device_start() override; @@ -151,6 +154,7 @@ public: DECLARE_WRITE_LINE_MEMBER( irq_clear_w ); DECLARE_WRITE_LINE_MEMBER( main_ack_w ); + void victory_audio(machine_config &config); protected: // device-level overrides virtual void device_start() override; @@ -171,10 +175,4 @@ private: DECLARE_DEVICE_TYPE(EXIDY_VICTORY, victory_sound_device) -MACHINE_CONFIG_EXTERN( venture_audio ); - -MACHINE_CONFIG_EXTERN( mtrap_cvsd_audio ); - -MACHINE_CONFIG_EXTERN( victory_audio ); - #endif // MAME_AUDIO_EXIDY_H diff --git a/src/mame/audio/exidy440.cpp b/src/mame/audio/exidy440.cpp index 313be4ebb15..b9ad9b13faf 100644 --- a/src/mame/audio/exidy440.cpp +++ b/src/mame/audio/exidy440.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "audio/exidy440.h" +#include "includes/exidy440.h" #include "cpu/m6809/m6809.h" #include "speaker.h" @@ -873,7 +874,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_START( exidy440_audio ) +MACHINE_CONFIG_START(exidy440_state::exidy440_audio) MCFG_CPU_ADD("audiocpu", MC6809, EXIDY440_AUDIO_CLOCK) MCFG_CPU_PROGRAM_MAP(exidy440_audio_map) diff --git a/src/mame/audio/exidy440.h b/src/mame/audio/exidy440.h index 5d8129195e3..739bf96f71a 100644 --- a/src/mame/audio/exidy440.h +++ b/src/mame/audio/exidy440.h @@ -22,6 +22,8 @@ public: void exidy440_sound_command(uint8_t param); uint8_t exidy440_sound_command_ack(); + void exidy440_audio(machine_config &config); + protected: // device-level overrides virtual void device_start() override; @@ -111,6 +113,5 @@ private: DECLARE_DEVICE_TYPE(EXIDY440, exidy440_sound_device) -MACHINE_CONFIG_EXTERN( exidy440_audio ); #endif // MAME_AUDIO_EXIDY440_H diff --git a/src/mame/audio/galaxian.cpp b/src/mame/audio/galaxian.cpp index 9efa49df63a..ebd0efadf7d 100644 --- a/src/mame/audio/galaxian.cpp +++ b/src/mame/audio/galaxian.cpp @@ -25,6 +25,7 @@ TODO: #include "emu.h" #include "audio/galaxian.h" #include "includes/galaxian.h" +#include "includes/galaxold.h" /************************************* * @@ -495,7 +496,7 @@ void galaxian_sound_device::sound_stream_update(sound_stream &stream, stream_sam * *************************************/ -MACHINE_CONFIG_START( galaxian_audio ) +MACHINE_CONFIG_START(galaxold_state::galaxian_audio) MCFG_SOUND_ADD("cust", GALAXIAN, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) @@ -505,7 +506,28 @@ MACHINE_CONFIG_START( galaxian_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mooncrst_audio ) +MACHINE_CONFIG_START(galaxold_state::mooncrst_audio) + + MCFG_SOUND_ADD("cust", GALAXIAN, 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) + + MCFG_SOUND_ADD(GAL_AUDIO, DISCRETE, 0) + MCFG_DISCRETE_INTF(mooncrst) + + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(galaxian_state::galaxian_audio) + + MCFG_SOUND_ADD("cust", GALAXIAN, 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) + + MCFG_SOUND_ADD(GAL_AUDIO, DISCRETE, 0) + MCFG_DISCRETE_INTF(galaxian) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(galaxian_state::mooncrst_audio) MCFG_SOUND_ADD("cust", GALAXIAN, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) diff --git a/src/mame/audio/galaxian.h b/src/mame/audio/galaxian.h index b842f1c9628..4a84a2f9e66 100644 --- a/src/mame/audio/galaxian.h +++ b/src/mame/audio/galaxian.h @@ -22,6 +22,9 @@ public: DECLARE_WRITE8_MEMBER( fire_enable_w ); DECLARE_WRITE8_MEMBER( lfo_freq_w ); + void mooncrst_audio(machine_config &config); + void galaxian_audio(machine_config &config); + protected: // device-level overrides virtual void device_start() override; @@ -37,7 +40,5 @@ private: DECLARE_DEVICE_TYPE(GALAXIAN, galaxian_sound_device) -MACHINE_CONFIG_EXTERN( mooncrst_audio ); -MACHINE_CONFIG_EXTERN( galaxian_audio ); #endif // MAME_AUDIO_GALAXIAN_H diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp index 75bea4376c3..d1d2e89242f 100644 --- a/src/mame/audio/gottlieb.cpp +++ b/src/mame/audio/gottlieb.cpp @@ -108,7 +108,7 @@ INPUT_CHANGED_MEMBER( gottlieb_sound_r0_device::audio_nmi ) // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( gottlieb_sound_r0_device::device_add_mconfig ) +MACHINE_CONFIG_START(gottlieb_sound_r0_device::device_add_mconfig) // audio CPU MCFG_CPU_ADD("audiocpu", M6502, SOUND1_CLOCK/4) // M6503 - clock is a gate, a resistor and a capacitor. Freq unknown. MCFG_CPU_PROGRAM_MAP(gottlieb_sound_r0_map) @@ -306,7 +306,7 @@ INPUT_PORTS_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( gottlieb_sound_r1_device::device_add_mconfig ) +MACHINE_CONFIG_START(gottlieb_sound_r1_device::device_add_mconfig) // audio CPU MCFG_CPU_ADD("audiocpu", M6502, SOUND1_CLOCK/4) // the board can be set to /2 as well MCFG_CPU_PROGRAM_MAP(gottlieb_sound_r1_map) @@ -364,7 +364,7 @@ gottlieb_sound_r1_with_votrax_device::gottlieb_sound_r1_with_votrax_device(const // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( gottlieb_sound_r1_with_votrax_device::device_add_mconfig ) +MACHINE_CONFIG_START(gottlieb_sound_r1_with_votrax_device::device_add_mconfig) gottlieb_sound_r1_device::device_add_mconfig(config); // add the VOTRAX @@ -664,7 +664,7 @@ INPUT_PORTS_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( gottlieb_sound_r2_device::device_add_mconfig ) +MACHINE_CONFIG_START(gottlieb_sound_r2_device::device_add_mconfig) // audio CPUs MCFG_CPU_ADD("audiocpu", M6502, SOUND2_CLOCK/4) MCFG_CPU_PROGRAM_MAP(gottlieb_sound_r2_map) diff --git a/src/mame/audio/harddriv.cpp b/src/mame/audio/harddriv.cpp index 06677fbf79e..0c9fffc3aad 100644 --- a/src/mame/audio/harddriv.cpp +++ b/src/mame/audio/harddriv.cpp @@ -429,7 +429,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( harddriv_sound_board_device::device_add_mconfig ) +MACHINE_CONFIG_START(harddriv_sound_board_device::device_add_mconfig) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", M68000, XTAL_16MHz/2) diff --git a/src/mame/audio/hng64.cpp b/src/mame/audio/hng64.cpp index 458a69f2fcf..e6f1c8a89b2 100644 --- a/src/mame/audio/hng64.cpp +++ b/src/mame/audio/hng64.cpp @@ -386,7 +386,7 @@ WRITE_LINE_MEMBER(hng64_state::tcu_tm2_cb) -MACHINE_CONFIG_START( hng64_audio ) +MACHINE_CONFIG_START(hng64_state::hng64_audio) MCFG_CPU_ADD("audiocpu", V53A, 32000000/2) // V53A, 16? mhz! MCFG_CPU_PROGRAM_MAP(hng_sound_map) MCFG_CPU_IO_MAP(hng_sound_io) diff --git a/src/mame/audio/hyprolyb.cpp b/src/mame/audio/hyprolyb.cpp index 244c34f90ea..e86905aad8f 100644 --- a/src/mame/audio/hyprolyb.cpp +++ b/src/mame/audio/hyprolyb.cpp @@ -76,48 +76,11 @@ READ8_MEMBER( hyprolyb_adpcm_device::data_r ) return m_soundlatch2->read(*m_space, offset); } -static ADDRESS_MAP_START( hyprolyb_adpcm_map, AS_PROGRAM, 8, hyprolyb_adpcm_device ) - AM_RANGE(0x0000, 0x007f) AM_RAM - AM_RANGE(0x1000, 0x1000) AM_DEVREAD("hyprolyb_adpcm", hyprolyb_adpcm_device, data_r) - AM_RANGE(0x1001, 0x1001) AM_DEVREAD("hyprolyb_adpcm", hyprolyb_adpcm_device, ready_r) - AM_RANGE(0x1002, 0x1002) AM_DEVWRITE("hyprolyb_adpcm", hyprolyb_adpcm_device, msm_data_w) - AM_RANGE(0x1003, 0x1003) AM_DEVREAD("hyprolyb_adpcm", hyprolyb_adpcm_device, msm_vck_r) - // on init: - // $1003 = $00 - // $1002 = $FF - // $1003 = $34 - // $1001 = $36 - // $1002 = $80 - // loops while ($1003) & 0x80 == 0 - // 1002 = ADPCM data written (low 4 bits) - // - // $1003 & $80 (in) = 5205 DRQ - // $1002 & $0f (out) = 5205 data - // $1001 & $80 (in) = sound latch request - // $1000 (in) = sound latch data - AM_RANGE(0x8000, 0xffff) AM_ROM -ADDRESS_MAP_END - void hyprolyb_adpcm_device::vck_callback( int st ) { m_vck_ready = 0x80; } -MACHINE_CONFIG_START( hyprolyb_adpcm ) - MCFG_CPU_ADD("adpcm", M6802, XTAL_14_31818MHz/8) /* unknown clock */ - MCFG_CPU_PROGRAM_MAP(hyprolyb_adpcm_map) - - MCFG_GENERIC_LATCH_8_ADD("soundlatch2") - - MCFG_SOUND_ADD("hyprolyb_adpcm", HYPROLYB_ADPCM, 0) - - MCFG_SOUND_ADD("msm", MSM5205, 384000) - MCFG_MSM5205_VCLK_CB(DEVWRITELINE("hyprolyb_adpcm", hyprolyb_adpcm_device, vck_callback)) /* VCK function */ - MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4 kHz */ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) -MACHINE_CONFIG_END - - //------------------------------------------------- // sound_stream_update - handle a stream update //------------------------------------------------- diff --git a/src/mame/audio/hyprolyb.h b/src/mame/audio/hyprolyb.h index fccea4779be..ca87ee7f022 100644 --- a/src/mame/audio/hyprolyb.h +++ b/src/mame/audio/hyprolyb.h @@ -22,6 +22,7 @@ public: READ8_MEMBER( data_r ); void vck_callback( int st ); + void hyprolyb_adpcm(machine_config &config); protected: // device-level overrides @@ -41,8 +42,6 @@ protected: uint8_t m_vck_ready; }; -MACHINE_CONFIG_EXTERN( hyprolyb_adpcm ); - extern const device_type HYPROLYB_ADPCM; DECLARE_DEVICE_TYPE(HYPROLYB_ADPCM, hyprolyb_adpcm_device) diff --git a/src/mame/audio/invinco.cpp b/src/mame/audio/invinco.cpp index ebe8c899661..8040ad69d40 100644 --- a/src/mame/audio/invinco.cpp +++ b/src/mame/audio/invinco.cpp @@ -94,7 +94,7 @@ WRITE8_MEMBER( vicdual_state::invinco_audio_w ) } -MACHINE_CONFIG_START( invinco_audio ) +MACHINE_CONFIG_START(vicdual_state::invinco_audio) /* samples */ MCFG_SOUND_ADD("samples", SAMPLES, 0) diff --git a/src/mame/audio/invinco.h b/src/mame/audio/invinco.h deleted file mode 100644 index bfd6293d7fe..00000000000 --- a/src/mame/audio/invinco.h +++ /dev/null @@ -1,4 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Zsolt Vasvari - -MACHINE_CONFIG_EXTERN( invinco_audio ); diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp index f917796c03c..83647a7e851 100644 --- a/src/mame/audio/irem.cpp +++ b/src/mame/audio/irem.cpp @@ -400,7 +400,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( m62_audio_device::device_add_mconfig ) +MACHINE_CONFIG_START(m62_audio_device::device_add_mconfig) /* basic machine hardware */ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */ @@ -470,7 +470,7 @@ MACHINE_CONFIG_MEMBER( m62_audio_device::device_add_mconfig ) MACHINE_CONFIG_END -MACHINE_CONFIG_MEMBER( m52_soundc_audio_device::device_add_mconfig ) +MACHINE_CONFIG_START(m52_soundc_audio_device::device_add_mconfig) /* basic machine hardware */ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */ @@ -504,7 +504,7 @@ MACHINE_CONFIG_MEMBER( m52_soundc_audio_device::device_add_mconfig ) MACHINE_CONFIG_END -MACHINE_CONFIG_MEMBER( m52_large_audio_device::device_add_mconfig ) /* 10 yard fight */ +MACHINE_CONFIG_START(m52_large_audio_device::device_add_mconfig) /* 10 yard fight */ /* basic machine hardware */ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */ diff --git a/src/mame/audio/jedi.cpp b/src/mame/audio/jedi.cpp index 70c8cc8fade..d912fc821a2 100644 --- a/src/mame/audio/jedi.cpp +++ b/src/mame/audio/jedi.cpp @@ -190,7 +190,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_START( jedi_audio ) +MACHINE_CONFIG_START(jedi_state::jedi_audio) MCFG_CPU_ADD("audiocpu", M6502, JEDI_AUDIO_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(audio_map) diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp index 2a42453fbd1..d3c8705045c 100644 --- a/src/mame/audio/leland.cpp +++ b/src/mame/audio/leland.cpp @@ -133,7 +133,7 @@ WRITE_LINE_MEMBER(leland_80186_sound_device::i80186_tmr1_w) set_clock_line(7, state); } -MACHINE_CONFIG_MEMBER( leland_80186_sound_device::device_add_mconfig ) +MACHINE_CONFIG_START(leland_80186_sound_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u31 + ad7524.u46 MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u32 + ad7524.u47 @@ -174,7 +174,7 @@ MACHINE_CONFIG_MEMBER( leland_80186_sound_device::device_add_mconfig ) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(leland_80186_sound_device, pit1_2_w)) MACHINE_CONFIG_END -MACHINE_CONFIG_MEMBER( redline_80186_sound_device::device_add_mconfig ) +MACHINE_CONFIG_START(redline_80186_sound_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC @@ -224,7 +224,7 @@ MACHINE_CONFIG_MEMBER( redline_80186_sound_device::device_add_mconfig ) MCFG_PIT8253_CLK2(7000000) MACHINE_CONFIG_END -MACHINE_CONFIG_MEMBER( ataxx_80186_sound_device::device_add_mconfig ) +MACHINE_CONFIG_START(ataxx_80186_sound_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC @@ -251,7 +251,7 @@ MACHINE_CONFIG_MEMBER( ataxx_80186_sound_device::device_add_mconfig ) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(leland_80186_sound_device, pit0_2_w)) MACHINE_CONFIG_END -MACHINE_CONFIG_MEMBER( wsf_80186_sound_device::device_add_mconfig ) +MACHINE_CONFIG_START(wsf_80186_sound_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC diff --git a/src/mame/audio/llander.cpp b/src/mame/audio/llander.cpp index 41153505578..688242b69ec 100644 --- a/src/mame/audio/llander.cpp +++ b/src/mame/audio/llander.cpp @@ -8,7 +8,6 @@ #include "emu.h" #include "includes/asteroid.h" -#include "audio/llander.h" #include "sound/discrete.h" #include "speaker.h" @@ -99,7 +98,7 @@ WRITE8_MEMBER(asteroid_state::llander_sounds_w) } -MACHINE_CONFIG_START( llander_sound ) +MACHINE_CONFIG_START(asteroid_state::llander_sound) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) diff --git a/src/mame/audio/llander.h b/src/mame/audio/llander.h deleted file mode 100644 index 249a4954576..00000000000 --- a/src/mame/audio/llander.h +++ /dev/null @@ -1,4 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:K.Wilkins - -MACHINE_CONFIG_EXTERN(llander_sound); diff --git a/src/mame/audio/mario.cpp b/src/mame/audio/mario.cpp index 504c372a6bb..d56d87377fa 100644 --- a/src/mame/audio/mario.cpp +++ b/src/mame/audio/mario.cpp @@ -627,7 +627,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_START( mario_audio ) +MACHINE_CONFIG_START(mario_state::mario_audio) #if USE_8039 MCFG_CPU_ADD("audiocpu", I8039, I8035_CLOCK) /* 730 kHz */ @@ -670,7 +670,7 @@ MACHINE_CONFIG_START( mario_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( masao_audio ) +MACHINE_CONFIG_START(mario_state::masao_audio) MCFG_CPU_ADD("audiocpu", Z80, 24576000/16) /* ???? */ MCFG_CPU_PROGRAM_MAP(masao_sound_map) diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp index 0db7413b894..8c79a4d4db6 100644 --- a/src/mame/audio/midway.cpp +++ b/src/mame/audio/midway.cpp @@ -397,7 +397,7 @@ const tiny_rom_entry *midway_ssio_device::device_rom_region() const // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( midway_ssio_device::device_add_mconfig ) +MACHINE_CONFIG_START(midway_ssio_device::device_add_mconfig) MCFG_CPU_ADD("cpu", Z80, SSIO_CLOCK/2/4) MCFG_CPU_PROGRAM_MAP(ssio_map) MCFG_DEVICE_PERIODIC_INT_DEVICE(DEVICE_SELF, midway_ssio_device, clock_14024, SSIO_CLOCK/2/16/10) @@ -574,7 +574,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER(midway_sounds_good_device::device_add_mconfig) +MACHINE_CONFIG_START(midway_sounds_good_device::device_add_mconfig) MCFG_CPU_ADD("cpu", M68000, SOUNDSGOOD_CLOCK/2) MCFG_CPU_PROGRAM_MAP(soundsgood_map) @@ -728,7 +728,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER(midway_turbo_cheap_squeak_device::device_add_mconfig) +MACHINE_CONFIG_START(midway_turbo_cheap_squeak_device::device_add_mconfig) MCFG_CPU_ADD("cpu", MC6809E, TURBOCS_CLOCK / 4) MCFG_CPU_PROGRAM_MAP(turbocs_map) @@ -930,7 +930,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER(midway_squawk_n_talk_device::device_add_mconfig) +MACHINE_CONFIG_START(midway_squawk_n_talk_device::device_add_mconfig) MCFG_CPU_ADD("cpu", M6802, SQUAWKTALK_CLOCK) MCFG_CPU_PROGRAM_MAP(squawkntalk_map) diff --git a/src/mame/audio/mw8080bw.cpp b/src/mame/audio/mw8080bw.cpp index 719bbe3eb89..970ddb9938b 100644 --- a/src/mame/audio/mw8080bw.cpp +++ b/src/mame/audio/mw8080bw.cpp @@ -144,7 +144,7 @@ static const char *const seawolf_sample_names[] = nullptr }; -MACHINE_CONFIG_START( seawolf_audio ) +MACHINE_CONFIG_START(mw8080bw_state::seawolf_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -198,7 +198,7 @@ static const char *const gunfight_sample_names[] = }; -MACHINE_CONFIG_START( gunfight_audio ) +MACHINE_CONFIG_START(mw8080bw_state::gunfight_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -307,7 +307,7 @@ static DISCRETE_SOUND_START(tornbase) DISCRETE_SOUND_END -MACHINE_CONFIG_START( tornbase_audio ) +MACHINE_CONFIG_START(mw8080bw_state::tornbase_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(tornbase) @@ -351,7 +351,7 @@ WRITE8_MEMBER(mw8080bw_state::tornbase_audio_w) * *************************************/ -MACHINE_CONFIG_START( zzzap_audio ) +MACHINE_CONFIG_START(mw8080bw_state::zzzap_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MACHINE_CONFIG_END @@ -553,7 +553,7 @@ static DISCRETE_SOUND_START(maze) DISCRETE_SOUND_END -MACHINE_CONFIG_START( maze_audio ) +MACHINE_CONFIG_START(mw8080bw_state::maze_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(maze) @@ -800,7 +800,7 @@ static DISCRETE_SOUND_START(boothill) DISCRETE_SOUND_END -MACHINE_CONFIG_START( boothill_audio ) +MACHINE_CONFIG_START(mw8080bw_state::boothill_audio) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(boothill) @@ -1030,7 +1030,7 @@ static DISCRETE_SOUND_START(checkmat) DISCRETE_SOUND_END -MACHINE_CONFIG_START( checkmat_audio ) +MACHINE_CONFIG_START(mw8080bw_state::checkmat_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(checkmat) @@ -1241,7 +1241,7 @@ static DISCRETE_SOUND_START(desertgu) DISCRETE_SOUND_END -MACHINE_CONFIG_START( desertgu_audio ) +MACHINE_CONFIG_START(mw8080bw_state::desertgu_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(desertgu) @@ -1506,7 +1506,7 @@ static DISCRETE_SOUND_START(dplay) DISCRETE_SOUND_END -MACHINE_CONFIG_START( dplay_audio ) +MACHINE_CONFIG_START(mw8080bw_state::dplay_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(dplay) @@ -1547,7 +1547,7 @@ static const char *const gmissile_sample_names[] = nullptr }; -MACHINE_CONFIG_START( gmissile_audio ) +MACHINE_CONFIG_START(mw8080bw_state::gmissile_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1640,7 +1640,7 @@ static const char *const m4_sample_names[] = }; -MACHINE_CONFIG_START( m4_audio ) +MACHINE_CONFIG_START(mw8080bw_state::m4_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1895,7 +1895,7 @@ static const char *const clowns_sample_names[] = nullptr }; -MACHINE_CONFIG_START( clowns_audio ) +MACHINE_CONFIG_START(mw8080bw_state::clowns_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -2268,7 +2268,7 @@ DISCRETE_GAIN(NODE_RELATIVE(SPACWALK_SPRINGBOARD_HIT1_SND, _num - 1), DISCRETE_OUTPUT(NODE_90, 11000) DISCRETE_SOUND_END -MACHINE_CONFIG_START( spacwalk_audio ) +MACHINE_CONFIG_START(mw8080bw_state::spacwalk_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) @@ -2497,7 +2497,7 @@ static DISCRETE_SOUND_START(shuffle) DISCRETE_SOUND_END -MACHINE_CONFIG_START( shuffle_audio ) +MACHINE_CONFIG_START(mw8080bw_state::shuffle_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) @@ -2677,7 +2677,7 @@ static DISCRETE_SOUND_START(dogpatch) DISCRETE_SOUND_END -MACHINE_CONFIG_START( dogpatch_audio ) +MACHINE_CONFIG_START(mw8080bw_state::dogpatch_audio) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(dogpatch) @@ -3182,7 +3182,7 @@ static DISCRETE_SOUND_START(spcenctr) DISCRETE_SOUND_END -MACHINE_CONFIG_START( spcenctr_audio ) +MACHINE_CONFIG_START(mw8080bw_state::spcenctr_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("snsnd", SN76477, 0) @@ -3268,7 +3268,7 @@ static const char *const phantom2_sample_names[] = nullptr }; -MACHINE_CONFIG_START( phantom2_audio ) +MACHINE_CONFIG_START(mw8080bw_state::phantom2_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -3398,7 +3398,7 @@ static DISCRETE_SOUND_START(bowler) DISCRETE_SOUND_END -MACHINE_CONFIG_START( bowler_audio ) +MACHINE_CONFIG_START(mw8080bw_state::bowler_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) @@ -3513,7 +3513,7 @@ static const char *const invaders_sample_names[] = /* left in for all games that hack into invaders samples for audio */ -MACHINE_CONFIG_START( invaders_samples_audio ) +MACHINE_CONFIG_START(mw8080bw_state::invaders_samples_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4095,7 +4095,7 @@ static DISCRETE_SOUND_START(invaders) DISCRETE_SOUND_END -MACHINE_CONFIG_START( invaders_audio ) +MACHINE_CONFIG_START(mw8080bw_state::invaders_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("snsnd", SN76477, 0) @@ -4513,7 +4513,7 @@ static DISCRETE_SOUND_START(blueshrk) DISCRETE_SOUND_END -MACHINE_CONFIG_START( blueshrk_audio ) +MACHINE_CONFIG_START(mw8080bw_state::blueshrk_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(blueshrk) @@ -4675,7 +4675,7 @@ static DISCRETE_SOUND_START(invad2ct) DISCRETE_SOUND_END -MACHINE_CONFIG_START( invad2ct_audio ) +MACHINE_CONFIG_START(mw8080bw_state::invad2ct_audio) MCFG_SPEAKER_STANDARD_STEREO("spk1", "spk2") MCFG_SOUND_ADD("discrete", DISCRETE, 0) diff --git a/src/mame/audio/n8080.cpp b/src/mame/audio/n8080.cpp index f3a27c3869c..0840c486d0a 100644 --- a/src/mame/audio/n8080.cpp +++ b/src/mame/audio/n8080.cpp @@ -471,7 +471,7 @@ static ADDRESS_MAP_START( helifire_sound_io_map, AS_IO, 8, n8080_state ) ADDRESS_MAP_END -MACHINE_CONFIG_START( spacefev_sound ) +MACHINE_CONFIG_START(n8080_state::spacefev_sound) MCFG_SOUND_START_OVERRIDE(n8080_state,spacefev) MCFG_SOUND_RESET_OVERRIDE(n8080_state,spacefev) @@ -511,7 +511,7 @@ MACHINE_CONFIG_START( spacefev_sound ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( sheriff_sound ) +MACHINE_CONFIG_START(n8080_state::sheriff_sound) MCFG_SOUND_START_OVERRIDE(n8080_state,sheriff) MCFG_SOUND_RESET_OVERRIDE(n8080_state,sheriff) @@ -549,7 +549,7 @@ MACHINE_CONFIG_START( sheriff_sound ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( helifire_sound ) +MACHINE_CONFIG_START(n8080_state::helifire_sound) MCFG_SOUND_START_OVERRIDE(n8080_state,helifire) MCFG_SOUND_RESET_OVERRIDE(n8080_state,helifire) diff --git a/src/mame/audio/namco52.cpp b/src/mame/audio/namco52.cpp index 34a05c9544d..efd8b93b135 100644 --- a/src/mame/audio/namco52.cpp +++ b/src/mame/audio/namco52.cpp @@ -176,7 +176,7 @@ void namco_52xx_device::device_start() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( namco_52xx_device::device_add_mconfig ) +MACHINE_CONFIG_START(namco_52xx_device::device_add_mconfig) MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_MB88XX_READ_K_CB(READ8(namco_52xx_device, K_r)) MCFG_MB88XX_WRITE_O_CB(WRITE8(namco_52xx_device, O_w)) diff --git a/src/mame/audio/namco54.cpp b/src/mame/audio/namco54.cpp index 70109ad187d..89d07073d6b 100644 --- a/src/mame/audio/namco54.cpp +++ b/src/mame/audio/namco54.cpp @@ -135,7 +135,7 @@ void namco_54xx_device::device_start() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( namco_54xx_device::device_add_mconfig ) +MACHINE_CONFIG_START(namco_54xx_device::device_add_mconfig) MCFG_CPU_ADD("mcu", MB8844, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_MB88XX_READ_K_CB(READ8(namco_54xx_device, K_r)) MCFG_MB88XX_WRITE_O_CB(WRITE8(namco_54xx_device, O_w)) diff --git a/src/mame/audio/nichisnd.cpp b/src/mame/audio/nichisnd.cpp index 386a8bc8c7f..5d9fedf432e 100644 --- a/src/mame/audio/nichisnd.cpp +++ b/src/mame/audio/nichisnd.cpp @@ -76,7 +76,7 @@ static const z80_daisy_config daisy_chain[] = -MACHINE_CONFIG_MEMBER(nichisnd_device::device_add_mconfig) +MACHINE_CONFIG_START(nichisnd_device::device_add_mconfig) MCFG_CPU_ADD("audiocpu", TMPZ84C011, 8000000) /* TMPZ84C011, 8.00 MHz */ MCFG_Z80_DAISY_CHAIN(daisy_chain) MCFG_CPU_PROGRAM_MAP(nichisnd_map) diff --git a/src/mame/audio/pulsar.cpp b/src/mame/audio/pulsar.cpp index d378509156c..baf03df2dd7 100644 --- a/src/mame/audio/pulsar.cpp +++ b/src/mame/audio/pulsar.cpp @@ -171,7 +171,7 @@ WRITE8_MEMBER( vicdual_state::pulsar_audio_2_w ) } -MACHINE_CONFIG_START( pulsar_audio ) +MACHINE_CONFIG_START(vicdual_state::pulsar_audio) /* samples */ MCFG_SOUND_ADD("samples", SAMPLES, 0) diff --git a/src/mame/audio/pulsar.h b/src/mame/audio/pulsar.h deleted file mode 100644 index c6765be23cf..00000000000 --- a/src/mame/audio/pulsar.h +++ /dev/null @@ -1,4 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Zsolt Vasvari - -MACHINE_CONFIG_EXTERN( pulsar_audio ); diff --git a/src/mame/audio/qix.cpp b/src/mame/audio/qix.cpp index e8da3bd31cc..aebf53611e7 100644 --- a/src/mame/audio/qix.cpp +++ b/src/mame/audio/qix.cpp @@ -170,7 +170,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_START( qix_audio ) +MACHINE_CONFIG_START(qix_state::qix_audio) MCFG_CPU_ADD("audiocpu", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */ MCFG_CPU_PROGRAM_MAP(audio_map) @@ -204,7 +204,7 @@ MACHINE_CONFIG_START( qix_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( slither_audio ) +MACHINE_CONFIG_START(qix_state::slither_audio) MCFG_DEVICE_ADD("sndpia0", PIA6821, 0) MCFG_PIA_READPA_HANDLER(IOPORT("P2")) MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, slither_coinctl_w)) diff --git a/src/mame/audio/rax.cpp b/src/mame/audio/rax.cpp index 76453be8440..47bc9a690d6 100644 --- a/src/mame/audio/rax.cpp +++ b/src/mame/audio/rax.cpp @@ -487,7 +487,7 @@ acclaim_rax_device::acclaim_rax_device(const machine_config &mconfig, const char // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( acclaim_rax_device::device_add_mconfig ) +MACHINE_CONFIG_START(acclaim_rax_device::device_add_mconfig) MCFG_CPU_ADD("adsp", ADSP2181, XTAL_16_67MHz) MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(acclaim_rax_device, adsp_sound_tx_callback)) /* callback for serial transmit */ MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(acclaim_rax_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction diff --git a/src/mame/audio/redalert.cpp b/src/mame/audio/redalert.cpp index 216661eb09c..32111653d09 100644 --- a/src/mame/audio/redalert.cpp +++ b/src/mame/audio/redalert.cpp @@ -176,7 +176,7 @@ ADDRESS_MAP_END * *************************************/ -static MACHINE_CONFIG_START( redalert_audio_m37b ) +MACHINE_CONFIG_START(redalert_state::redalert_audio_m37b) MCFG_CPU_ADD("audiocpu", M6502, REDALERT_AUDIO_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(redalert_audio_map) @@ -199,7 +199,7 @@ MACHINE_CONFIG_END * *************************************/ -static MACHINE_CONFIG_START( redalert_audio_voice ) +MACHINE_CONFIG_START(redalert_state::redalert_audio_voice) MCFG_CPU_ADD("voice", I8085A, REDALERT_VOICE_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(redalert_voice_map) @@ -218,7 +218,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_START( redalert_audio ) +MACHINE_CONFIG_START(redalert_state::redalert_audio) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -235,7 +235,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_START( ww3_audio ) +MACHINE_CONFIG_START(redalert_state::ww3_audio) MCFG_SPEAKER_STANDARD_MONO("mono") @@ -341,7 +341,7 @@ SOUND_START_MEMBER( redalert_state, demoneye ) * *************************************/ -MACHINE_CONFIG_START( demoneye_audio ) +MACHINE_CONFIG_START(redalert_state::demoneye_audio) MCFG_CPU_ADD("audiocpu", M6802, DEMONEYE_AUDIO_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(demoneye_audio_map) diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp index fb80c7ad1f0..39d7ea21981 100644 --- a/src/mame/audio/s11c_bg.cpp +++ b/src/mame/audio/s11c_bg.cpp @@ -56,7 +56,7 @@ void s11c_bg_device::data_w(uint8_t data) m_pia40->portb_w(data); } -MACHINE_CONFIG_MEMBER( s11c_bg_device::device_add_mconfig ) +MACHINE_CONFIG_START(s11c_bg_device::device_add_mconfig) MCFG_CPU_ADD("bgcpu", MC6809E, XTAL_8MHz / 4) // MC68B09E MCFG_CPU_PROGRAM_MAP(s11c_bg_map) MCFG_QUANTUM_TIME(attotime::from_hz(50)) diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp index 4b13ee9d1ab..a37f5fcac2f 100644 --- a/src/mame/audio/scramble.cpp +++ b/src/mame/audio/scramble.cpp @@ -290,7 +290,7 @@ static ADDRESS_MAP_START( ad2083_sound_io_map, AS_IO, 8, scramble_state ) AM_RANGE(0x80, 0x80) AM_DEVWRITE("ay2", ay8910_device, address_w) ADDRESS_MAP_END -MACHINE_CONFIG_START( ad2083_audio ) +MACHINE_CONFIG_START(scramble_state::ad2083_audio) MCFG_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */ MCFG_CPU_PROGRAM_MAP(ad2083_sound_map) diff --git a/src/mame/audio/segag80r.cpp b/src/mame/audio/segag80r.cpp index adc354b9d7b..f32e5f5bc94 100644 --- a/src/mame/audio/segag80r.cpp +++ b/src/mame/audio/segag80r.cpp @@ -231,7 +231,7 @@ static const char *const astrob_sample_names[] = }; -MACHINE_CONFIG_START( astrob_sound_board ) +MACHINE_CONFIG_START(segag80r_state::astrob_sound_board) /* sound hardware */ MCFG_SOUND_ADD("samples", SAMPLES, 0) @@ -418,7 +418,7 @@ static const char *const sega005_sample_names[] = }; -MACHINE_CONFIG_START( 005_sound_board ) +MACHINE_CONFIG_START(segag80r_state::sega005_sound_board) MCFG_DEVICE_ADD("ppi8255", I8255A, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(segag80r_state, sega005_sound_a_w)) @@ -580,7 +580,7 @@ static const char *const spaceod_sample_names[] = }; -MACHINE_CONFIG_START( spaceod_sound_board ) +MACHINE_CONFIG_START(segag80r_state::spaceod_sound_board) /* sound hardware */ @@ -678,7 +678,7 @@ static const char *const monsterb_sample_names[] = * *************************************/ -MACHINE_CONFIG_START( monsterb_sound_board ) +MACHINE_CONFIG_START(segag80r_state::monsterb_sound_board) MCFG_DEVICE_ADD("ppi8255", I8255A, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(segag80r_state, monsterb_sound_a_w)) MCFG_I8255_OUT_PORTB_CB(WRITE8(segag80r_state, monsterb_sound_b_w)) diff --git a/src/mame/audio/segam1audio.cpp b/src/mame/audio/segam1audio.cpp index c9724c21f55..d221c4bfba9 100644 --- a/src/mame/audio/segam1audio.cpp +++ b/src/mame/audio/segam1audio.cpp @@ -52,7 +52,7 @@ DEFINE_DEVICE_TYPE(SEGAM1AUDIO, segam1audio_device, "segam1audio", "Sega Model 1 // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( segam1audio_device::device_add_mconfig ) +MACHINE_CONFIG_START(segam1audio_device::device_add_mconfig) MCFG_CPU_ADD(M68000_TAG, M68000, 10000000) // verified on real h/w MCFG_CPU_PROGRAM_MAP(segam1audio_map) diff --git a/src/mame/audio/segasnd.cpp b/src/mame/audio/segasnd.cpp index 1671c23c25f..3d6549f7e4c 100644 --- a/src/mame/audio/segasnd.cpp +++ b/src/mame/audio/segasnd.cpp @@ -12,6 +12,8 @@ #include "segasnd.h" #include "sound/sp0250.h" +#include "includes/segag80r.h" +#include "includes/segag80v.h" #include @@ -215,7 +217,26 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_START( sega_speech_board ) +MACHINE_CONFIG_START(segag80r_state::sega_speech_board) + + /* CPU for the speech board */ + MCFG_CPU_ADD("audiocpu", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */ + MCFG_CPU_PROGRAM_MAP(speech_map) + MCFG_CPU_IO_MAP(speech_portmap) + MCFG_MCS48_PORT_P1_IN_CB(DEVREAD8("segaspeech", speech_sound_device, p1_r)) + MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("segaspeech", speech_sound_device, p1_w)) + MCFG_MCS48_PORT_P2_OUT_CB(DEVWRITE8("segaspeech", speech_sound_device, p2_w)) + MCFG_MCS48_PORT_T0_IN_CB(DEVREADLINE("segaspeech", speech_sound_device, t0_r)) + MCFG_MCS48_PORT_T1_IN_CB(DEVREADLINE("segaspeech", speech_sound_device, t1_r)) + + /* sound hardware */ + MCFG_SOUND_ADD("segaspeech", SEGASPEECH, 0) + MCFG_SOUND_ADD("speech", SP0250, SPEECH_MASTER_CLOCK) + MCFG_SP0250_DRQ_CALLBACK(DEVWRITELINE("segaspeech", speech_sound_device, drq_w)) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(segag80v_state::sega_speech_board) /* CPU for the speech board */ MCFG_CPU_ADD("audiocpu", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */ @@ -857,7 +878,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( usb_sound_device::device_add_mconfig ) +MACHINE_CONFIG_START(usb_sound_device::device_add_mconfig) /* CPU for the usb board */ MCFG_CPU_ADD("ourcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */ @@ -883,7 +904,7 @@ static ADDRESS_MAP_START( usb_map_rom, AS_PROGRAM, 8, usb_sound_device ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_REGION(":usbcpu", 0) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( usb_rom_sound_device::device_add_mconfig ) +MACHINE_CONFIG_START(usb_rom_sound_device::device_add_mconfig) usb_sound_device::device_add_mconfig(config); /* CPU for the usb board */ diff --git a/src/mame/audio/segasnd.h b/src/mame/audio/segasnd.h index 4fae14d301f..c40a68afa3c 100644 --- a/src/mame/audio/segasnd.h +++ b/src/mame/audio/segasnd.h @@ -31,6 +31,8 @@ public: DECLARE_WRITE_LINE_MEMBER(drq_w); + void sega_speech_board(machine_config &config); + protected: // device-level overrides virtual void device_start() override; @@ -51,8 +53,6 @@ private: DECLARE_DEVICE_TYPE(SEGASPEECH, speech_sound_device) -MACHINE_CONFIG_EXTERN( sega_speech_board ); - class usb_sound_device : public device_t, public device_sound_interface { diff --git a/src/mame/audio/spacefb.cpp b/src/mame/audio/spacefb.cpp index 00607b17649..31ea51d8d14 100644 --- a/src/mame/audio/spacefb.cpp +++ b/src/mame/audio/spacefb.cpp @@ -77,7 +77,7 @@ static const char *const spacefb_sample_names[] = }; -MACHINE_CONFIG_START( spacefb_audio ) +MACHINE_CONFIG_START(spacefb_state::spacefb_audio) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) diff --git a/src/mame/audio/spiders.cpp b/src/mame/audio/spiders.cpp index a3ac004b972..b4b2755cff3 100644 --- a/src/mame/audio/spiders.cpp +++ b/src/mame/audio/spiders.cpp @@ -205,7 +205,7 @@ WRITE8_MEMBER(spiders_state::spiders_audio_ctrl_w) } -MACHINE_CONFIG_START( spiders_audio ) +MACHINE_CONFIG_START(spiders_state::spiders_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) diff --git a/src/mame/audio/sprint8.cpp b/src/mame/audio/sprint8.cpp index 0294e94ca85..582974094c6 100644 --- a/src/mame/audio/sprint8.cpp +++ b/src/mame/audio/sprint8.cpp @@ -296,7 +296,7 @@ DISCRETE_SOUND_START( sprint8 ) DISCRETE_TASK_END() DISCRETE_SOUND_END -MACHINE_CONFIG_START( sprint8_audio ) +MACHINE_CONFIG_START(sprint8_state::sprint8_audio) /* 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. */ diff --git a/src/mame/audio/svis_snd.h b/src/mame/audio/svis_snd.h index 1a3777434ae..2896559e240 100644 --- a/src/mame/audio/svis_snd.h +++ b/src/mame/audio/svis_snd.h @@ -19,7 +19,7 @@ #define SVISION_SND_IRQ_MEMBER(_name) void _name(void) #define SVISION_SND_IRQ_CB(_class, _method) \ - svision_sound_device::set_irq_callback(*device, svision_sound_device::irq_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + svision_sound_device::set_irq_callback(*device, svision_sound_device::irq_delegate(&_class::_method, #_class "::" #_method, this)); // ======================> svision_sound_device diff --git a/src/mame/audio/t5182.cpp b/src/mame/audio/t5182.cpp index e4bfd20ec10..7044242425d 100644 --- a/src/mame/audio/t5182.cpp +++ b/src/mame/audio/t5182.cpp @@ -369,7 +369,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( t5182_device::device_add_mconfig ) +MACHINE_CONFIG_START(t5182_device::device_add_mconfig) MCFG_CPU_ADD("t5182_z80", Z80, T5182_CLOCK) MCFG_CPU_PROGRAM_MAP(t5182_map) MCFG_CPU_IO_MAP(t5182_io) diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp index e158b5aaa87..9e1d9ed18f5 100644 --- a/src/mame/audio/taito_en.cpp +++ b/src/mame/audio/taito_en.cpp @@ -270,7 +270,7 @@ WRITE_LINE_MEMBER(taito_en_device::duart_irq_handler) // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( taito_en_device::device_add_mconfig ) +MACHINE_CONFIG_START(taito_en_device::device_add_mconfig) /* basic machine hardware */ MCFG_CPU_ADD("audiocpu", M68000, XTAL_30_4761MHz / 2) diff --git a/src/mame/audio/taito_zm.cpp b/src/mame/audio/taito_zm.cpp index 87072257d33..61062d99a79 100644 --- a/src/mame/audio/taito_zm.cpp +++ b/src/mame/audio/taito_zm.cpp @@ -39,8 +39,8 @@ DEFINE_DEVICE_TYPE(TAITO_ZOOM, taito_zoom_device, "taito_zoom", "Taito Zoom Soun taito_zoom_device::taito_zoom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, TAITO_ZOOM, tag, owner, clock), - m_soundcpu(*this, ":mn10200"), - m_zsg2(*this, ":zsg2"), + m_soundcpu(*this, "mn10200"), + m_zsg2(*this, "zsg2"), m_reg_address(0), m_tms_ctrl(0) { @@ -111,7 +111,7 @@ ADDRESS_MAP_START( taitozoom_mn_map, AS_PROGRAM, 16, taito_zoom_device ) AM_RANGE(0x400000, 0x41ffff) AM_RAM AM_RANGE(0x800000, 0x8007ff) AM_DEVREADWRITE("zsg2", zsg2_device, read, write) AM_RANGE(0xc00000, 0xc00001) AM_RAM // TMS57002 comms - AM_RANGE(0xe00000, 0xe000ff) AM_DEVREADWRITE8("taito_zoom", taito_zoom_device, shared_ram_r, shared_ram_w, 0xffff) // M66220FP for comms with maincpu + AM_RANGE(0xe00000, 0xe000ff) AM_READWRITE8(shared_ram_r, shared_ram_w, 0xffff) // M66220FP for comms with maincpu ADDRESS_MAP_END @@ -168,13 +168,11 @@ WRITE16_MEMBER(taito_zoom_device::reg_address_w) ***************************************************************************/ -MACHINE_CONFIG_START( taito_zoom_sound ) - +MACHINE_CONFIG_START(taito_zoom_device::device_add_mconfig) /* basic machine hardware */ - MCFG_TAITO_ZOOM_ADD("taito_zoom") MCFG_CPU_ADD("mn10200", MN1020012A, XTAL_25MHz/2) - MCFG_MN10200_READ_PORT_CB(1, DEVREAD8("taito_zoom", taito_zoom_device, tms_ctrl_r)) - MCFG_MN10200_WRITE_PORT_CB(1, DEVWRITE8("taito_zoom", taito_zoom_device, tms_ctrl_w)) + MCFG_MN10200_READ_PORT_CB(1, DEVREAD8(DEVICE_SELF, taito_zoom_device, tms_ctrl_r)) + MCFG_MN10200_WRITE_PORT_CB(1, DEVWRITE8(DEVICE_SELF, taito_zoom_device, tms_ctrl_w)) MCFG_CPU_PROGRAM_MAP(taitozoom_mn_map) MCFG_QUANTUM_TIME(attotime::from_hz(60000)) @@ -182,6 +180,6 @@ MACHINE_CONFIG_START( taito_zoom_sound ) MCFG_ZSG2_ADD("zsg2", XTAL_25MHz) // we assume the parent machine has created lspeaker/rspeaker - MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) + 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.h b/src/mame/audio/taito_zm.h index 2c02599efe9..f30fcc27029 100644 --- a/src/mame/audio/taito_zm.h +++ b/src/mame/audio/taito_zm.h @@ -31,11 +31,11 @@ public: DECLARE_WRITE8_MEMBER(shared_ram_w); DECLARE_READ8_MEMBER(tms_ctrl_r); DECLARE_WRITE8_MEMBER(tms_ctrl_w); - protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; + virtual void device_add_mconfig(machine_config &config) override; private: // inherited devices/pointers @@ -50,8 +50,6 @@ private: DECLARE_DEVICE_TYPE(TAITO_ZOOM, taito_zoom_device) -MACHINE_CONFIG_EXTERN( taito_zoom_sound ); - #define MCFG_TAITO_ZOOM_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, TAITO_ZOOM, 0) diff --git a/src/mame/audio/targ.cpp b/src/mame/audio/targ.cpp index 34a9ddbf5ed..ceaca255005 100644 --- a/src/mame/audio/targ.cpp +++ b/src/mame/audio/targ.cpp @@ -175,7 +175,7 @@ SAMPLES_START_CB_MEMBER(exidy_state::targ_audio_start) } -MACHINE_CONFIG_START( spectar_audio ) +MACHINE_CONFIG_START(exidy_state::spectar_audio) MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -191,7 +191,7 @@ MACHINE_CONFIG_START( spectar_audio ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( targ_audio ) +MACHINE_CONFIG_START(exidy_state::targ_audio) MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/mame/audio/targ.h b/src/mame/audio/targ.h deleted file mode 100644 index 079a5dd26c7..00000000000 --- a/src/mame/audio/targ.h +++ /dev/null @@ -1,5 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Aaron Giles - -MACHINE_CONFIG_EXTERN( spectar_audio ); -MACHINE_CONFIG_EXTERN( targ_audio ); diff --git a/src/mame/audio/timeplt.cpp b/src/mame/audio/timeplt.cpp index 711a3878538..8199f02b418 100644 --- a/src/mame/audio/timeplt.cpp +++ b/src/mame/audio/timeplt.cpp @@ -13,6 +13,7 @@ ***************************************************************************/ #include "emu.h" +#include "includes/timeplt.h" #include "audio/timeplt.h" #include "machine/gen_latch.h" @@ -155,14 +156,14 @@ static ADDRESS_MAP_START( timeplt_sound_map, AS_PROGRAM, 8, timeplt_audio_device AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay1", ay8910_device, address_w) AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay2", ay8910_device, data_r, data_w) AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay2", ay8910_device, address_w) - AM_RANGE(0x8000, 0xffff) AM_DEVWRITE("timeplt_audio", timeplt_audio_device, filter_w) + AM_RANGE(0x8000, 0xffff) AM_WRITE(filter_w) ADDRESS_MAP_END static ADDRESS_MAP_START( locomotn_sound_map, AS_PROGRAM, 8, timeplt_audio_device ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x0c00) AM_RAM - AM_RANGE(0x3000, 0x3fff) AM_DEVWRITE("timeplt_audio", timeplt_audio_device, filter_w) + AM_RANGE(0x3000, 0x3fff) AM_WRITE(filter_w) AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay1", ay8910_device, data_r, data_w) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay1", ay8910_device, address_w) AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay2", ay8910_device, data_r, data_w) @@ -176,7 +177,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_START( timeplt_sound ) +MACHINE_CONFIG_START(timeplt_audio_device::timeplt_sound) /* basic machine hardware */ MCFG_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8) @@ -185,10 +186,8 @@ MACHINE_CONFIG_START( timeplt_sound ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0) - MCFG_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/8) - MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) + MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("^soundlatch", generic_latch_8_device, read)) MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("timeplt_audio", timeplt_audio_device, portB_r)) MCFG_SOUND_ROUTE(0, "filter.0.0", 0.60) MCFG_SOUND_ROUTE(1, "filter.0.1", 0.60) @@ -215,7 +214,7 @@ MACHINE_CONFIG_START( timeplt_sound ) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( locomotn_sound, timeplt_sound ) +MACHINE_CONFIG_DERIVED(timeplt_audio_device::locomotn_sound, timeplt_sound) /* basic machine hardware */ MCFG_CPU_MODIFY("tpsound") diff --git a/src/mame/audio/timeplt.h b/src/mame/audio/timeplt.h index 075dc50f163..3ea327338d4 100644 --- a/src/mame/audio/timeplt.h +++ b/src/mame/audio/timeplt.h @@ -19,6 +19,9 @@ public: DECLARE_WRITE8_MEMBER(filter_w); DECLARE_READ8_MEMBER(portB_r); + void timeplt_sound(machine_config &config); + void locomotn_sound(machine_config &config); + protected: // device-level overrides virtual void device_start() override; @@ -41,9 +44,6 @@ private: void filter_w( device_t *device, int data ); }; -MACHINE_CONFIG_EXTERN( timeplt_sound ); -MACHINE_CONFIG_EXTERN( locomotn_sound ); - DECLARE_DEVICE_TYPE(TIMEPLT_AUDIO, timeplt_audio_device) #endif // MAME_AUDIO_TIMEPLT_H diff --git a/src/mame/audio/tranqgun.cpp b/src/mame/audio/tranqgun.cpp index c3583407049..3f43a2b61e4 100644 --- a/src/mame/audio/tranqgun.cpp +++ b/src/mame/audio/tranqgun.cpp @@ -140,7 +140,7 @@ WRITE8_MEMBER( vicdual_state::tranqgun_audio_w ) } -MACHINE_CONFIG_START( tranqgun_audio ) +MACHINE_CONFIG_START(vicdual_state::tranqgun_audio) /* samples */ MCFG_SOUND_ADD("samples", SAMPLES, 0) diff --git a/src/mame/audio/tranqgun.h b/src/mame/audio/tranqgun.h deleted file mode 100644 index d5228077554..00000000000 --- a/src/mame/audio/tranqgun.h +++ /dev/null @@ -1,4 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Zsolt Vasvari - -MACHINE_CONFIG_EXTERN( tranqgun_audio ); diff --git a/src/mame/audio/turbo.cpp b/src/mame/audio/turbo.cpp index 53f86fd7274..73e36ff4693 100644 --- a/src/mame/audio/turbo.cpp +++ b/src/mame/audio/turbo.cpp @@ -183,7 +183,7 @@ static const char *const turbo_sample_names[] = }; -MACHINE_CONFIG_START( turbo_samples ) +MACHINE_CONFIG_START(turbo_state::turbo_samples) /* this is the cockpit speaker configuration */ MCFG_SPEAKER_ADD("fspeaker", 0.0, 0.0, 1.0) /* front */ @@ -429,7 +429,7 @@ static const char *const subroc3d_sample_names[] = nullptr }; -MACHINE_CONFIG_START( subroc3d_samples ) +MACHINE_CONFIG_START(turbo_state::subroc3d_samples) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("samples", SAMPLES, 0) @@ -574,7 +574,7 @@ static const char *const buckrog_sample_names[]= }; -MACHINE_CONFIG_START( buckrog_samples ) +MACHINE_CONFIG_START(turbo_state::buckrog_samples) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(6) diff --git a/src/mame/audio/vicdual-97271p.cpp b/src/mame/audio/vicdual-97271p.cpp index 30be9ebe9e8..baef818445f 100644 --- a/src/mame/audio/vicdual-97271p.cpp +++ b/src/mame/audio/vicdual-97271p.cpp @@ -86,7 +86,7 @@ s97271p_device::s97271p_device(const machine_config &mconfig, const char *tag, d // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( s97271p_device::device_add_mconfig ) +MACHINE_CONFIG_START(s97271p_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("mono") /* samples */ diff --git a/src/mame/audio/vicdual.cpp b/src/mame/audio/vicdual.cpp index 9c43f5f3beb..3d4e059ca68 100644 --- a/src/mame/audio/vicdual.cpp +++ b/src/mame/audio/vicdual.cpp @@ -111,7 +111,7 @@ static const char *const frogs_sample_names[] = }; -MACHINE_CONFIG_START( frogs_audio ) +MACHINE_CONFIG_START(vicdual_state::frogs_audio) MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(5) MCFG_SAMPLES_NAMES(frogs_sample_names) @@ -445,7 +445,7 @@ static DISCRETE_SOUND_START(headon) DISCRETE_SOUND_END -MACHINE_CONFIG_START( headon_audio ) +MACHINE_CONFIG_START(vicdual_state::headon_audio) MCFG_SOUND_ADD("discrete", DISCRETE, 0) MCFG_DISCRETE_INTF(headon) @@ -592,7 +592,7 @@ static const char *const brdrline_sample_names[] = }; -MACHINE_CONFIG_START( brdrline_audio ) +MACHINE_CONFIG_START(vicdual_state::brdrline_audio) MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(7) MCFG_SAMPLES_NAMES(brdrline_sample_names) diff --git a/src/mame/audio/vicdual.h b/src/mame/audio/vicdual.h deleted file mode 100644 index aac4bffbe28..00000000000 --- a/src/mame/audio/vicdual.h +++ /dev/null @@ -1,6 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Derrick Renaud, Couriersud - -MACHINE_CONFIG_EXTERN( frogs_audio ); -MACHINE_CONFIG_EXTERN( headon_audio ); -MACHINE_CONFIG_EXTERN( brdrline_audio ); diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp index 6633556d258..b074045848a 100644 --- a/src/mame/audio/williams.cpp +++ b/src/mame/audio/williams.cpp @@ -174,7 +174,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( williams_cvsd_sound_device::device_add_mconfig ) +MACHINE_CONFIG_START(williams_cvsd_sound_device::device_add_mconfig) MCFG_CPU_ADD("cpu", MC6809E, CVSD_MASTER_CLOCK / 4) MCFG_CPU_PROGRAM_MAP(williams_cvsd_map) @@ -492,7 +492,7 @@ ADDRESS_MAP_END //------------------------------------------------- -MACHINE_CONFIG_MEMBER( williams_narc_sound_device::device_add_mconfig ) +MACHINE_CONFIG_START(williams_narc_sound_device::device_add_mconfig) MCFG_CPU_ADD("cpu0", MC6809E, NARC_MASTER_CLOCK / 4) MCFG_CPU_PROGRAM_MAP(williams_narc_master_map) @@ -745,7 +745,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( williams_adpcm_sound_device::device_add_mconfig ) +MACHINE_CONFIG_START(williams_adpcm_sound_device::device_add_mconfig) MCFG_CPU_ADD("cpu", MC6809E, ADPCM_MASTER_CLOCK / 4) MCFG_CPU_PROGRAM_MAP(williams_adpcm_map) diff --git a/src/mame/audio/wpcsnd.cpp b/src/mame/audio/wpcsnd.cpp index f8ce84bae3d..75b34c75f9d 100644 --- a/src/mame/audio/wpcsnd.cpp +++ b/src/mame/audio/wpcsnd.cpp @@ -66,7 +66,7 @@ uint8_t wpcsnd_device::data_r() return m_reply; } -MACHINE_CONFIG_MEMBER( wpcsnd_device::device_add_mconfig ) +MACHINE_CONFIG_START(wpcsnd_device::device_add_mconfig) MCFG_CPU_ADD("bgcpu", MC6809E, XTAL_8MHz / 4) // MC68B09E MCFG_CPU_PROGRAM_MAP(wpcsnd_map) MCFG_QUANTUM_TIME(attotime::from_hz(50)) diff --git a/src/mame/audio/zaccaria.cpp b/src/mame/audio/zaccaria.cpp index a80badd075a..90ebf16c7b1 100644 --- a/src/mame/audio/zaccaria.cpp +++ b/src/mame/audio/zaccaria.cpp @@ -218,7 +218,7 @@ READ8_MEMBER(zac1b111xx_melody_base::melodypsg1_portb_r) return m_melody_command; } -MACHINE_CONFIG_MEMBER(zac1b111xx_melody_base::device_add_mconfig) +MACHINE_CONFIG_START(zac1b111xx_melody_base::device_add_mconfig) MCFG_CPU_ADD("melodycpu", M6802, XTAL_3_579545MHz) // verified on pcb MCFG_CPU_PROGRAM_MAP(zac1b111xx_melody_base_map) @@ -297,7 +297,7 @@ WRITE8_MEMBER(zac1b11107_audio_device::melodypsg2_porta_w) // TODO: assume LEVELT is controlled here as is the case for 1B11142? } -MACHINE_CONFIG_MEMBER(zac1b11107_audio_device::device_add_mconfig) +MACHINE_CONFIG_START(zac1b11107_audio_device::device_add_mconfig) zac1b111xx_melody_base::device_add_mconfig(config); MCFG_CPU_MODIFY("melodycpu") @@ -400,7 +400,7 @@ WRITE8_MEMBER(zac1b11142_audio_device::pia_1i_portb_w) // TODO: a LED output().set_led_value(0, BIT(data, 4)); } -MACHINE_CONFIG_MEMBER(zac1b11142_audio_device::device_add_mconfig) +MACHINE_CONFIG_START(zac1b11142_audio_device::device_add_mconfig) zac1b111xx_melody_base::device_add_mconfig(config); MCFG_CPU_MODIFY("melodycpu") diff --git a/src/mame/audio/zaxxon.cpp b/src/mame/audio/zaxxon.cpp index b7c31175a7b..10923afc895 100644 --- a/src/mame/audio/zaxxon.cpp +++ b/src/mame/audio/zaxxon.cpp @@ -92,7 +92,7 @@ static const char *const zaxxon_sample_names[] = }; -MACHINE_CONFIG_START( zaxxon_samples ) +MACHINE_CONFIG_START(zaxxon_state::zaxxon_samples) MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(12) MCFG_SAMPLES_NAMES(zaxxon_sample_names) @@ -192,7 +192,7 @@ static const char *const congo_sample_names[] = }; -MACHINE_CONFIG_START( congo_samples ) +MACHINE_CONFIG_START(zaxxon_state::congo_samples) MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(5) MCFG_SAMPLES_NAMES(congo_sample_names) diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp index dbc4da380d8..75c0f88315a 100644 --- a/src/mame/drivers/1942.cpp +++ b/src/mame/drivers/1942.cpp @@ -554,7 +554,7 @@ void _1942_state::machine_reset() m_scroll[1] = 0; } -static MACHINE_CONFIG_START( 1942 ) +MACHINE_CONFIG_START(_1942_state::_1942) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */ @@ -622,7 +622,7 @@ static MACHINE_CONFIG_START( 1942 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( 1942p ) +MACHINE_CONFIG_START(_1942_state::_1942p) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK_1942P) /* 4 MHz - verified on PCB */ @@ -953,10 +953,10 @@ DRIVER_INIT_MEMBER(_1942_state,1942) } -GAME( 1984, 1942, 0, 1942, 1942, _1942_state, 1942, ROT270, "Capcom", "1942 (Revision B)", MACHINE_SUPPORTS_SAVE ) -GAME( 1984, 1942a, 1942, 1942, 1942, _1942_state, 1942, ROT270, "Capcom", "1942 (Revision A)", MACHINE_SUPPORTS_SAVE ) -GAME( 1984, 1942abl, 1942, 1942, 1942, _1942_state, 1942, ROT270, "bootleg", "1942 (Revision A, bootleg)", MACHINE_SUPPORTS_SAVE ) // data is the same as 1942a set, different rom format -GAME( 1991, 1942h, 1942, 1942, 1942, _1942_state, 1942, ROT270, "hack (Two Bit Score)", "Supercharger 1942", MACHINE_SUPPORTS_SAVE ) -GAME( 1984, 1942b, 1942, 1942, 1942, _1942_state, 1942, ROT270, "Capcom", "1942 (First Version)", MACHINE_SUPPORTS_SAVE ) -GAME( 1985, 1942w, 1942, 1942, 1942, _1942_state, 1942, ROT270, "Capcom (Williams Electronics license)", "1942 (Williams Electronics license)", MACHINE_SUPPORTS_SAVE ) /* Based on 1942 (Revision B) */ -GAME( 1984, 1942p, 1942, 1942p,1942p,_1942_state, 1942, ROT270, "bootleg", "1942 (Tecfri PCB, bootleg?)", MACHINE_SUPPORTS_SAVE ) +GAME( 1984, 1942, 0, _1942, 1942, _1942_state, 1942, ROT270, "Capcom", "1942 (Revision B)", MACHINE_SUPPORTS_SAVE ) +GAME( 1984, 1942a, 1942, _1942, 1942, _1942_state, 1942, ROT270, "Capcom", "1942 (Revision A)", MACHINE_SUPPORTS_SAVE ) +GAME( 1984, 1942abl, 1942, _1942, 1942, _1942_state, 1942, ROT270, "bootleg", "1942 (Revision A, bootleg)", MACHINE_SUPPORTS_SAVE ) // data is the same as 1942a set, different rom format +GAME( 1991, 1942h, 1942, _1942, 1942, _1942_state, 1942, ROT270, "hack (Two Bit Score)", "Supercharger 1942", MACHINE_SUPPORTS_SAVE ) +GAME( 1984, 1942b, 1942, _1942, 1942, _1942_state, 1942, ROT270, "Capcom", "1942 (First Version)", MACHINE_SUPPORTS_SAVE ) +GAME( 1985, 1942w, 1942, _1942, 1942, _1942_state, 1942, ROT270, "Capcom (Williams Electronics license)", "1942 (Williams Electronics license)", MACHINE_SUPPORTS_SAVE ) /* Based on 1942 (Revision B) */ +GAME( 1984, 1942p, 1942, _1942p,1942p,_1942_state, 1942, ROT270, "bootleg", "1942 (Tecfri PCB, bootleg?)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp index ecc4ba769a4..9a73b023372 100644 --- a/src/mame/drivers/1943.cpp +++ b/src/mame/drivers/1943.cpp @@ -309,7 +309,7 @@ void _1943_state::machine_reset() m_prot_value = 0; } -static MACHINE_CONFIG_START( 1943 ) +MACHINE_CONFIG_START(_1943_state::_1943) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */ @@ -947,13 +947,13 @@ DRIVER_INIT_MEMBER(_1943_state,1943b) } /* Game Drivers */ -GAME( 1987, 1943, 0, 1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: The Battle of Midway (Euro)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, 1943u, 1943, 1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: The Battle of Midway (US, Rev C)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, 1943ua, 1943, 1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: The Battle of Midway (US)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, 1943j, 1943, 1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: Midway Kaisen (Japan, Rev B)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, 1943ja, 1943, 1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: Midway Kaisen (Japan)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, 1943jah, 1943, 1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: Midway Kaisen (Japan, no protection hack)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, 1943b, 1943, 1943, 1943, _1943_state, 1943b,ROT270, "bootleg", "1943: Battle of Midway (bootleg, hack of Japan set)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, 1943bj, 1943, 1943, 1943, _1943_state, 1943b,ROT270, "bootleg", "1943: Midway Kaisen (bootleg)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, 1943kai, 0, 1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943 Kai: Midway Kaisen (Japan)", MACHINE_SUPPORTS_SAVE ) -GAME( 1987, 1943mii, 0, 1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: The Battle of Midway Mark II (US)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, 1943, 0, _1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: The Battle of Midway (Euro)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, 1943u, 1943, _1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: The Battle of Midway (US, Rev C)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, 1943ua, 1943, _1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: The Battle of Midway (US)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, 1943j, 1943, _1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: Midway Kaisen (Japan, Rev B)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, 1943ja, 1943, _1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: Midway Kaisen (Japan)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, 1943jah, 1943, _1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: Midway Kaisen (Japan, no protection hack)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, 1943b, 1943, _1943, 1943, _1943_state, 1943b,ROT270, "bootleg", "1943: Battle of Midway (bootleg, hack of Japan set)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, 1943bj, 1943, _1943, 1943, _1943_state, 1943b,ROT270, "bootleg", "1943: Midway Kaisen (bootleg)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, 1943kai, 0, _1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943 Kai: Midway Kaisen (Japan)", MACHINE_SUPPORTS_SAVE ) +GAME( 1987, 1943mii, 0, _1943, 1943, _1943_state, 1943, ROT270, "Capcom", "1943: The Battle of Midway Mark II (US)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp index 53f6550d03b..bdadda9b0a3 100644 --- a/src/mame/drivers/1945kiii.cpp +++ b/src/mame/drivers/1945kiii.cpp @@ -91,6 +91,8 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void flagrall(machine_config &config); + void k3(machine_config &config); }; @@ -367,7 +369,7 @@ void k3_state::machine_start() { } -static MACHINE_CONFIG_START( flagrall ) +MACHINE_CONFIG_START(k3_state::flagrall) MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK ) // ? MCFG_CPU_PROGRAM_MAP(flagrall_map) @@ -393,7 +395,7 @@ static MACHINE_CONFIG_START( flagrall ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( k3, flagrall ) +MACHINE_CONFIG_DERIVED(k3_state::k3, flagrall) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(k3_map) diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp index 6e6fab65cba..4a7298ed0a7 100644 --- a/src/mame/drivers/20pacgal.cpp +++ b/src/mame/drivers/20pacgal.cpp @@ -389,7 +389,7 @@ INTERRUPT_GEN_MEMBER(_20pacgal_state::vblank_irq) device.execute().set_input_line(0, HOLD_LINE); // TODO: assert breaks the inputs in 25pacman test mode } -static MACHINE_CONFIG_START( 20pacgal ) +MACHINE_CONFIG_START(_20pacgal_state::_20pacgal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, MAIN_CPU_CLOCK) @@ -402,7 +402,7 @@ static MACHINE_CONFIG_START( 20pacgal ) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_FRAGMENT_ADD(20pacgal_video) + MCFG_FRAGMENT_ADD(_20pacgal_video) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -417,7 +417,7 @@ static MACHINE_CONFIG_START( 20pacgal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( 25pacman, 20pacgal ) +MACHINE_CONFIG_DERIVED(_25pacman_state::_25pacman, _20pacgal) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -534,12 +534,12 @@ DRIVER_INIT_MEMBER(_20pacgal_state,25pacman) * *************************************/ -GAME( 2006, 25pacman, 0, 25pacman, 25pacman, _25pacman_state, 25pacman, ROT90, "Namco / Cosmodog", "Pac-Man - 25th Anniversary Edition (Rev 3.00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) -GAME( 2005, 25pacmano, 25pacman, 20pacgal, 25pacmano, _20pacgal_state, 25pacman, ROT90, "Namco / Cosmodog", "Pac-Man - 25th Anniversary Edition (Rev 2.00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) +GAME( 2006, 25pacman, 0, _25pacman, 25pacman, _25pacman_state, 25pacman, ROT90, "Namco / Cosmodog", "Pac-Man - 25th Anniversary Edition (Rev 3.00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) +GAME( 2005, 25pacmano, 25pacman, _20pacgal, 25pacmano, _20pacgal_state, 25pacman, ROT90, "Namco / Cosmodog", "Pac-Man - 25th Anniversary Edition (Rev 2.00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) -GAME( 2000, 20pacgal, 0, 20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.08)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) -GAME( 2000, 20pacgalr4, 20pacgal, 20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.04)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) -GAME( 2000, 20pacgalr3, 20pacgal, 20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.03)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) -GAME( 2000, 20pacgalr2, 20pacgal, 20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.02)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) -GAME( 2000, 20pacgalr1, 20pacgal, 20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.01)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) -GAME( 2000, 20pacgalr0, 20pacgal, 20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) +GAME( 2000, 20pacgal, 0, _20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.08)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) +GAME( 2000, 20pacgalr4, 20pacgal, _20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.04)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) +GAME( 2000, 20pacgalr3, 20pacgal, _20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.03)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) +GAME( 2000, 20pacgalr2, 20pacgal, _20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.02)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) +GAME( 2000, 20pacgalr1, 20pacgal, _20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.01)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) +GAME( 2000, 20pacgalr0, 20pacgal, _20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) diff --git a/src/mame/drivers/24cdjuke.cpp b/src/mame/drivers/24cdjuke.cpp index 2d06f447b89..b326b4f499d 100644 --- a/src/mame/drivers/24cdjuke.cpp +++ b/src/mame/drivers/24cdjuke.cpp @@ -86,6 +86,7 @@ public: DECLARE_READ8_MEMBER(unknown_r) { return machine().rand(); } + void midcoin24cdjuke(machine_config &config); private: uint8_t m_kb_col; }; @@ -273,7 +274,7 @@ void midcoin24cdjuke_state::machine_reset() } -static MACHINE_CONFIG_START( midcoin24cdjuke ) +MACHINE_CONFIG_START(midcoin24cdjuke_state::midcoin24cdjuke) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(midcoin24cdjuke_map) diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp index 5ab66fda70f..a779f0b92dd 100644 --- a/src/mame/drivers/2mindril.cpp +++ b/src/mame/drivers/2mindril.cpp @@ -70,6 +70,8 @@ public: //INTERRUPT_GEN_MEMBER(drill_device_irq); void tile_decode(); DECLARE_WRITE_LINE_MEMBER(irqhandler); + + void drill(machine_config &config); #ifdef UNUSED_FUNCTION enum { @@ -348,7 +350,7 @@ MACHINE_RESET_MEMBER(_2mindril_state,drill) m_irq_reg = 0; } -static MACHINE_CONFIG_START( drill ) +MACHINE_CONFIG_START(_2mindril_state::drill) MCFG_CPU_ADD("maincpu", M68000, 16000000 ) MCFG_CPU_PROGRAM_MAP(drill_map) diff --git a/src/mame/drivers/30test.cpp b/src/mame/drivers/30test.cpp index a54d5af72d6..c7bfc309529 100644 --- a/src/mame/drivers/30test.cpp +++ b/src/mame/drivers/30test.cpp @@ -74,6 +74,7 @@ public: virtual void machine_reset() override; required_device m_maincpu; required_device m_oki; + void _30test(machine_config &config); }; @@ -237,7 +238,7 @@ void namco_30test_state::machine_reset() } -static MACHINE_CONFIG_START( 30test ) +MACHINE_CONFIG_START(namco_30test_state::_30test) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC68HC11,MAIN_CLOCK/4) @@ -269,4 +270,4 @@ ROM_START( 30test ) ROM_LOAD( "tt1-voi0.7p", 0x0000, 0x80000, CRC(b4fc5921) SHA1(92a88d5adb50dae48715847f12e88a35e37ef78c) ) ROM_END -GAMEL( 1997, 30test, 0, 30test, 30test, namco_30test_state, 0, ROT0, "Namco", "30 Test (Remake)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK, layout_30test ) +GAMEL( 1997, 30test, 0, _30test, 30test, namco_30test_state, 0, ROT0, "Namco", "30 Test (Remake)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK, layout_30test ) diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp index e0454b24515..1d0a56c2d4c 100644 --- a/src/mame/drivers/39in1.cpp +++ b/src/mame/drivers/39in1.cpp @@ -98,6 +98,8 @@ public: void pxa255_start(); required_device m_maincpu; required_device m_palette; + void _60in1(machine_config &config); + void _39in1(machine_config &config); }; @@ -1572,7 +1574,7 @@ MACHINE_START_MEMBER(_39in1_state,60in1) pxa255_start(); } -static MACHINE_CONFIG_START( 39in1 ) +MACHINE_CONFIG_START(_39in1_state::_39in1) MCFG_CPU_ADD("maincpu", PXA255, 200000000) MCFG_CPU_PROGRAM_MAP(39in1_map) @@ -1597,7 +1599,7 @@ static MACHINE_CONFIG_START( 39in1 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( 60in1, 39in1 ) +MACHINE_CONFIG_DERIVED(_39in1_state::_60in1, _39in1) MCFG_MACHINE_START_OVERRIDE(_39in1_state,60in1) MACHINE_CONFIG_END @@ -1718,11 +1720,11 @@ ROM_START( 19in1 ) ROM_LOAD16_WORD_SWAP( "19in1_eeprom.bin", 0x000, 0x200, NO_DUMP ) ROM_END -GAME(2004, 4in1a, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "4 in 1 MAME bootleg (set 1, ver 3.00)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) -GAME(2004, 4in1b, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "4 in 1 MAME bootleg (set 2)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) -GAME(2004, 19in1, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "19 in 1 MAME bootleg", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) -GAME(2004, 39in1, 0, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "39 in 1 MAME bootleg", MACHINE_IMPERFECT_SOUND) -GAME(2004, 48in1, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "48 in 1 MAME bootleg (set 1, ver 3.09)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) -GAME(2004, 48in1b, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "48 in 1 MAME bootleg (set 2, ver 3.09, alt flash)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) -GAME(2004, 48in1a, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "48 in 1 MAME bootleg (set 3, ver 3.02)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) -GAME(2004, 60in1, 39in1, 60in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "60 in 1 MAME bootleg (ver 3.00)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) +GAME(2004, 4in1a, 39in1, _39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "4 in 1 MAME bootleg (set 1, ver 3.00)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) +GAME(2004, 4in1b, 39in1, _39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "4 in 1 MAME bootleg (set 2)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) +GAME(2004, 19in1, 39in1, _39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "19 in 1 MAME bootleg", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) +GAME(2004, 39in1, 0, _39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "39 in 1 MAME bootleg", MACHINE_IMPERFECT_SOUND) +GAME(2004, 48in1, 39in1, _39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "48 in 1 MAME bootleg (set 1, ver 3.09)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) +GAME(2004, 48in1b, 39in1, _39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "48 in 1 MAME bootleg (set 2, ver 3.09, alt flash)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) +GAME(2004, 48in1a, 39in1, _39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "48 in 1 MAME bootleg (set 3, ver 3.02)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) +GAME(2004, 60in1, 39in1, _60in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "60 in 1 MAME bootleg (ver 3.00)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND) diff --git a/src/mame/drivers/3do.cpp b/src/mame/drivers/3do.cpp index 0aba64cf887..c3fd5175044 100644 --- a/src/mame/drivers/3do.cpp +++ b/src/mame/drivers/3do.cpp @@ -154,7 +154,7 @@ void _3do_state::machine_reset() m_clio.cstatbits = 0x01; /* bit 0 = reset of clio caused by power on */ } -static MACHINE_CONFIG_START( 3do ) +MACHINE_CONFIG_START(_3do_state::_3do) /* Basic machine hardware */ MCFG_CPU_ADD( "maincpu", ARM7_BE, XTAL_50MHz/4 ) @@ -174,7 +174,7 @@ static MACHINE_CONFIG_START( 3do ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( 3do_pal ) +MACHINE_CONFIG_START(_3do_state::_3do_pal) /* Basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM7_BE, XTAL_50MHz/4 ) @@ -249,8 +249,8 @@ ROM_END ***************************************************************************/ /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ -CONS( 1991, 3do, 0, 0, 3do, 3do, _3do_state, 0, "The 3DO Company", "3DO (NTSC)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -CONS( 1991, 3do_pal, 3do, 0, 3do_pal, 3do, _3do_state, 0, "The 3DO Company", "3DO (PAL)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) +CONS( 1991, 3do, 0, 0, _3do, 3do, _3do_state, 0, "The 3DO Company", "3DO (NTSC)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) +CONS( 1991, 3do_pal, 3do, 0, _3do_pal, 3do, _3do_state, 0, "The 3DO Company", "3DO (PAL)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -GAME( 1991, 3dobios, 0, 3do, 3do, _3do_state, 0, ROT0, "The 3DO Company", "3DO Bios", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_BIOS_ROOT ) -GAME( 199?, orbatak, 3dobios,3do, 3do, _3do_state, 0, ROT0, "", "Orbatak (prototype)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) +GAME( 1991, 3dobios, 0, _3do, 3do, _3do_state, 0, ROT0, "The 3DO Company", "3DO Bios", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_BIOS_ROOT ) +GAME( 199?, orbatak, 3dobios,_3do, 3do, _3do_state, 0, ROT0, "", "Orbatak (prototype)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp index 7b9cb8ab12f..19a23e02099 100644 --- a/src/mame/drivers/3x3puzzl.cpp +++ b/src/mame/drivers/3x3puzzl.cpp @@ -96,6 +96,7 @@ public: DECLARE_WRITE16_MEMBER(tilemap1_scrollx_w); DECLARE_WRITE16_MEMBER(tilemap1_scrolly_w); + void _3x3puzzle(machine_config &config); protected: virtual void video_start() override; virtual void machine_start() override; @@ -382,7 +383,7 @@ void _3x3puzzle_state::machine_reset() } -static MACHINE_CONFIG_START( _3x3puzzle ) +MACHINE_CONFIG_START(_3x3puzzle_state::_3x3puzzle) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,MAIN_CLOCK) diff --git a/src/mame/drivers/4004clk.cpp b/src/mame/drivers/4004clk.cpp index c363e32bfa3..90e6cb1202c 100644 --- a/src/mame/drivers/4004clk.cpp +++ b/src/mame/drivers/4004clk.cpp @@ -26,6 +26,7 @@ public: DECLARE_WRITE8_MEMBER( nixie_w ); DECLARE_WRITE8_MEMBER( neon_w ); + void _4004clk(machine_config &config); protected: virtual void machine_start() override; @@ -123,7 +124,7 @@ void nixieclock_state::machine_start() save_pointer(NAME(m_nixie), 6); } -static MACHINE_CONFIG_START( 4004clk ) +MACHINE_CONFIG_START(nixieclock_state::_4004clk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I4004, XTAL_5MHz / 8) @@ -170,4 +171,4 @@ ROM_END /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS -SYST( 2008, 4004clk, 0, 0, 4004clk, 4004clk, nixieclock_state, 0, "John L. Weinrich", "4004 Nixie Clock", MACHINE_SUPPORTS_SAVE ) +SYST( 2008, 4004clk, 0, 0, _4004clk, 4004clk, nixieclock_state, 0, "John L. Weinrich", "4004 Nixie Clock", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/40love.cpp b/src/mame/drivers/40love.cpp index a510e961cec..c1b3d037a2e 100644 --- a/src/mame/drivers/40love.cpp +++ b/src/mame/drivers/40love.cpp @@ -752,7 +752,7 @@ MACHINE_RESET_MEMBER(fortyl_state,40love) MACHINE_RESET_CALL_MEMBER(common); } -static MACHINE_CONFIG_START( 40love ) +MACHINE_CONFIG_START(fortyl_state::_40love) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,8000000/2) /* OK */ @@ -811,7 +811,7 @@ static MACHINE_CONFIG_START( 40love ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( undoukai ) +MACHINE_CONFIG_START(fortyl_state::undoukai) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,8000000/2) @@ -1022,7 +1022,7 @@ ROM_START( undoukai ) ROM_LOAD( "a17-18.23v", 0x0c00, 0x0400, CRC(3023a1da) SHA1(08ce4c6e99d04b358d66f0588852311d07183619) ) /* ??? */ ROM_END -GAME( 1984, 40love, 0, 40love, 40love, fortyl_state, 40love, ROT0, "Taito Corporation", "Forty-Love (World)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1984, 40lovej, 40love, 40love, 40love, fortyl_state, 40love, ROT0, "Taito Corporation", "Forty-Love (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS ) // several ROMs needs double checking +GAME( 1984, 40love, 0, _40love, 40love, fortyl_state, 40love, ROT0, "Taito Corporation", "Forty-Love (World)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1984, 40lovej, 40love, _40love, 40love, fortyl_state, 40love, ROT0, "Taito Corporation", "Forty-Love (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS ) // several ROMs needs double checking GAME( 1984, fieldday, 0, undoukai, undoukai, fortyl_state, undoukai, ROT0, "Taito Corporation", "Field Day", MACHINE_SUPPORTS_SAVE ) GAME( 1984, undoukai, fieldday, undoukai, undoukai, fortyl_state, undoukai, ROT0, "Taito Corporation", "The Undoukai (Japan)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/4dpi.cpp b/src/mame/drivers/4dpi.cpp index 47603c27db2..6bdc064df0a 100644 --- a/src/mame/drivers/4dpi.cpp +++ b/src/mame/drivers/4dpi.cpp @@ -49,6 +49,7 @@ public: INTERRUPT_GEN_MEMBER(sgi_ip6_vbl); inline void ATTR_PRINTF(3,4) verboselog( int n_level, const char *s_fmt, ... ); required_device m_maincpu; + void sgi_ip6(machine_config &config); }; @@ -227,7 +228,7 @@ ADDRESS_MAP_END MACHINE DRIVERS ***************************************************************************/ -static MACHINE_CONFIG_START( sgi_ip6 ) +MACHINE_CONFIG_START(sgi_ip6_state::sgi_ip6) MCFG_CPU_ADD( "maincpu", R3041, 20000000 ) // FIXME: Should be R2000 MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG) MCFG_CPU_PROGRAM_MAP( sgi_ip6_map ) diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp index 93adb57bde7..011e0d07682 100644 --- a/src/mame/drivers/4enlinea.cpp +++ b/src/mame/drivers/4enlinea.cpp @@ -233,6 +233,7 @@ public: virtual void machine_reset() override; required_device m_maincpu; + void _4enlinea(machine_config &config); }; @@ -489,7 +490,7 @@ INTERRUPT_GEN_MEMBER(_4enlinea_state::_4enlinea_audio_irq) device.execute().set_input_line(0, HOLD_LINE); } -static MACHINE_CONFIG_START( 4enlinea ) +MACHINE_CONFIG_START(_4enlinea_state::_4enlinea) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, PRG_CPU_CLOCK) @@ -549,5 +550,5 @@ ROM_END * Game Drivers * ***********************************/ -/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */ -GAME( 1991, 4enlinea, 0, 4enlinea, 4enlinea, _4enlinea_state, 0, ROT0, "Compumatic", "Cuatro en Linea", MACHINE_NOT_WORKING ) +/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */ +GAME( 1991, 4enlinea, 0, _4enlinea, 4enlinea, _4enlinea_state, 0, ROT0, "Compumatic", "Cuatro en Linea", MACHINE_NOT_WORKING ) diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp index 8d6d41a0143..55751ff44e8 100644 --- a/src/mame/drivers/4enraya.cpp +++ b/src/mame/drivers/4enraya.cpp @@ -466,7 +466,7 @@ void _4enraya_state::machine_reset() * Machine Drivers * ***********************************/ -static MACHINE_CONFIG_START( 4enraya ) +MACHINE_CONFIG_START(_4enraya_state::_4enraya ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/2) @@ -494,7 +494,7 @@ static MACHINE_CONFIG_START( 4enraya ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( unkpacg, 4enraya ) +MACHINE_CONFIG_DERIVED(_4enraya_state::unkpacg, _4enraya) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -645,8 +645,8 @@ DRIVER_INIT_MEMBER(_4enraya_state, unkpacg) ***********************************/ /* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */ -GAME( 1990, 4enraya, 0, 4enraya, 4enraya, _4enraya_state, 0, ROT0, "IDSA", "4 En Raya (set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1990, 4enrayaa, 4enraya, 4enraya, 4enraya, _4enraya_state, 0, ROT0, "IDSA", "4 En Raya (set 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1990, 4enraya, 0, _4enraya, 4enraya, _4enraya_state, 0, ROT0, "IDSA", "4 En Raya (set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1990, 4enrayaa, 4enraya, _4enraya, 4enraya, _4enraya_state, 0, ROT0, "IDSA", "4 En Raya (set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 199?, unkpacg, 0, unkpacg, unkpacg, _4enraya_state, unkpacg, ROT0, "", "unknown 'Pac-Man' gambling game", MACHINE_SUPPORTS_SAVE ) GAME( 199?, unksig, 0, unkpacg, unkfr, _4enraya_state, unkpacg, ROT0, "", "unknown 'Space Invaders' gambling game (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 199?, unksiga, unksig, unkpacg, unkfr, _4enraya_state, unkpacg, ROT0, "", "unknown 'Space Invaders' gambling game (set 2)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp index e3e611cccb0..0faefbd4d2d 100644 --- a/src/mame/drivers/4roses.cpp +++ b/src/mame/drivers/4roses.cpp @@ -193,6 +193,7 @@ public: : funworld_state(mconfig, type, tag) { } DECLARE_DRIVER_INIT(4roses); + void _4roses(machine_config &config); }; @@ -353,7 +354,7 @@ GFXDECODE_END * Machine Drivers * **************************/ -static MACHINE_CONFIG_START( 4roses ) +MACHINE_CONFIG_START(_4roses_state::_4roses) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz, guess */ MCFG_CPU_PROGRAM_MAP(4roses_map) @@ -466,6 +467,6 @@ DRIVER_INIT_MEMBER(_4roses_state,4roses) *************************/ /* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */ -GAME( 1999, 4roses, 0, 4roses, 4roses, _4roses_state, 4roses, ROT0, "", "Four Roses (encrypted, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) -GAME( 1999, 4rosesa, 4roses, 4roses, 4roses, _4roses_state, 4roses, ROT0, "", "Four Roses (encrypted, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) -GAME( 1999, rugby, 0, 4roses, 4roses, _4roses_state, 4roses, ROT0, "C.M.C.", "Rugby? (four roses hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) +GAME( 1999, 4roses, 0, _4roses, 4roses, _4roses_state, 4roses, ROT0, "", "Four Roses (encrypted, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) +GAME( 1999, 4rosesa, 4roses, _4roses, 4roses, _4roses_state, 4roses, ROT0, "", "Four Roses (encrypted, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) +GAME( 1999, rugby, 0, _4roses, 4roses, _4roses_state, 4roses, ROT0, "C.M.C.", "Rugby? (four roses hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp index 2b00a245855..0c9dbb8f000 100644 --- a/src/mame/drivers/5clown.cpp +++ b/src/mame/drivers/5clown.cpp @@ -506,6 +506,7 @@ public: virtual void video_start() override; DECLARE_PALETTE_INIT(_5clown); uint32_t screen_update_fclown(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void fclown(machine_config &config); }; void _5clown_state::machine_start() @@ -1014,7 +1015,7 @@ GFXDECODE_END * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( fclown ) +MACHINE_CONFIG_START(_5clown_state::fclown) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */ diff --git a/src/mame/drivers/68ksbc.cpp b/src/mame/drivers/68ksbc.cpp index 4e6fcc23221..46aac1ed08c 100644 --- a/src/mame/drivers/68ksbc.cpp +++ b/src/mame/drivers/68ksbc.cpp @@ -41,6 +41,7 @@ public: , m_maincpu(*this, "maincpu") { } + void c68ksbc(machine_config &config); private: required_device m_maincpu; }; @@ -58,7 +59,7 @@ static INPUT_PORTS_START( c68ksbc ) INPUT_PORTS_END -static MACHINE_CONFIG_START( c68ksbc ) +MACHINE_CONFIG_START(c68ksbc_state::c68ksbc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) // text says 8MHz, schematic says 10MHz MCFG_CPU_PROGRAM_MAP(c68ksbc_mem) diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp index 7f6164617f6..e678c0e1cbe 100644 --- a/src/mame/drivers/8080bw.cpp +++ b/src/mame/drivers/8080bw.cpp @@ -408,7 +408,7 @@ INPUT_PORTS_END /* same as regular invaders, but with a color board added */ -static MACHINE_CONFIG_DERIVED( invadpt2, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::invadpt2, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -451,7 +451,7 @@ static ADDRESS_MAP_START( spacerng_io_map, AS_IO, 8, _8080bw_state ) AM_RANGE(0x06, 0x06) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( spacerng, invadpt2 ) +MACHINE_CONFIG_DERIVED(_8080bw_state::spacerng, invadpt2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -492,7 +492,7 @@ static INPUT_PORTS_START( spcewars ) PORT_DIPSETTING( 0x08, "2000" ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( spcewars, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::spcewars, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -534,7 +534,7 @@ static ADDRESS_MAP_START( spcewarla_io_map, AS_IO, 8, _8080bw_state ) AM_RANGE(0x0c, 0x0c) AM_DEVWRITE("mb14241", mb14241_device, shift_data_w) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED(spcewarla, spcewars) +MACHINE_CONFIG_DERIVED(_8080bw_state::spcewarla, spcewars) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(spcewarla_io_map) @@ -600,7 +600,7 @@ static INPUT_PORTS_START( astropal ) PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( astropal, invaders ) +MACHINE_CONFIG_DERIVED(_8080bw_state::astropal, invaders) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -651,7 +651,7 @@ static INPUT_PORTS_START( cosmo ) PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SW1:8" ) /* must be HIGH normally or the joystick won't work */ INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( cosmo, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::cosmo, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -808,7 +808,7 @@ static ADDRESS_MAP_START( spacecom_io_map, AS_IO, 8, _8080bw_state ) AM_RANGE(0x44, 0x44) AM_READ_PORT("IN2") AM_WRITE(invaders_audio_2_w) ADDRESS_MAP_END -MACHINE_CONFIG_START( spacecom ) +MACHINE_CONFIG_START(_8080bw_state::spacecom) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080A, XTAL_18MHz / 10) // divider guessed @@ -920,7 +920,7 @@ static INPUT_PORTS_START( invrvnge ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( invrvnge, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::invrvnge, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1058,7 +1058,7 @@ static ADDRESS_MAP_START( starw1_io_map, AS_IO, 8, _8080bw_state ) AM_RANGE(0x07, 0x07) AM_WRITENOP /* writes 89 at boot */ ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( starw1, invadpt2 ) +MACHINE_CONFIG_DERIVED(_8080bw_state::starw1, invadpt2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(starw1_io_map) MACHINE_CONFIG_END @@ -1097,7 +1097,7 @@ static INPUT_PORTS_START( lrescue ) PORT_DIPUNUSED_DIPLOC( 0x80, 0x00, "SW1:8" ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( lrescue, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::lrescue, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1126,7 +1126,7 @@ static MACHINE_CONFIG_DERIVED( lrescue, mw8080bw_root ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_START( escmars ) +MACHINE_CONFIG_START(_8080bw_state::escmars) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_18MHz / 10) // divider guessed @@ -1224,7 +1224,7 @@ static ADDRESS_MAP_START( cosmicmo_io_map, AS_IO, 8, _8080bw_state ) AM_RANGE(0x06, 0x06) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( cosmicmo, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::cosmicmo, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1374,7 +1374,7 @@ MACHINE_START_MEMBER(_8080bw_state,rollingc) MACHINE_START_CALL_MEMBER(mw8080bw); } -static MACHINE_CONFIG_DERIVED( rollingc, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::rollingc, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1514,7 +1514,7 @@ MACHINE_RESET_MEMBER(_8080bw_state,schaser) MACHINE_RESET_CALL_MEMBER(mw8080bw); } -static MACHINE_CONFIG_DERIVED( schaser, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::schaser, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */ @@ -1637,7 +1637,7 @@ MACHINE_START_MEMBER(_8080bw_state,schasercv) MACHINE_START_CALL_MEMBER(mw8080bw); } -static MACHINE_CONFIG_DERIVED( schasercv, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::schasercv, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1728,7 +1728,7 @@ MACHINE_START_MEMBER(_8080bw_state,sflush) MACHINE_START_CALL_MEMBER(mw8080bw); } -static MACHINE_CONFIG_DERIVED( sflush, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::sflush, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu",M6800,1500000) // ? @@ -1831,7 +1831,7 @@ static INPUT_PORTS_START( lupin3a ) PORT_DIPSETTING( 0x10, DEF_STR( Japanese ) ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( lupin3, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::lupin3, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1877,7 +1877,7 @@ static MACHINE_CONFIG_DERIVED( lupin3, mw8080bw_root ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lupin3a, lupin3 ) +MACHINE_CONFIG_DERIVED(_8080bw_state::lupin3a, lupin3) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(schaser_map) MCFG_MACHINE_START_OVERRIDE(_8080bw_state,sflush) @@ -1995,7 +1995,7 @@ static INPUT_PORTS_START( polaris ) PORT_ADJUSTER( 90, "Sub Volume VR3" ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( polaris, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::polaris, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */ @@ -2127,7 +2127,7 @@ static INPUT_PORTS_START( ballbomb ) PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x00, "SW1:8" ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( ballbomb, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::ballbomb, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2207,7 +2207,7 @@ static INPUT_PORTS_START( yosakdon ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( yosakdon, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::yosakdon, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2370,7 +2370,7 @@ static ADDRESS_MAP_START( indianbtbr_io_map, AS_IO, 8, _8080bw_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( indianbt, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::indianbt, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2395,7 +2395,7 @@ static MACHINE_CONFIG_DERIVED( indianbt, mw8080bw_root ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( indianbtbr, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::indianbtbr, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2470,7 +2470,7 @@ static INPUT_PORTS_START( steelwkr ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( steelwkr, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::steelwkr, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2642,7 +2642,7 @@ static ADDRESS_MAP_START( shuttlei_io_map, AS_IO, 8, _8080bw_state ) ADDRESS_MAP_END -MACHINE_CONFIG_START( shuttlei ) +MACHINE_CONFIG_START(_8080bw_state::shuttlei) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_18MHz / 10) // divider guessed @@ -2766,7 +2766,7 @@ static INPUT_PORTS_START( darthvdr ) INVADERS_CAB_TYPE_PORT INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( darthvdr, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::darthvdr, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2839,7 +2839,7 @@ static INPUT_PORTS_START( vortex ) PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) ) INPUT_PORTS_END -MACHINE_CONFIG_DERIVED( vortex, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::vortex, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3147,7 +3147,7 @@ MACHINE_START_MEMBER(_8080bw_state, claybust) MACHINE_START_CALL_MEMBER(mw8080bw); } -MACHINE_CONFIG_DERIVED( claybust, invaders ) +MACHINE_CONFIG_DERIVED(_8080bw_state::claybust, invaders) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3262,7 +3262,7 @@ static INPUT_PORTS_START( attackfc ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( attackfc, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(_8080bw_state::attackfc, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3400,7 +3400,7 @@ WRITE8_MEMBER(_8080bw_state::invmulti_bank_w) membank("bank2")->set_entry(bank); } -MACHINE_CONFIG_DERIVED( invmulti, invaders ) +MACHINE_CONFIG_DERIVED(_8080bw_state::invmulti, invaders) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp index 870915b813d..0fe957bbfa1 100644 --- a/src/mame/drivers/88games.cpp +++ b/src/mame/drivers/88games.cpp @@ -302,7 +302,7 @@ void _88games_state::machine_reset() m_k88games_priority = 0; } -static MACHINE_CONFIG_START( 88games ) +MACHINE_CONFIG_START(_88games_state::_88games) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */ @@ -536,6 +536,6 @@ ROM_END * *************************************/ -GAME( 1988, 88games, 0, 88games, 88games, _88games_state, 0, ROT0, "Konami", "'88 Games", MACHINE_SUPPORTS_SAVE ) -GAME( 1988, konami88, 88games, 88games, 88games, _88games_state, 0, ROT0, "Konami", "Konami '88", MACHINE_SUPPORTS_SAVE ) -GAME( 1988, hypsptsp, 88games, 88games, 88games, _88games_state, 0, ROT0, "Konami", "Hyper Sports Special (Japan)", MACHINE_SUPPORTS_SAVE ) +GAME( 1988, 88games, 0, _88games, 88games, _88games_state, 0, ROT0, "Konami", "'88 Games", MACHINE_SUPPORTS_SAVE ) +GAME( 1988, konami88, 88games, _88games, 88games, _88games_state, 0, ROT0, "Konami", "Konami '88", MACHINE_SUPPORTS_SAVE ) +GAME( 1988, hypsptsp, 88games, _88games, 88games, _88games_state, 0, ROT0, "Konami", "Hyper Sports Special (Japan)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/a1supply.cpp b/src/mame/drivers/a1supply.cpp index 145348a9701..ff307ff4a52 100644 --- a/src/mame/drivers/a1supply.cpp +++ b/src/mame/drivers/a1supply.cpp @@ -49,6 +49,7 @@ public: required_device m_maincpu; required_device m_video; + void a1supply(machine_config &config); protected: // driver_device overrides @@ -89,7 +90,7 @@ void a1supply_state::video_start() { } -static MACHINE_CONFIG_START( a1supply ) +MACHINE_CONFIG_START(a1supply_state::a1supply) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp index e3433338a3d..30ccf699b01 100644 --- a/src/mame/drivers/a2600.cpp +++ b/src/mame/drivers/a2600.cpp @@ -80,6 +80,9 @@ public: DECLARE_READ8_MEMBER(cart_over_all_r); DECLARE_WRITE8_MEMBER(cart_over_all_w); + void a2600p(machine_config &config); + void a2600(machine_config &config); + void a2600_cartslot(machine_config &config); protected: required_device m_joy1; required_device m_joy2; @@ -562,7 +565,7 @@ static SLOT_INTERFACE_START(a2600_cart) SLOT_INTERFACE_INTERNAL("a26_harmony", A26_ROM_HARMONY) SLOT_INTERFACE_END -static MACHINE_CONFIG_START(a2600_cartslot) +MACHINE_CONFIG_START(a2600_state::a2600_cartslot) MCFG_VCS_CARTRIDGE_ADD("cartslot", a2600_cart, nullptr) /* software lists */ @@ -570,7 +573,7 @@ static MACHINE_CONFIG_START(a2600_cartslot) MCFG_SOFTWARE_LIST_ADD("cass_list","a2600_cass") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( a2600 ) +MACHINE_CONFIG_START(a2600_state::a2600) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6507, MASTER_CLOCK_NTSC / 3) MCFG_M6502_DISABLE_DIRECT() @@ -619,7 +622,7 @@ static MACHINE_CONFIG_START( a2600 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( a2600p ) +MACHINE_CONFIG_START(a2600_state::a2600p) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6507, MASTER_CLOCK_PAL / 3) MCFG_CPU_PROGRAM_MAP(a2600_mem) diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp index 66b8b2a8e8e..7815573cd83 100644 --- a/src/mame/drivers/a5105.cpp +++ b/src/mame/drivers/a5105.cpp @@ -71,6 +71,7 @@ public: UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); + void a5105(machine_config &config); private: uint8_t *m_ram_base; uint8_t *m_rom_base; @@ -556,7 +557,7 @@ static const z80_daisy_config a5105_daisy_chain[] = { nullptr } }; -static MACHINE_CONFIG_START( a5105 ) +MACHINE_CONFIG_START(a5105_state::a5105) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_15MHz / 4) MCFG_CPU_PROGRAM_MAP(a5105_mem) diff --git a/src/mame/drivers/a51xx.cpp b/src/mame/drivers/a51xx.cpp index b38b668591f..4719976a8fd 100644 --- a/src/mame/drivers/a51xx.cpp +++ b/src/mame/drivers/a51xx.cpp @@ -31,6 +31,8 @@ public: uint32_t screen_update_a5120(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_a5130(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void a5130(machine_config &config); + void a5120(machine_config &config); }; @@ -112,7 +114,7 @@ static GFXDECODE_START( a51xx ) GFXDECODE_ENTRY( "chargen", 0x0000, a51xx_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( a5120 ) +MACHINE_CONFIG_START(a51xx_state::a5120) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(a5120_mem) @@ -134,7 +136,7 @@ static MACHINE_CONFIG_START( a5120 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a5130, a5120 ) +MACHINE_CONFIG_DERIVED(a51xx_state::a5130, a5120) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(a5130_mem) diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp index 3e67a43aad6..3538f30f91e 100644 --- a/src/mame/drivers/a6809.cpp +++ b/src/mame/drivers/a6809.cpp @@ -85,6 +85,7 @@ public: required_shared_ptr m_p_videoram; uint16_t m_start_address; uint16_t m_cursor_address; + void a6809(machine_config &config); private: uint8_t m_cass_data[4]; bool m_cass_state; @@ -220,7 +221,7 @@ void a6809_state::kbd_put(u8 data) m_via->write_cb1(0); } -static MACHINE_CONFIG_START( a6809 ) +MACHINE_CONFIG_START(a6809_state::a6809) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(a6809_mem) diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp index 4c7440c7e84..1b028b220f8 100644 --- a/src/mame/drivers/a7150.cpp +++ b/src/mame/drivers/a7150.cpp @@ -94,6 +94,7 @@ public: required_shared_ptr m_video_ram; required_device m_video_bankdev; required_device m_palette; + void a7150(machine_config &config); }; @@ -423,7 +424,7 @@ static const z80_daisy_config k7070_daisy_chain[] = * * (framebuffer and terminal should be slot devices.) */ -static MACHINE_CONFIG_START( a7150 ) +MACHINE_CONFIG_START(a7150_state::a7150) MCFG_CPU_ADD("maincpu", I8086, XTAL_9_832MHz/2) MCFG_CPU_PROGRAM_MAP(a7150_mem) MCFG_CPU_IO_MAP(a7150_io) diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp index ac503e72cc2..893b3fbd35f 100644 --- a/src/mame/drivers/a7800.cpp +++ b/src/mame/drivers/a7800.cpp @@ -152,6 +152,8 @@ public: DECLARE_READ8_MEMBER(riot_console_button_r); DECLARE_WRITE8_MEMBER(riot_button_pullup_w); + void a7800_ntsc(machine_config &config); + void a7800_pal(machine_config &config); protected: required_device m_maincpu; required_device m_tia; @@ -1352,7 +1354,7 @@ void a7800_state::machine_reset() m_bios_enabled = 0; } -static MACHINE_CONFIG_START( a7800_ntsc ) +MACHINE_CONFIG_START(a7800_state::a7800_ntsc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, A7800_NTSC_Y1/8) /* 1.79 MHz (switches to 1.19 MHz on TIA or RIOT access) */ MCFG_CPU_PROGRAM_MAP(a7800_mem) @@ -1389,7 +1391,7 @@ static MACHINE_CONFIG_START( a7800_ntsc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a7800_pal, a7800_ntsc ) +MACHINE_CONFIG_DERIVED(a7800_state::a7800_pal, a7800_ntsc) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(CLK_PAL) diff --git a/src/mame/drivers/aa310.cpp b/src/mame/drivers/aa310.cpp index a4386b1035e..7ab0ef2f9c5 100644 --- a/src/mame/drivers/aa310.cpp +++ b/src/mame/drivers/aa310.cpp @@ -121,6 +121,20 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); + void aa5000a(machine_config &config); + void aa305(machine_config &config); + void aa310(machine_config &config); + void aa3000(machine_config &config); + void aa5000(machine_config &config); + void aa4101(machine_config &config); + void aa3020(machine_config &config); + void aa4401(machine_config &config); + void aa3010(machine_config &config); + void aa4(machine_config &config); + void aa4000(machine_config &config); + void aa540(machine_config &config); + void aa440(machine_config &config); + void aa4201(machine_config &config); protected: required_device m_ram; }; @@ -383,7 +397,7 @@ WRITE_LINE_MEMBER( archimedes_state::a310_kart_rx_w ) archimedes_clear_irq_b(ARCHIMEDES_IRQB_KBD_XMIT_EMPTY); } -static MACHINE_CONFIG_START( aa310 ) +MACHINE_CONFIG_START(aa310_state::aa310) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM, XTAL_24MHz / 3) /* ARM2 8 MHz */ MCFG_CPU_PROGRAM_MAP(aa310_mem) @@ -439,13 +453,13 @@ static MACHINE_CONFIG_START( aa310 ) /* Expansion slots - 2-card backplane */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aa305, aa310 ) +MACHINE_CONFIG_DERIVED(aa310_state::aa305, aa310) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("512K") MCFG_RAM_EXTRA_OPTIONS("1M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aa440, aa310 ) +MACHINE_CONFIG_DERIVED(aa310_state::aa440, aa310) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("4M") @@ -454,13 +468,13 @@ static MACHINE_CONFIG_DERIVED( aa440, aa310 ) /* Expansion slots - 4-card backplane */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aa3000, aa310 ) +MACHINE_CONFIG_DERIVED(aa310_state::aa3000, aa310) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1M") MCFG_RAM_EXTRA_OPTIONS("2M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aa4101, aa310 ) +MACHINE_CONFIG_DERIVED(aa310_state::aa4101, aa310) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1M") MCFG_RAM_EXTRA_OPTIONS("2M,4M") @@ -468,7 +482,7 @@ static MACHINE_CONFIG_DERIVED( aa4101, aa310 ) /* Expansion slots - 4-card backplane */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aa4201, aa310 ) +MACHINE_CONFIG_DERIVED(aa310_state::aa4201, aa310) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("2M") MCFG_RAM_EXTRA_OPTIONS("4M") @@ -478,7 +492,7 @@ static MACHINE_CONFIG_DERIVED( aa4201, aa310 ) /* Expansion slots - 4-card backplane */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aa4401, aa310 ) +MACHINE_CONFIG_DERIVED(aa310_state::aa4401, aa310) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("4M") MCFG_RAM_EXTRA_OPTIONS("8M") @@ -488,7 +502,7 @@ static MACHINE_CONFIG_DERIVED( aa4401, aa310 ) /* Expansion slots - 4-card backplane */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aa540, aa310 ) +MACHINE_CONFIG_DERIVED(aa310_state::aa540, aa310) MCFG_CPU_MODIFY("maincpu") // ARM3 MCFG_CPU_CLOCK(XTAL_52MHz / 2) @@ -501,7 +515,7 @@ static MACHINE_CONFIG_DERIVED( aa540, aa310 ) /* Expansion slots - 4-card backplane */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aa5000, aa310 ) +MACHINE_CONFIG_DERIVED(aa310_state::aa5000, aa310) MCFG_CPU_MODIFY("maincpu") // ARM3 MCFG_CPU_CLOCK(XTAL_50MHz / 2) @@ -514,7 +528,7 @@ static MACHINE_CONFIG_DERIVED( aa5000, aa310 ) /* Expansion slots - 4-card backplane */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aa4, aa5000 ) +MACHINE_CONFIG_DERIVED(aa310_state::aa4, aa5000) MCFG_CPU_MODIFY("maincpu") // ARM3 MCFG_CPU_CLOCK(XTAL_24MHz) @@ -527,12 +541,12 @@ static MACHINE_CONFIG_DERIVED( aa4, aa5000 ) /* 60MB HDD */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aa5000a, aa5000 ) +MACHINE_CONFIG_DERIVED(aa310_state::aa5000a, aa5000) MCFG_CPU_MODIFY("maincpu") // ARM3 MCFG_CPU_CLOCK(33000000) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aa3010, aa310 ) +MACHINE_CONFIG_DERIVED(aa310_state::aa3010, aa310) MCFG_CPU_MODIFY("maincpu") // ARM250 MCFG_CPU_CLOCK(XTAL_72MHz / 6) @@ -541,13 +555,13 @@ static MACHINE_CONFIG_DERIVED( aa3010, aa310 ) MCFG_RAM_EXTRA_OPTIONS("2M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aa3020, aa3010 ) +MACHINE_CONFIG_DERIVED(aa310_state::aa3020, aa3010) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("2M") MCFG_RAM_EXTRA_OPTIONS("4M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aa4000, aa3010 ) +MACHINE_CONFIG_DERIVED(aa310_state::aa4000, aa3010) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("2M") MCFG_RAM_EXTRA_OPTIONS("4M") diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp index 5d86e84729b..a806e42f31b 100644 --- a/src/mame/drivers/abc1600.cpp +++ b/src/mame/drivers/abc1600.cpp @@ -873,7 +873,7 @@ void abc1600_state::machine_reset() // MACHINE_CONFIG( abc1600 ) //------------------------------------------------- -static MACHINE_CONFIG_START( abc1600 ) +MACHINE_CONFIG_START(abc1600_state::abc1600) // basic machine hardware MCFG_CPU_ADD(MC68008P8_TAG, M68008, XTAL_64MHz/8) MCFG_CPU_PROGRAM_MAP(abc1600_mem) diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp index 2b23af09cc6..767c537efea 100644 --- a/src/mame/drivers/abc80.cpp +++ b/src/mame/drivers/abc80.cpp @@ -483,7 +483,7 @@ QUICKLOAD_LOAD_MEMBER( abc80_state, bac ) // MACHINE_CONFIG( abc80 ) //------------------------------------------------- -static MACHINE_CONFIG_START( abc80 ) +MACHINE_CONFIG_START(abc80_state::abc80) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_11_9808MHz/2/2) // 2.9952 MHz MCFG_CPU_PROGRAM_MAP(abc80_mem) diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp index cff3346fd59..0876ae88d72 100644 --- a/src/mame/drivers/abc80x.cpp +++ b/src/mame/drivers/abc80x.cpp @@ -150,9 +150,6 @@ Notes: #include "emu.h" #include "includes/abc80x.h" -#include "video/abc800.h" -#include "video/abc802.h" -#include "video/abc806.h" #include "softlist.h" #include "speaker.h" @@ -1018,7 +1015,7 @@ void abc806_state::machine_reset() // MACHINE_CONFIG( abc800c ) //------------------------------------------------- -static MACHINE_CONFIG_START( abc800c ) +MACHINE_CONFIG_START(abc800c_state::abc800c) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2) MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain) @@ -1093,7 +1090,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( abc800m ) //------------------------------------------------- -static MACHINE_CONFIG_START( abc800m ) +MACHINE_CONFIG_START(abc800m_state::abc800m) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2) MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain) @@ -1168,7 +1165,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( abc802 ) //------------------------------------------------- -static MACHINE_CONFIG_START( abc802 ) +MACHINE_CONFIG_START(abc802_state::abc802) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2) MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain) @@ -1244,7 +1241,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( abc806 ) //------------------------------------------------- -static MACHINE_CONFIG_START( abc806 ) +MACHINE_CONFIG_START(abc806_state::abc806) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2) MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain) diff --git a/src/mame/drivers/ac1.cpp b/src/mame/drivers/ac1.cpp index 291c714aa86..4244f8ea07a 100644 --- a/src/mame/drivers/ac1.cpp +++ b/src/mame/drivers/ac1.cpp @@ -126,7 +126,7 @@ static INPUT_PORTS_START( ac1 ) INPUT_PORTS_END /* Machine driver */ -static MACHINE_CONFIG_START( ac1 ) +MACHINE_CONFIG_START(ac1_state::ac1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 4) MCFG_CPU_PROGRAM_MAP(ac1_mem) @@ -158,7 +158,7 @@ static MACHINE_CONFIG_START( ac1 ) MCFG_CASSETTE_ADD( "cassette" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ac1_32, ac1 ) +MACHINE_CONFIG_DERIVED(ac1_state::ac1_32, ac1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(ac1_32_mem) diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp index 263feb6cba7..87127e02e9d 100644 --- a/src/mame/drivers/accomm.cpp +++ b/src/mame/drivers/accomm.cpp @@ -75,6 +75,7 @@ public: DECLARE_PALETTE_INIT(accomm); INTERRUPT_GEN_MEMBER(vbl_int); + void accomm(machine_config &config); protected: // devices required_device m_maincpu; @@ -827,7 +828,7 @@ static INPUT_PORTS_START( accomm ) PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED) INPUT_PORTS_END -static MACHINE_CONFIG_START( accomm ) +MACHINE_CONFIG_START(accomm_state::accomm) MCFG_CPU_ADD("maincpu", G65816, XTAL_16MHz / 8) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", accomm_state, vbl_int) diff --git a/src/mame/drivers/acd.cpp b/src/mame/drivers/acd.cpp index 3bb574397e8..a81bfad2865 100644 --- a/src/mame/drivers/acd.cpp +++ b/src/mame/drivers/acd.cpp @@ -18,6 +18,7 @@ public: // , m_maincpu(*this, "maincpu") { } +void acd(machine_config &config); private: // required_device m_maincpu; }; @@ -28,7 +29,7 @@ private: static INPUT_PORTS_START( acd ) INPUT_PORTS_END -static MACHINE_CONFIG_START( acd ) +MACHINE_CONFIG_START(acd_state::acd) MACHINE_CONFIG_END ROM_START( acd ) diff --git a/src/mame/drivers/ace.cpp b/src/mame/drivers/ace.cpp index 3199f95285d..aadd15aa89a 100644 --- a/src/mame/drivers/ace.cpp +++ b/src/mame/drivers/ace.cpp @@ -82,6 +82,7 @@ public: virtual void video_start() override; uint32_t screen_update_ace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void ace_postload(); + void ace(machine_config &config); }; @@ -316,7 +317,7 @@ void aceal_state::machine_reset() elem = 0; } -static MACHINE_CONFIG_START( ace ) +MACHINE_CONFIG_START(aceal_state::ace) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* 2 MHz ? */ diff --git a/src/mame/drivers/aceex.cpp b/src/mame/drivers/aceex.cpp index 2ce5a81ed86..8e74d630901 100644 --- a/src/mame/drivers/aceex.cpp +++ b/src/mame/drivers/aceex.cpp @@ -59,6 +59,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; required_device m_maincpu; + void aceex2814(machine_config &config); }; static ADDRESS_MAP_START( aceex2814_map, AS_PROGRAM, 8, aceex2814_state ) @@ -78,7 +79,7 @@ void aceex2814_state::machine_reset() #define Y1_CLOCK 40320000 #define Y2_CLOCK 45342720 -static MACHINE_CONFIG_START( aceex2814 ) +MACHINE_CONFIG_START(aceex2814_state::aceex2814) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C31, Y2_CLOCK) diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp index d8b6197948c..483db69c0d4 100644 --- a/src/mame/drivers/acefruit.cpp +++ b/src/mame/drivers/acefruit.cpp @@ -60,6 +60,7 @@ public: TIMER_ACEFRUIT_REFRESH }; + void acefruit(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -604,7 +605,7 @@ static GFXDECODE_START( acefruit ) GFXDECODE_ENTRY( "gfx1", 0x1800, charlayout, 8, 4 ) GFXDECODE_END -static MACHINE_CONFIG_START( acefruit ) +MACHINE_CONFIG_START(acefruit_state::acefruit) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2500000) /* 2.5MHz */ diff --git a/src/mame/drivers/aces1.cpp b/src/mame/drivers/aces1.cpp index 48ab87c7adf..279e7b1b260 100644 --- a/src/mame/drivers/aces1.cpp +++ b/src/mame/drivers/aces1.cpp @@ -229,6 +229,7 @@ public: virtual void machine_reset() override; TIMER_CALLBACK_MEMBER(m_aces1_irq_timer_callback); TIMER_CALLBACK_MEMBER(m_aces1_nmi_timer_callback); + void aces1(machine_config &config); }; @@ -428,7 +429,7 @@ static INPUT_PORTS_START( aces1 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( aces1 ) +MACHINE_CONFIG_START(aces1_state::aces1) MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ?? Mhz */ MCFG_CPU_PROGRAM_MAP(aces1_map) diff --git a/src/mame/drivers/acesp.cpp b/src/mame/drivers/acesp.cpp index b69928b45e3..fb104d13cec 100644 --- a/src/mame/drivers/acesp.cpp +++ b/src/mame/drivers/acesp.cpp @@ -28,6 +28,7 @@ public: m_maincpu(*this, "maincpu") { } + void ace_sp(machine_config &config); protected: // devices @@ -79,7 +80,7 @@ static INPUT_PORTS_START( ace_sp ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ace_sp ) +MACHINE_CONFIG_START(ace_sp_state::ace_sp) MCFG_CPU_ADD("maincpu", HD6303Y, 1000000) MCFG_CPU_PROGRAM_MAP(ace_sp_map) MCFG_CPU_IO_MAP(ace_sp_portmap) diff --git a/src/mame/drivers/acommand.cpp b/src/mame/drivers/acommand.cpp index f90de7a8cb3..2450ae59a72 100644 --- a/src/mame/drivers/acommand.cpp +++ b/src/mame/drivers/acommand.cpp @@ -112,6 +112,7 @@ public: required_device m_palette; required_device m_bgtmap; required_device m_txtmap; + void acommand(machine_config &config); }; @@ -459,7 +460,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(acommand_state::acommand_scanline) m_maincpu->set_input_line(3, HOLD_LINE); } -static MACHINE_CONFIG_START( acommand ) +MACHINE_CONFIG_START(acommand_state::acommand) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,12000000) diff --git a/src/mame/drivers/acrnsys1.cpp b/src/mame/drivers/acrnsys1.cpp index cc370cb1775..a5d376d84df 100644 --- a/src/mame/drivers/acrnsys1.cpp +++ b/src/mame/drivers/acrnsys1.cpp @@ -74,6 +74,7 @@ public: DECLARE_WRITE8_MEMBER(acrnsys1_led_segment_w); TIMER_DEVICE_CALLBACK_MEMBER(acrnsys1_c); TIMER_DEVICE_CALLBACK_MEMBER(acrnsys1_p); + void acrnsys1(machine_config &config); private: required_device m_maincpu; required_device m_ttl74145; @@ -243,7 +244,7 @@ INPUT_PORTS_END MACHINE DRIVERS ***************************************************************************/ -static MACHINE_CONFIG_START( acrnsys1 ) +MACHINE_CONFIG_START(acrnsys1_state::acrnsys1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1008000) /* 1.008 MHz */ MCFG_CPU_PROGRAM_MAP(acrnsys1_map) diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp index 567c28ba7af..5c5c13d8253 100644 --- a/src/mame/drivers/actfancr.cpp +++ b/src/mame/drivers/actfancr.cpp @@ -284,7 +284,7 @@ MACHINE_RESET_MEMBER(actfancr_state,triothep) /******************************************************************************/ -static MACHINE_CONFIG_START( actfancr ) +MACHINE_CONFIG_START(actfancr_state::actfancr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H6280, 21477200/3) /* Should be accurate */ @@ -339,7 +339,7 @@ static MACHINE_CONFIG_START( actfancr ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( triothep ) +MACHINE_CONFIG_START(actfancr_state::triothep) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */ diff --git a/src/mame/drivers/acvirus.cpp b/src/mame/drivers/acvirus.cpp index 238b07390fe..6b508a24e74 100644 --- a/src/mame/drivers/acvirus.cpp +++ b/src/mame/drivers/acvirus.cpp @@ -83,6 +83,7 @@ public: virtual void machine_reset() override; DECLARE_DRIVER_INIT(virus); + void virus(machine_config &config); }; void acvirus_state::machine_start() @@ -100,7 +101,7 @@ static ADDRESS_MAP_START( virus_map, AS_PROGRAM, 8, acvirus_state ) AM_RANGE(0x8000, 0xffff) AM_ROMBANK("rombank") ADDRESS_MAP_END -static MACHINE_CONFIG_START( virus ) +MACHINE_CONFIG_START(acvirus_state::virus) MCFG_CPU_ADD("maincpu", I8052, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(virus_map) diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp index bb9ffe50744..2865c4b9800 100644 --- a/src/mame/drivers/adam.cpp +++ b/src/mame/drivers/adam.cpp @@ -1047,7 +1047,7 @@ DEVICE_INPUT_DEFAULTS_END // MACHINE_CONFIG( adam ) //------------------------------------------------- -static MACHINE_CONFIG_START( adam ) +MACHINE_CONFIG_START(adam_state::adam) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_7_15909MHz/2) MCFG_CPU_PROGRAM_MAP(adam_mem) diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp index edfb981c915..0269c40f580 100644 --- a/src/mame/drivers/adp.cpp +++ b/src/mame/drivers/adp.cpp @@ -199,6 +199,12 @@ public: IRQ_CALLBACK_MEMBER(duart_iack_handler); //INTERRUPT_GEN_MEMBER(adp_int); void skattva_nvram_init(nvram_device &nvram, void *base, size_t size); + void skattv(machine_config &config); + void quickjac(machine_config &config); + void fashiong(machine_config &config); + void fstation(machine_config &config); + void funland(machine_config &config); + void skattva(machine_config &config); }; void adp_state::skattva_nvram_init(nvram_device &nvram, void *base, size_t size) @@ -525,7 +531,7 @@ static ADDRESS_MAP_START( fstation_hd63484_map, 0, 16, adp_state ) AM_RANGE(0x80000, 0xfffff) AM_RAM ADDRESS_MAP_END -static MACHINE_CONFIG_START( quickjac ) +MACHINE_CONFIG_START(adp_state::quickjac) MCFG_CPU_ADD("maincpu", M68000, 8000000) MCFG_CPU_PROGRAM_MAP(quickjac_mem) @@ -567,19 +573,19 @@ static MACHINE_CONFIG_START( quickjac ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( skattv, quickjac ) +MACHINE_CONFIG_DERIVED(adp_state::skattv, quickjac) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(skattv_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( skattva, quickjac ) +MACHINE_CONFIG_DERIVED(adp_state::skattva, quickjac) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(skattva_mem) MCFG_NVRAM_REPLACE_CUSTOM_DRIVER("nvram", adp_state, skattva_nvram_init) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fashiong, skattv ) +MACHINE_CONFIG_DERIVED(adp_state::fashiong, skattv) MCFG_DEVICE_MODIFY("acrtc") MCFG_HD63484_ADDRESS_MAP(fashiong_hd63484_map) MACHINE_CONFIG_END @@ -588,7 +594,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, adp_state ) AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( funland, quickjac ) +MACHINE_CONFIG_DERIVED(adp_state::funland, quickjac) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(funland_mem) @@ -600,7 +606,7 @@ static MACHINE_CONFIG_DERIVED( funland, quickjac ) MCFG_HD63484_ADDRESS_MAP(fstation_hd63484_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fstation, funland ) +MACHINE_CONFIG_DERIVED(adp_state::fstation, funland) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(fstation_mem) diff --git a/src/mame/drivers/advision.cpp b/src/mame/drivers/advision.cpp index 88b545390fa..4fd86302eeb 100644 --- a/src/mame/drivers/advision.cpp +++ b/src/mame/drivers/advision.cpp @@ -61,7 +61,7 @@ INPUT_PORTS_END /* Machine Driver */ -static MACHINE_CONFIG_START( advision ) +MACHINE_CONFIG_START(advision_state::advision) /* basic machine hardware */ MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_11MHz) MCFG_CPU_PROGRAM_MAP(program_map) diff --git a/src/mame/drivers/aeroboto.cpp b/src/mame/drivers/aeroboto.cpp index f612f4dbe0e..03e2abb8755 100644 --- a/src/mame/drivers/aeroboto.cpp +++ b/src/mame/drivers/aeroboto.cpp @@ -237,7 +237,7 @@ void aeroboto_state::machine_reset() m_sy = 0; } -static MACHINE_CONFIG_START( formatz ) +MACHINE_CONFIG_START(aeroboto_state::formatz) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_10MHz/2) /* verified on pcb */ diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp index 47cd3a501e3..ddec7123de2 100644 --- a/src/mame/drivers/aerofgt.cpp +++ b/src/mame/drivers/aerofgt.cpp @@ -1400,7 +1400,7 @@ MACHINE_RESET_MEMBER(aerofgt_state,aerofgt) m_soundbank->set_entry(0); /* needed by spinlbrk */ } -static MACHINE_CONFIG_START( pspikes ) +MACHINE_CONFIG_START(aerofgt_state::pspikes) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */ @@ -1452,7 +1452,7 @@ static MACHINE_CONFIG_START( pspikes ) MCFG_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( spikes91 ) +MACHINE_CONFIG_START(aerofgt_state::spikes91) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */ @@ -1490,7 +1490,7 @@ static MACHINE_CONFIG_START( spikes91 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pspikesb ) +MACHINE_CONFIG_START(aerofgt_state::pspikesb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */ @@ -1531,7 +1531,7 @@ MACHINE_CONFIG_END tile banking and sound system are different like many of the bootlegs */ -static MACHINE_CONFIG_START( kickball ) +MACHINE_CONFIG_START(aerofgt_state::kickball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,XTAL_10MHz) // 10Mhz XTAL near 10Mhz rated CPU @@ -1582,7 +1582,7 @@ static MACHINE_CONFIG_START( kickball ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pspikesc ) +MACHINE_CONFIG_START(aerofgt_state::pspikesc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */ @@ -1621,7 +1621,7 @@ static MACHINE_CONFIG_START( pspikesc ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( karatblz ) +MACHINE_CONFIG_START(aerofgt_state::karatblz) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */ @@ -1678,7 +1678,7 @@ static MACHINE_CONFIG_START( karatblz ) MCFG_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( karatblzbl ) +MACHINE_CONFIG_START(aerofgt_state::karatblzbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */ @@ -1734,7 +1734,7 @@ static MACHINE_CONFIG_START( karatblzbl ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( spinlbrk ) +MACHINE_CONFIG_START(aerofgt_state::spinlbrk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */ @@ -1792,7 +1792,7 @@ static MACHINE_CONFIG_START( spinlbrk ) MCFG_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( turbofrc ) +MACHINE_CONFIG_START(aerofgt_state::turbofrc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */ @@ -1849,7 +1849,7 @@ static MACHINE_CONFIG_START( turbofrc ) MCFG_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( aerofgtb ) +MACHINE_CONFIG_START(aerofgt_state::aerofgtb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */ @@ -1907,7 +1907,7 @@ static MACHINE_CONFIG_START( aerofgtb ) MCFG_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( aerofgt ) +MACHINE_CONFIG_START(aerofgt_state::aerofgt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */ @@ -1970,7 +1970,7 @@ static MACHINE_CONFIG_START( aerofgt ) MCFG_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( aerfboot ) +MACHINE_CONFIG_START(aerofgt_state::aerfboot) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */ @@ -2013,7 +2013,7 @@ static MACHINE_CONFIG_START( aerfboot ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( aerfboo2 ) +MACHINE_CONFIG_START(aerofgt_state::aerfboo2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */ @@ -2048,7 +2048,7 @@ static MACHINE_CONFIG_START( aerfboo2 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wbbc97 ) +MACHINE_CONFIG_START(aerofgt_state::wbbc97) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */ diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp index 18acb3af75a..496b9af8dee 100644 --- a/src/mame/drivers/agat.cpp +++ b/src/mame/drivers/agat.cpp @@ -153,6 +153,7 @@ public: DECLARE_READ8_MEMBER(controller_strobe_r); DECLARE_WRITE8_MEMBER(controller_strobe_w); + void agat7(machine_config &config); private: int m_speaker_state; int m_cassette_state; @@ -1069,7 +1070,7 @@ static SLOT_INTERFACE_START(agat7_cards) // Nippel Co-processor (R65C02 clone + dual-ported RAM) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( agat7 ) +MACHINE_CONFIG_START(agat7_state::agat7) MCFG_CPU_ADD("maincpu", M6502, XTAL_14_3MHz / 14) MCFG_CPU_PROGRAM_MAP(agat7_map) MCFG_CPU_VBLANK_INT_DRIVER(A7_VIDEO_TAG ":a7screen", agat7_state, agat_vblank) diff --git a/src/mame/drivers/age_candy.cpp b/src/mame/drivers/age_candy.cpp index 0b45792f363..1304cd5a456 100644 --- a/src/mame/drivers/age_candy.cpp +++ b/src/mame/drivers/age_candy.cpp @@ -27,6 +27,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void age_candy(machine_config &config); // required_device m_maincpu; }; @@ -50,7 +51,7 @@ static ADDRESS_MAP_START(age_candy_map, AS_PROGRAM, 8, age_candy_state) ADDRESS_MAP_END #endif -static MACHINE_CONFIG_START( age_candy ) +MACHINE_CONFIG_START(age_candy_state::age_candy) /* basic machine hardware */ // MCFG_CPU_ADD("maincpu", HPC46104, 8000000) // unknown clock; HPC emulation needed diff --git a/src/mame/drivers/aim65.cpp b/src/mame/drivers/aim65.cpp index da7bfabb98b..662dce5ba5e 100644 --- a/src/mame/drivers/aim65.cpp +++ b/src/mame/drivers/aim65.cpp @@ -176,7 +176,7 @@ image_init_result aim65_state::load_cart(device_image_interface &image, generic_ } -static MACHINE_CONFIG_START( aim65 ) +MACHINE_CONFIG_START(aim65_state::aim65) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, AIM65_CLOCK) /* 1 MHz */ MCFG_CPU_PROGRAM_MAP(aim65_mem) diff --git a/src/mame/drivers/aim65_40.cpp b/src/mame/drivers/aim65_40.cpp index 3837a0016a2..f9af6e40a2e 100644 --- a/src/mame/drivers/aim65_40.cpp +++ b/src/mame/drivers/aim65_40.cpp @@ -76,6 +76,7 @@ public: : driver_device(mconfig, type, tag) { } + void aim65_40(machine_config &config); // devices //device_t *m_via0; //device_t *m_via1; @@ -111,7 +112,7 @@ INPUT_PORTS_END MACHINE DRIVERS ***************************************************************************/ -static MACHINE_CONFIG_START( aim65_40 ) +MACHINE_CONFIG_START(aim65_40_state::aim65_40) /* basic machine hardware */ MCFG_CPU_ADD(M6502_TAG, M6502, 1000000) MCFG_CPU_PROGRAM_MAP(aim65_40_mem) diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp index 153f4cc80b5..b3131de9eec 100644 --- a/src/mame/drivers/airbustr.cpp +++ b/src/mame/drivers/airbustr.cpp @@ -543,7 +543,7 @@ void airbustr_state::machine_reset() /* Machine Driver */ -static MACHINE_CONFIG_START( airbustr ) +MACHINE_CONFIG_START(airbustr_state::airbustr) /* basic machine hardware */ MCFG_CPU_ADD("master", Z80, XTAL_12MHz/2) /* verified on pcb */ @@ -605,7 +605,7 @@ static MACHINE_CONFIG_START( airbustr ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( airbustrb, airbustr ) +MACHINE_CONFIG_DERIVED(airbustr_state::airbustrb, airbustr) MCFG_WATCHDOG_MODIFY("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(0)) // no protection device or watchdog MACHINE_CONFIG_END diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp index 8a85510ad8e..34792e164ce 100644 --- a/src/mame/drivers/airraid.cpp +++ b/src/mame/drivers/airraid.cpp @@ -188,6 +188,8 @@ public: DECLARE_DRIVER_INIT(cshooter); DECLARE_MACHINE_RESET(cshooter); TIMER_DEVICE_CALLBACK_MEMBER(cshooter_scanline); + void airraid(machine_config &config); + void airraid_crypt(machine_config &config); }; @@ -375,7 +377,7 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( airraid ) +MACHINE_CONFIG_START(airraid_state::airraid) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* verified on pcb */ @@ -411,7 +413,7 @@ static MACHINE_CONFIG_START( airraid ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( airraid_crypt, airraid ) +MACHINE_CONFIG_DERIVED(airraid_state::airraid_crypt, airraid) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp index 7f5c449de89..c08770286c6 100644 --- a/src/mame/drivers/ajax.cpp +++ b/src/mame/drivers/ajax.cpp @@ -167,7 +167,7 @@ WRITE8_MEMBER(ajax_state::volume_callback1) } -static MACHINE_CONFIG_START( ajax ) +MACHINE_CONFIG_START(ajax_state::ajax) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 12/4 MHz*/ diff --git a/src/mame/drivers/akaiax80.cpp b/src/mame/drivers/akaiax80.cpp index 3070afb8aaa..714fd2e4c93 100644 --- a/src/mame/drivers/akaiax80.cpp +++ b/src/mame/drivers/akaiax80.cpp @@ -59,6 +59,7 @@ public: , m_maincpu(*this, "maincpu") { } + void ax80(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -87,7 +88,7 @@ static ADDRESS_MAP_START( ax80_map, AS_PROGRAM, 8, ax80_state ) AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x3800) AM_RAM ADDRESS_MAP_END -static MACHINE_CONFIG_START( ax80 ) +MACHINE_CONFIG_START(ax80_state::ax80) MCFG_CPU_ADD("maincpu", UPD7810, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(ax80_map) //MCFG_CPU_IO_MAP(ax80_io) diff --git a/src/mame/drivers/albazc.cpp b/src/mame/drivers/albazc.cpp index bf10836f198..2c26993e08b 100644 --- a/src/mame/drivers/albazc.cpp +++ b/src/mame/drivers/albazc.cpp @@ -50,6 +50,7 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_hopper; + void hanaroku(machine_config &config); }; @@ -271,7 +272,7 @@ static GFXDECODE_START( hanaroku ) GFXDECODE_END -static MACHINE_CONFIG_START( hanaroku ) +MACHINE_CONFIG_START(albazc_state::hanaroku) MCFG_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(hanaroku_map) diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp index a3dd048bd9c..494c5d98249 100644 --- a/src/mame/drivers/albazg.cpp +++ b/src/mame/drivers/albazg.cpp @@ -84,6 +84,7 @@ public: uint32_t screen_update_yumefuda(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void yumefuda(machine_config &config); }; TILE_GET_INFO_MEMBER(albazg_state::y_get_bg_tile_info) @@ -346,7 +347,7 @@ void albazg_state::machine_reset() m_prot_lock = 0; } -static MACHINE_CONFIG_START( yumefuda ) +MACHINE_CONFIG_START(albazg_state::yumefuda) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80 , MASTER_CLOCK/2) /* xtal is 12 Mhz, unknown divider*/ diff --git a/src/mame/drivers/aleck64.cpp b/src/mame/drivers/aleck64.cpp index 485218e769b..2d4222eb6f0 100644 --- a/src/mame/drivers/aleck64.cpp +++ b/src/mame/drivers/aleck64.cpp @@ -200,6 +200,8 @@ public: uint32_t screen_update_e90(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void aleck64(machine_config &config); + void a64_e90(machine_config &config); protected: optional_shared_ptr m_e90_vram; optional_shared_ptr m_e90_pal; @@ -898,7 +900,7 @@ static INPUT_PORTS_START( srmvs ) INPUT_PORTS_END -static MACHINE_CONFIG_START( aleck64 ) +MACHINE_CONFIG_START(aleck64_state::aleck64) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", VR4300BE, 93750000) @@ -980,7 +982,7 @@ uint32_t aleck64_state::screen_update_e90(screen_device &screen, bitmap_rgb32 &b return 0; } -static MACHINE_CONFIG_DERIVED( a64_e90, aleck64 ) +MACHINE_CONFIG_DERIVED(aleck64_state::a64_e90, aleck64) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(e90_map) diff --git a/src/mame/drivers/aleisttl.cpp b/src/mame/drivers/aleisttl.cpp index a6b1ac5bfa2..65b231f37ba 100644 --- a/src/mame/drivers/aleisttl.cpp +++ b/src/mame/drivers/aleisttl.cpp @@ -61,6 +61,7 @@ public: required_device m_maincpu; required_device m_video; + void sburners(machine_config &config); protected: // driver_device overrides @@ -101,7 +102,7 @@ void sburners_state::video_start() { } -static MACHINE_CONFIG_START( sburners ) +MACHINE_CONFIG_START(sburners_state::sburners) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp index c7e9fc91bf5..0c49e78d194 100644 --- a/src/mame/drivers/alesis.cpp +++ b/src/mame/drivers/alesis.cpp @@ -355,7 +355,7 @@ HD44780_PIXEL_UPDATE(alesis_state::sr16_pixel_update) bitmap.pix16(line*9 + y, pos*6 + x) = state; } -static MACHINE_CONFIG_START( hr16 ) +MACHINE_CONFIG_START(alesis_state::hr16) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8031, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(hr16_mem) @@ -387,7 +387,7 @@ static MACHINE_CONFIG_START( hr16 ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sr16, hr16 ) +MACHINE_CONFIG_DERIVED(alesis_state::sr16, hr16) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sr16_mem) @@ -404,7 +404,7 @@ static MACHINE_CONFIG_DERIVED( sr16, hr16 ) MCFG_HD44780_PIXEL_UPDATE_CB(alesis_state, sr16_pixel_update) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mmt8, hr16 ) +MACHINE_CONFIG_DERIVED(alesis_state::mmt8, hr16) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(mmt8_io) diff --git a/src/mame/drivers/alesis_qs.cpp b/src/mame/drivers/alesis_qs.cpp index b41bcfea26c..784b4187716 100644 --- a/src/mame/drivers/alesis_qs.cpp +++ b/src/mame/drivers/alesis_qs.cpp @@ -24,6 +24,7 @@ public: m_maincpu(*this, "maincpu") { } + void qs7(machine_config &config); protected: required_device m_maincpu; }; @@ -46,7 +47,7 @@ static ADDRESS_MAP_START( qs7_prog_map, AS_PROGRAM, 16, qs_state ) AM_RANGE(0x00000, 0x3ffff) AM_ROM ADDRESS_MAP_END -static MACHINE_CONFIG_START( qs7 ) +MACHINE_CONFIG_START(qs_state::qs7) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H83048, XTAL_10MHz) /* FIX-ME! Actual CPU is H8/510 and XTAL value is a guess */ MCFG_CPU_PROGRAM_MAP(qs7_prog_map) diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp index 5c807aa22cb..fcfb834802e 100644 --- a/src/mame/drivers/alg.cpp +++ b/src/mame/drivers/alg.cpp @@ -58,6 +58,9 @@ public: DECLARE_VIDEO_START(alg); + void alg_r2(machine_config &config); + void picmatic(machine_config &config); + void alg_r1(machine_config &config); protected: // amiga_state overrides virtual void potgo_w(uint16_t data) override; @@ -289,7 +292,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( alg_r1 ) +MACHINE_CONFIG_START(alg_state::alg_r1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC) @@ -351,13 +354,13 @@ static MACHINE_CONFIG_START( alg_r1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( alg_r2, alg_r1 ) +MACHINE_CONFIG_DERIVED(alg_state::alg_r2, alg_r1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(main_map_r2) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( picmatic, alg_r1 ) +MACHINE_CONFIG_DERIVED(alg_state::picmatic, alg_r1) /* adjust for PAL specs */ MCFG_CPU_REPLACE("maincpu", M68000, amiga_state::CLK_7M_PAL) MCFG_CPU_PROGRAM_MAP(main_map_picmatic) diff --git a/src/mame/drivers/alien.cpp b/src/mame/drivers/alien.cpp index 543d7e3d7ec..2f22185b43a 100644 --- a/src/mame/drivers/alien.cpp +++ b/src/mame/drivers/alien.cpp @@ -42,6 +42,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void alien(machine_config &config); protected: // devices @@ -87,7 +88,7 @@ void alien_state::machine_reset() //m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); } -static MACHINE_CONFIG_START( alien ) +MACHINE_CONFIG_START(alien_state::alien) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH4LE, MASTER_CLOCK) /* 200MHz */ MCFG_CPU_PROGRAM_MAP(alien_map) diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp index 3eef3edda85..549ad51114e 100644 --- a/src/mame/drivers/aliens.cpp +++ b/src/mame/drivers/aliens.cpp @@ -191,7 +191,7 @@ WRITE8_MEMBER( aliens_state::banking_callback ) m_rombank->set_entry(data & 0x1f); } -static MACHINE_CONFIG_START( aliens ) +MACHINE_CONFIG_START(aliens_state::aliens) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 (verified on pcb) */ diff --git a/src/mame/drivers/alinvade.cpp b/src/mame/drivers/alinvade.cpp index f6fa6c073f1..44f0bde4c35 100644 --- a/src/mame/drivers/alinvade.cpp +++ b/src/mame/drivers/alinvade.cpp @@ -45,6 +45,7 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void alinvade(machine_config &config); private: uint8_t m_irqmask; uint8_t m_irqff; @@ -202,7 +203,7 @@ INTERRUPT_GEN_MEMBER(alinvade_state::vblank_irq) m_maincpu->set_input_line(0,HOLD_LINE); } -static MACHINE_CONFIG_START( alinvade ) +MACHINE_CONFIG_START(alinvade_state::alinvade) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,2000000) /* ? MHz */ diff --git a/src/mame/drivers/allied.cpp b/src/mame/drivers/allied.cpp index 2e6dc608f88..2f9514e21e8 100644 --- a/src/mame/drivers/allied.cpp +++ b/src/mame/drivers/allied.cpp @@ -85,6 +85,7 @@ public: DECLARE_READ8_MEMBER(ic7_a_r); DECLARE_WRITE_LINE_MEMBER(ic8_cb2_w); TIMER_DEVICE_CALLBACK_MEMBER(timer_a); + void allied(machine_config &config); private: uint32_t m_player_score[6]; uint8_t m_display; @@ -609,7 +610,7 @@ void allied_state::machine_reset() output().set_value("led0", 1); //1=off } -static MACHINE_CONFIG_START( allied ) +MACHINE_CONFIG_START(allied_state::allied) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6504, 3572549/4) MCFG_CPU_PROGRAM_MAP(allied_map) diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp index 0e20f8ce46a..b872577e873 100644 --- a/src/mame/drivers/alpha68k.cpp +++ b/src/mame/drivers/alpha68k.cpp @@ -1911,7 +1911,7 @@ MACHINE_START_MEMBER(alpha68k_state,alpha68k_II) #define ALPHA68K_VBEND 16 #define ALPHA68K_VBSTART 240 -static MACHINE_CONFIG_START( sstingry ) +MACHINE_CONFIG_START(alpha68k_state::sstingry) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */ @@ -1972,7 +1972,7 @@ static MACHINE_CONFIG_START( sstingry ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( kyros ) +MACHINE_CONFIG_START(alpha68k_state::kyros) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* Verified on bootleg PCB */ @@ -2024,7 +2024,7 @@ static MACHINE_CONFIG_START( kyros ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( jongbou ) +MACHINE_CONFIG_START(alpha68k_state::jongbou) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) @@ -2066,7 +2066,7 @@ static MACHINE_CONFIG_START( jongbou ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.65) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( alpha68k_I ) +MACHINE_CONFIG_START(alpha68k_state::alpha68k_I) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */ @@ -2111,7 +2111,7 @@ INTERRUPT_GEN_MEMBER(alpha68k_state::alpha68k_sound_nmi) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( alpha68k_II ) +MACHINE_CONFIG_START(alpha68k_state::alpha68k_II) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* Correct */ @@ -2160,13 +2160,13 @@ static MACHINE_CONFIG_START( alpha68k_II ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( btlfieldb, alpha68k_II ) +MACHINE_CONFIG_DERIVED(alpha68k_state::btlfieldb, alpha68k_II) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold) MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*4) // MCU irq MACHINE_CONFIG_END -static MACHINE_CONFIG_START( alpha68k_II_gm ) +MACHINE_CONFIG_START(alpha68k_state::alpha68k_II_gm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) @@ -2216,7 +2216,7 @@ static MACHINE_CONFIG_START( alpha68k_II_gm ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( alpha68k_V ) +MACHINE_CONFIG_START(alpha68k_state::alpha68k_V) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */ @@ -2265,7 +2265,7 @@ static MACHINE_CONFIG_START( alpha68k_V ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( alpha68k_V_sb ) +MACHINE_CONFIG_START(alpha68k_state::alpha68k_V_sb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */ @@ -2314,7 +2314,7 @@ static MACHINE_CONFIG_START( alpha68k_V_sb ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tnextspc ) +MACHINE_CONFIG_START(alpha68k_state::tnextspc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 9000000) /* Confirmed 18 MHz/2 */ diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp index 7710970f54c..34c5106bc90 100644 --- a/src/mame/drivers/alphasma.cpp +++ b/src/mame/drivers/alphasma.cpp @@ -60,6 +60,7 @@ public: DECLARE_WRITE8_MEMBER(port_d_w); void update_lcdc(address_space &space, bool lcdc0, bool lcdc1); + void alphasmart(machine_config &config); protected: uint8_t m_matrix[2]; uint8_t m_port_a; @@ -82,6 +83,7 @@ public: DECLARE_WRITE8_MEMBER(io_w); virtual DECLARE_WRITE8_MEMBER(port_a_w) override; + void asma2k(machine_config &config); private: uint8_t m_lcd_ctrl; }; @@ -418,7 +420,7 @@ void alphasmart_state::machine_reset() m_port_d = 0; } -static MACHINE_CONFIG_START( alphasmart ) +MACHINE_CONFIG_START(alphasmart_state::alphasmart) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC68HC11, XTAL_8MHz/2) // MC68HC11D0, XTAL is 8 Mhz, unknown divider MCFG_CPU_PROGRAM_MAP(alphasmart_mem) @@ -449,7 +451,7 @@ static MACHINE_CONFIG_START( alphasmart ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( asma2k, alphasmart ) +MACHINE_CONFIG_DERIVED(asma2k_state::asma2k, alphasmart) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(asma2k_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/alphatpx.cpp b/src/mame/drivers/alphatpx.cpp index 1d706f50bed..d34c212ee6c 100644 --- a/src/mame/drivers/alphatpx.cpp +++ b/src/mame/drivers/alphatpx.cpp @@ -115,6 +115,9 @@ public: DECLARE_WRITE8_MEMBER(beep_w); DECLARE_WRITE8_MEMBER(bank_w); + void alphatp2(machine_config &config); + void alphatp3(machine_config &config); + void alphatp2u(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -593,7 +596,7 @@ void alphatpx_state::machine_reset() // MACHINE DEFINITIONS //************************************************************************** -static MACHINE_CONFIG_START( alphatp3 ) +MACHINE_CONFIG_START(alphatpx_state::alphatp3) MCFG_CPU_ADD("maincpu", I8085A, XTAL_6MHz) MCFG_CPU_PROGRAM_MAP(alphatp3_mem) MCFG_CPU_IO_MAP(alphatp3_io) @@ -644,7 +647,7 @@ static MACHINE_CONFIG_START( alphatp3 ) MCFG_FLOPPY_DRIVE_ADD("fdc:1", alphatp3_floppies, "525qd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( alphatp2 ) +MACHINE_CONFIG_START(alphatpx_state::alphatp2) MCFG_CPU_ADD("maincpu", I8085A, XTAL_6MHz) MCFG_CPU_PROGRAM_MAP(alphatp3_mem) MCFG_CPU_IO_MAP(alphatp3_io) @@ -695,7 +698,7 @@ static MACHINE_CONFIG_START( alphatp2 ) MCFG_FLOPPY_DRIVE_ADD("fdc:1", alphatp2_floppies, "525ssdd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED (alphatp2u, alphatp2) +MACHINE_CONFIG_DERIVED(alphatpx_state::alphatp2u, alphatp2) MCFG_DEVICE_REMOVE("fdc:0") MCFG_DEVICE_REMOVE("fdc:1") MCFG_FLOPPY_DRIVE_ADD("fdc:0", alphatp2su_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp index aeb128f7bc4..328ebc922ef 100644 --- a/src/mame/drivers/alphatro.cpp +++ b/src/mame/drivers/alphatro.cpp @@ -105,6 +105,7 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load) { return load_cart(image, m_cart); } DECLARE_FLOPPY_FORMATS( floppy_formats ); + void alphatro(machine_config &config); private: uint8_t *m_ram_ptr; required_device m_ram; @@ -686,7 +687,7 @@ static SLOT_INTERFACE_START( alphatro_floppies ) SLOT_INTERFACE( "525dd", FLOPPY_525_DD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( alphatro ) +MACHINE_CONFIG_START(alphatro_state::alphatro) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,MAIN_CLOCK) MCFG_CPU_PROGRAM_MAP(alphatro_map) diff --git a/src/mame/drivers/altair.cpp b/src/mame/drivers/altair.cpp index 0eb95a0bc28..0957d94dfc6 100644 --- a/src/mame/drivers/altair.cpp +++ b/src/mame/drivers/altair.cpp @@ -43,6 +43,7 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER(altair); + void altair(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -90,7 +91,7 @@ void altair_state::machine_reset() m_maincpu->set_state_int(i8080_cpu_device::I8085_PC, 0xFD00); } -static MACHINE_CONFIG_START( altair ) +MACHINE_CONFIG_START(altair_state::altair) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_2MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/alto1.cpp b/src/mame/drivers/alto1.cpp index d939f8f4711..46895b14058 100644 --- a/src/mame/drivers/alto1.cpp +++ b/src/mame/drivers/alto1.cpp @@ -21,6 +21,7 @@ public: // , m_maincpu(*this, "maincpu") { } +void alto1(machine_config &config); private: // required_device m_maincpu; }; @@ -29,7 +30,7 @@ private: static INPUT_PORTS_START( alto1 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( alto1 ) +MACHINE_CONFIG_START(alto1_state::alto1) MACHINE_CONFIG_END ROM_START( alto1 ) diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp index d7d6cff55d5..99b35501ad6 100644 --- a/src/mame/drivers/alto2.cpp +++ b/src/mame/drivers/alto2.cpp @@ -33,6 +33,7 @@ public: DECLARE_DRIVER_INIT(alto2); DECLARE_MACHINE_RESET(alto2); + void alto2(machine_config &config); protected: required_device m_maincpu; required_device m_speaker; @@ -272,7 +273,7 @@ ADDRESS_MAP_START( alto2_iomem_map, 2, 16, alto2_state ) AM_RANGE(0, 2*ALTO2_RAM_SIZE-1) AM_DEVICE16( "maincpu", alto2_cpu_device, iomem_map, 0xffffU ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( alto2 ) +MACHINE_CONFIG_START(alto2_state::alto2) // Basic machine hardware // SYSCLK is Display Control part A51 (tagged 29.4MHz) divided by 5(?) // 5.8MHz according to de.wikipedia.org/wiki/Xerox_Alto diff --git a/src/mame/drivers/altos2.cpp b/src/mame/drivers/altos2.cpp index a7d63bbcb0c..0f8bb47802f 100644 --- a/src/mame/drivers/altos2.cpp +++ b/src/mame/drivers/altos2.cpp @@ -40,6 +40,7 @@ public: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void altos2(machine_config &config); private: virtual void machine_reset() override; @@ -94,7 +95,7 @@ static const z80_daisy_config daisy_chain[] = { nullptr } }; -static MACHINE_CONFIG_START( altos2 ) +MACHINE_CONFIG_START(altos2_state::altos2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) // unknown clock MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/altos486.cpp b/src/mame/drivers/altos486.cpp index 1f81578be4b..44331e85752 100644 --- a/src/mame/drivers/altos486.cpp +++ b/src/mame/drivers/altos486.cpp @@ -39,6 +39,7 @@ public: bool m_sys_mode; uint8_t m_prot[256]; uint16_t m_viol[16]; + void altos486(machine_config &config); }; READ8_MEMBER(altos486_state::read_rmx_ack) @@ -119,7 +120,7 @@ static ADDRESS_MAP_START(altos486_z80_io, AS_IO, 8, altos486_state) //AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("sio2", z80sio0_device, read, write) ADDRESS_MAP_END -static MACHINE_CONFIG_START( altos486 ) +MACHINE_CONFIG_START(altos486_state::altos486) MCFG_CPU_ADD("maincpu", I80186, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(altos486_mem) MCFG_CPU_IO_MAP(altos486_io) diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp index 08fcdf9b45c..0f6d009c12e 100644 --- a/src/mame/drivers/altos5.cpp +++ b/src/mame/drivers/altos5.cpp @@ -48,6 +48,7 @@ public: DECLARE_WRITE_LINE_MEMBER(busreq_w); DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); + void altos5(machine_config &config); private: uint8_t m_port08; uint8_t m_port09; @@ -344,7 +345,7 @@ DRIVER_INIT_MEMBER( altos5_state, altos5 ) membank("bankwf")->configure_entries(0, 50, &RAM[0], 0x1000); } -static MACHINE_CONFIG_START( altos5 ) +MACHINE_CONFIG_START(altos5_state::altos5) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/altos8600.cpp b/src/mame/drivers/altos8600.cpp index af9ddbb1615..fb45b6911ac 100644 --- a/src/mame/drivers/altos8600.cpp +++ b/src/mame/drivers/altos8600.cpp @@ -66,6 +66,7 @@ public: DECLARE_WRITE_LINE_MEMBER(sintr1_w); DECLARE_WRITE8_MEMBER(ics_attn_w); IRQ_CALLBACK_MEMBER(inta); + void altos8600(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -677,7 +678,7 @@ static SLOT_INTERFACE_START(altos8600_floppies) SLOT_INTERFACE( "8dd", FLOPPY_8_DSDD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START(altos8600) +MACHINE_CONFIG_START(altos8600_state::altos8600) MCFG_CPU_ADD("maincpu", I8086, XTAL_5MHz) MCFG_CPU_PROGRAM_MAP(cpu_mem) MCFG_CPU_IO_MAP(cpu_io) diff --git a/src/mame/drivers/alvg.cpp b/src/mame/drivers/alvg.cpp index 0351fbc16cc..44388c2aef3 100644 --- a/src/mame/drivers/alvg.cpp +++ b/src/mame/drivers/alvg.cpp @@ -12,6 +12,7 @@ public: m_maincpu(*this, "maincpu") { } + void alvg(machine_config &config); protected: // devices @@ -41,7 +42,7 @@ DRIVER_INIT_MEMBER(alvg_state,alvg) { } -static MACHINE_CONFIG_START( alvg ) +MACHINE_CONFIG_START(alvg_state::alvg) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65C02, 2000000) MCFG_CPU_PROGRAM_MAP(alvg_map) diff --git a/src/mame/drivers/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp index 3a4e47df2bb..d3cfc480345 100644 --- a/src/mame/drivers/amaticmg.cpp +++ b/src/mame/drivers/amaticmg.cpp @@ -466,6 +466,9 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void amaticmg2(machine_config &config); + void amaticmg(machine_config &config); + void amaticmg4(machine_config &config); }; @@ -821,7 +824,7 @@ void amaticmg_state::machine_reset() * Machine Drivers * ************************************/ -static MACHINE_CONFIG_START( amaticmg ) +MACHINE_CONFIG_START(amaticmg_state::amaticmg) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* WRONG! */ MCFG_CPU_PROGRAM_MAP(amaticmg_map) @@ -874,7 +877,7 @@ INTERRUPT_GEN_MEMBER(amaticmg_state::amaticmg2_irq) } -static MACHINE_CONFIG_DERIVED( amaticmg2, amaticmg ) +MACHINE_CONFIG_DERIVED(amaticmg_state::amaticmg2, amaticmg) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(amaticmg2_portmap) @@ -892,7 +895,7 @@ static MACHINE_CONFIG_DERIVED( amaticmg2, amaticmg ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( amaticmg4, amaticmg ) +MACHINE_CONFIG_DERIVED(amaticmg_state::amaticmg4, amaticmg) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(amaticmg4_portmap) diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp index d870631d5af..4d11d18004d 100644 --- a/src/mame/drivers/ambush.cpp +++ b/src/mame/drivers/ambush.cpp @@ -95,6 +95,9 @@ public: DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); DECLARE_WRITE8_MEMBER(output_latches_w); + void mariobl(machine_config &config); + void ambush(machine_config &config); + void dkong3abl(machine_config &config); private: void register_save_states(); @@ -678,7 +681,7 @@ WRITE8_MEMBER(ambush_state::output_latches_w) // MACHINE DEFINTIONS //************************************************************************** -static MACHINE_CONFIG_START( ambush ) +MACHINE_CONFIG_START(ambush_state::ambush) MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_IO_MAP(main_portmap) @@ -719,7 +722,7 @@ static MACHINE_CONFIG_START( ambush ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mariobl, ambush ) +MACHINE_CONFIG_DERIVED(ambush_state::mariobl, ambush) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bootleg_map) @@ -749,7 +752,7 @@ static MACHINE_CONFIG_DERIVED( mariobl, ambush ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dkong3abl, mariobl ) +MACHINE_CONFIG_DERIVED(ambush_state::dkong3abl, mariobl) MCFG_MACHINE_START_OVERRIDE(ambush_state, dkong3abl) MCFG_GFXDECODE_MODIFY("gfxdecode", dkong3abl) diff --git a/src/mame/drivers/amerihok.cpp b/src/mame/drivers/amerihok.cpp index d8ab7bb1f94..337d1ec2ace 100644 --- a/src/mame/drivers/amerihok.cpp +++ b/src/mame/drivers/amerihok.cpp @@ -40,6 +40,7 @@ public: required_device m_maincpu; required_device m_oki; + void amerihok(machine_config &config); }; WRITE8_MEMBER(amerihok_state::control_w) @@ -71,7 +72,7 @@ void amerihok_state::machine_reset() } -static MACHINE_CONFIG_START( amerihok ) +MACHINE_CONFIG_START(amerihok_state::amerihok) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z8681, XTAL_12MHz) diff --git a/src/mame/drivers/amico2k.cpp b/src/mame/drivers/amico2k.cpp index ea6d890008d..19d78817b5b 100644 --- a/src/mame/drivers/amico2k.cpp +++ b/src/mame/drivers/amico2k.cpp @@ -57,6 +57,7 @@ public: emu_timer *m_led_refresh_timer; TIMER_CALLBACK_MEMBER(led_refresh); required_device m_maincpu; + void amico2k(machine_config &config); }; @@ -206,7 +207,7 @@ void amico2k_state::machine_start() save_item(NAME(m_segment)); } -static MACHINE_CONFIG_START( amico2k ) +MACHINE_CONFIG_START(amico2k_state::amico2k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1MHz */ MCFG_CPU_PROGRAM_MAP(amico2k_mem) diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp index 48576dd2cd3..0df199e8def 100644 --- a/src/mame/drivers/amiga.cpp +++ b/src/mame/drivers/amiga.cpp @@ -45,6 +45,8 @@ public: DECLARE_WRITE16_MEMBER( write_protect_w ); + void a1000(machine_config &config); + void a1000n(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -75,6 +77,8 @@ public: DECLARE_READ16_MEMBER( clock_r ); DECLARE_WRITE16_MEMBER( clock_w ); + void a2000(machine_config &config); + void a2000n(machine_config &config); protected: virtual void machine_reset() override; @@ -108,6 +112,8 @@ public: DECLARE_WRITE_LINE_MEMBER( side_int2_w ); DECLARE_WRITE_LINE_MEMBER( side_int6_w ); + void a500n(machine_config &config); + void a500(machine_config &config); protected: virtual void machine_reset() override; @@ -152,6 +158,8 @@ public: DECLARE_WRITE8_MEMBER( tpi_port_b_write ); DECLARE_WRITE_LINE_MEMBER( tpi_int_w ); + void cdtv(machine_config &config); + void cdtvn(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -187,6 +195,8 @@ public: DECLARE_DRIVER_INIT( pal ); DECLARE_DRIVER_INIT( ntsc ); + void a3000(machine_config &config); + void a3000n(machine_config &config); protected: private: @@ -209,6 +219,8 @@ public: DECLARE_DRIVER_INIT( pal ); DECLARE_DRIVER_INIT( ntsc ); + void a500pn(machine_config &config); + void a500p(machine_config &config); protected: virtual void machine_reset() override; @@ -241,6 +253,8 @@ public: static const uint8_t GAYLE_ID = 0xd0; + void a600n(machine_config &config); + void a600(machine_config &config); protected: virtual bool int2_pending() override; @@ -263,6 +277,8 @@ public: static const uint8_t GAYLE_ID = 0xd1; + void a1200(machine_config &config); + void a1200n(machine_config &config); protected: virtual bool int2_pending() override; @@ -294,6 +310,12 @@ public: DECLARE_DRIVER_INIT( pal ); DECLARE_DRIVER_INIT( ntsc ); + void a400030n(machine_config &config); + void a4000tn(machine_config &config); + void a4000t(machine_config &config); + void a4000n(machine_config &config); + void a4000(machine_config &config); + void a400030(machine_config &config); protected: private: @@ -333,6 +355,8 @@ public: int m_cd32_shifter[2]; uint16_t m_potgo_value; + void cd32n(machine_config &config); + void cd32(machine_config &config); protected: // amiga_state overrides virtual void potgo_w(uint16_t data) override; @@ -1310,7 +1334,7 @@ static SLOT_INTERFACE_START( amiga_floppies ) SLOT_INTERFACE_END // basic elements common to all amigas -static MACHINE_CONFIG_START( amiga_base ) +MACHINE_CONFIG_START(amiga_state::amiga_base) // video MCFG_FRAGMENT_ADD(pal_video) @@ -1389,7 +1413,7 @@ static MACHINE_CONFIG_START( amiga_base ) MCFG_SOFTWARE_LIST_ADD("ocs_list", "amigaocs_flop") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a1000, amiga_base ) +MACHINE_CONFIG_DERIVED(a1000_state::a1000, amiga_base) // main cpu MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL) MCFG_CPU_PROGRAM_MAP(a1000_mem) @@ -1411,7 +1435,7 @@ static MACHINE_CONFIG_DERIVED( a1000, amiga_base ) MCFG_SOFTWARE_LIST_ADD("a1000_list", "amiga_a1000") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a1000n, a1000 ) +MACHINE_CONFIG_DERIVED(a1000_state::a1000n, a1000) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MCFG_DEVICE_REMOVE("screen") @@ -1426,7 +1450,7 @@ static MACHINE_CONFIG_DERIVED( a1000n, a1000 ) MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a2000, amiga_base ) +MACHINE_CONFIG_DERIVED(a2000_state::a2000, amiga_base) // main cpu MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL) MCFG_CPU_PROGRAM_MAP(a2000_mem) @@ -1455,7 +1479,7 @@ static MACHINE_CONFIG_DERIVED( a2000, amiga_base ) MCFG_ZORRO2_SLOT_ADD("zorro5", zorro2_cards, nullptr) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a2000n, a2000 ) +MACHINE_CONFIG_DERIVED(a2000_state::a2000n, a2000) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MCFG_DEVICE_REMOVE("screen") @@ -1470,7 +1494,7 @@ static MACHINE_CONFIG_DERIVED( a2000n, a2000 ) MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a500, amiga_base ) +MACHINE_CONFIG_DERIVED(a500_state::a500, amiga_base) // main cpu MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL) MCFG_CPU_PROGRAM_MAP(a500_mem) @@ -1489,7 +1513,7 @@ static MACHINE_CONFIG_DERIVED( a500, amiga_base ) MCFG_EXPANSION_SLOT_INT6_HANDLER(WRITELINE(a500_state, side_int6_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a500n, a500 ) +MACHINE_CONFIG_DERIVED(a500_state::a500n, a500) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MCFG_DEVICE_REMOVE("screen") @@ -1504,7 +1528,7 @@ static MACHINE_CONFIG_DERIVED( a500n, a500 ) MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cdtv, amiga_base ) +MACHINE_CONFIG_DERIVED(cdtv_state::cdtv, amiga_base) // main cpu MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL) MCFG_CPU_PROGRAM_MAP(cdtv_mem) @@ -1561,7 +1585,7 @@ static MACHINE_CONFIG_DERIVED( cdtv, amiga_base ) MCFG_SOFTWARE_LIST_ADD("cd_list", "cdtv") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cdtvn, cdtv ) +MACHINE_CONFIG_DERIVED(cdtv_state::cdtvn, cdtv) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MCFG_DEVICE_REMOVE("screen") @@ -1578,7 +1602,7 @@ static MACHINE_CONFIG_DERIVED( cdtvn, cdtv ) MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a3000, amiga_base ) +MACHINE_CONFIG_DERIVED(a3000_state::a3000, amiga_base) // main cpu MCFG_CPU_ADD("maincpu", M68030, XTAL_32MHz / 2) MCFG_CPU_PROGRAM_MAP(a3000_mem) @@ -1600,7 +1624,7 @@ static MACHINE_CONFIG_DERIVED( a3000, amiga_base ) MCFG_SOFTWARE_LIST_ADD("ecs_list", "amigaecs_flop") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a3000n, a3000 ) +MACHINE_CONFIG_DERIVED(a3000_state::a3000n, a3000) MCFG_DEVICE_REMOVE("screen") MCFG_FRAGMENT_ADD(ntsc_video) MCFG_DEVICE_MODIFY("cia_0") @@ -1611,7 +1635,7 @@ static MACHINE_CONFIG_DERIVED( a3000n, a3000 ) MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a500p, amiga_base ) +MACHINE_CONFIG_DERIVED(a500p_state::a500p, amiga_base) // main cpu MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL) MCFG_CPU_PROGRAM_MAP(a500p_mem) @@ -1633,7 +1657,7 @@ static MACHINE_CONFIG_DERIVED( a500p, amiga_base ) MCFG_SOFTWARE_LIST_ADD("ecs_list", "amigaecs_flop") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a500pn, a500p ) +MACHINE_CONFIG_DERIVED(a500p_state::a500pn, a500p) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MCFG_DEVICE_REMOVE("screen") @@ -1648,7 +1672,7 @@ static MACHINE_CONFIG_DERIVED( a500pn, a500p ) MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a600, amiga_base ) +MACHINE_CONFIG_DERIVED(a600_state::a600, amiga_base) // main cpu MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL) MCFG_CPU_PROGRAM_MAP(a600_mem) @@ -1676,7 +1700,7 @@ static MACHINE_CONFIG_DERIVED( a600, amiga_base ) MCFG_SOFTWARE_LIST_ADD("ecs_list", "amigaecs_flop") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a600n, a600 ) +MACHINE_CONFIG_DERIVED(a600_state::a600n, a600) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MCFG_DEVICE_MODIFY("gayle") @@ -1693,7 +1717,7 @@ static MACHINE_CONFIG_DERIVED( a600n, a600 ) MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a1200, amiga_base ) +MACHINE_CONFIG_DERIVED(a1200_state::a1200, amiga_base) // main cpu MCFG_CPU_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2) MCFG_CPU_PROGRAM_MAP(a1200_mem) @@ -1736,7 +1760,7 @@ static MACHINE_CONFIG_DERIVED( a1200, amiga_base ) MCFG_SOFTWARE_LIST_ADD("ecs_list", "amigaecs_flop") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a1200n, a1200 ) +MACHINE_CONFIG_DERIVED(a1200_state::a1200n, a1200) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_28M_NTSC / 2) MCFG_DEVICE_MODIFY("gayle") @@ -1756,7 +1780,7 @@ static MACHINE_CONFIG_DERIVED( a1200n, a1200 ) MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a4000, amiga_base ) +MACHINE_CONFIG_DERIVED(a4000_state::a4000, amiga_base) // main cpu MCFG_CPU_ADD("maincpu", M68040, XTAL_50MHz / 2) MCFG_CPU_PROGRAM_MAP(a4000_mem) @@ -1790,7 +1814,7 @@ static MACHINE_CONFIG_DERIVED( a4000, amiga_base ) MCFG_SOFTWARE_LIST_ADD("ecs_list", "amigaecs_flop") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a4000n, a4000 ) +MACHINE_CONFIG_DERIVED(a4000_state::a4000n, a4000) MCFG_DEVICE_REMOVE("screen") MCFG_FRAGMENT_ADD(ntsc_video) MCFG_DEVICE_MODIFY("screen") @@ -1806,7 +1830,7 @@ static MACHINE_CONFIG_DERIVED( a4000n, a4000 ) MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a400030, a4000 ) +MACHINE_CONFIG_DERIVED(a4000_state::a400030, a4000) // main cpu MCFG_DEVICE_REMOVE("maincpu") MCFG_CPU_ADD("maincpu", M68EC030, XTAL_50MHz / 2) @@ -1815,7 +1839,7 @@ static MACHINE_CONFIG_DERIVED( a400030, a4000 ) // todo: ide MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a400030n, a400030 ) +MACHINE_CONFIG_DERIVED(a4000_state::a400030n, a400030) MCFG_DEVICE_REMOVE("screen") MCFG_FRAGMENT_ADD(ntsc_video) MCFG_DEVICE_MODIFY("screen") @@ -1831,7 +1855,7 @@ static MACHINE_CONFIG_DERIVED( a400030n, a400030 ) MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cd32, amiga_base ) +MACHINE_CONFIG_DERIVED(cd32_state::cd32, amiga_base) // main cpu MCFG_CPU_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2) MCFG_CPU_PROGRAM_MAP(cd32_mem) @@ -1877,7 +1901,7 @@ static MACHINE_CONFIG_DERIVED( cd32, amiga_base ) MCFG_DEVICE_REMOVE("kbd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cd32n, cd32 ) +MACHINE_CONFIG_DERIVED(cd32_state::cd32n, cd32) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(amiga_state::CLK_28M_NTSC / 2) MCFG_DEVICE_REMOVE("screen") @@ -1895,7 +1919,7 @@ static MACHINE_CONFIG_DERIVED( cd32n, cd32 ) MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a4000t, a4000 ) +MACHINE_CONFIG_DERIVED(a4000_state::a4000t, a4000) // main cpu MCFG_DEVICE_REMOVE("maincpu") MCFG_CPU_ADD("maincpu", M68040, XTAL_50MHz / 2) @@ -1904,7 +1928,7 @@ static MACHINE_CONFIG_DERIVED( a4000t, a4000 ) // todo: ide, zorro3, scsi, super dmac MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a4000tn, a4000 ) +MACHINE_CONFIG_DERIVED(a4000_state::a4000tn, a4000) MCFG_DEVICE_REMOVE("screen") MCFG_FRAGMENT_ADD(ntsc_video) MCFG_DEVICE_MODIFY("screen") diff --git a/src/mame/drivers/ampex.cpp b/src/mame/drivers/ampex.cpp index a3c1889053d..a0e6dcbd693 100644 --- a/src/mame/drivers/ampex.cpp +++ b/src/mame/drivers/ampex.cpp @@ -36,6 +36,7 @@ public: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void ampex(machine_config &config); private: required_device m_maincpu; required_region_ptr m_p_chargen; @@ -60,7 +61,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( ampex ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ampex ) +MACHINE_CONFIG_START(ampex_state::ampex) MCFG_CPU_ADD("maincpu", Z80, XTAL_23_814MHz / 9) // clocked by 8224? MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp index f698d41b99a..3a7179fbd36 100644 --- a/src/mame/drivers/ampoker2.cpp +++ b/src/mame/drivers/ampoker2.cpp @@ -1139,7 +1139,7 @@ GFXDECODE_END * Machine Driver * *************************/ -static MACHINE_CONFIG_START( ampoker2 ) +MACHINE_CONFIG_START(ampoker2_state::ampoker2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/2) /* 3 MHz */ @@ -1173,7 +1173,7 @@ static MACHINE_CONFIG_START( ampoker2 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sigma2k, ampoker2 ) +MACHINE_CONFIG_DERIVED(ampoker2_state::sigma2k, ampoker2) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", sigma2k) diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp index 4d3a9ac78f9..749e4675bf5 100644 --- a/src/mame/drivers/ampro.cpp +++ b/src/mame/drivers/ampro.cpp @@ -51,6 +51,7 @@ public: DECLARE_READ8_MEMBER(io_r); DECLARE_WRITE8_MEMBER(io_w); + void ampro(machine_config &config); private: required_device m_maincpu; required_device m_dart; @@ -143,7 +144,7 @@ DRIVER_INIT_MEMBER( ampro_state, ampro ) membank("bankw0")->configure_entry(0, &main[0x0000]); } -static MACHINE_CONFIG_START( ampro ) +MACHINE_CONFIG_START(ampro_state::ampro) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(ampro_mem) diff --git a/src/mame/drivers/ampscarp.cpp b/src/mame/drivers/ampscarp.cpp index 77a28708bea..e6041d68395 100644 --- a/src/mame/drivers/ampscarp.cpp +++ b/src/mame/drivers/ampscarp.cpp @@ -18,6 +18,7 @@ public: // , m_maincpu(*this, "maincpu") { } +void ampscarp(machine_config &config); private: // required_device m_maincpu; }; @@ -28,7 +29,7 @@ private: static INPUT_PORTS_START( ampscarp ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ampscarp ) +MACHINE_CONFIG_START(ampscarp_state::ampscarp) MACHINE_CONFIG_END ROM_START( ampscarp ) diff --git a/src/mame/drivers/amspdwy.cpp b/src/mame/drivers/amspdwy.cpp index a978d8e7bb3..bfd8c133ac6 100644 --- a/src/mame/drivers/amspdwy.cpp +++ b/src/mame/drivers/amspdwy.cpp @@ -244,7 +244,7 @@ void amspdwy_state::machine_reset() m_wheel_return[1] = 0; } -static MACHINE_CONFIG_START( amspdwy ) +MACHINE_CONFIG_START(amspdwy_state::amspdwy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3000000) diff --git a/src/mame/drivers/amstr_pc.cpp b/src/mame/drivers/amstr_pc.cpp index af95117aa6f..d0a09fa54f3 100644 --- a/src/mame/drivers/amstr_pc.cpp +++ b/src/mame/drivers/amstr_pc.cpp @@ -85,6 +85,11 @@ public: uint8_t m_port65; int m_dipstate; + static void cfg_com(device_t *device); + void pc200(machine_config &config); + void pc2086(machine_config &config); + void ppc640(machine_config &config); + void ppc512(machine_config &config); }; static ADDRESS_MAP_START( ppc640_map, AS_PROGRAM, 16, amstrad_pc_state ) @@ -464,12 +469,13 @@ INPUT_PORTS_END // GFXDECODE_END // has it's own mouse -static MACHINE_CONFIG_START( cfg_com ) - MCFG_DEVICE_MODIFY("serport0") +void amstrad_pc_state::cfg_com(device_t *device) +{ + device = device->subdevice("serport0"); MCFG_SLOT_DEFAULT_OPTION(nullptr) -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_START( pc200 ) +MACHINE_CONFIG_START(amstrad_pc_state::pc200) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, 8000000) MCFG_CPU_PROGRAM_MAP(ppc640_map) @@ -506,12 +512,12 @@ static MACHINE_CONFIG_START( pc200 ) MCFG_RAM_EXTRA_OPTIONS("512K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc2086, pc200 ) +MACHINE_CONFIG_DERIVED(amstrad_pc_state::pc2086, pc200) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pc2086_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ppc640, pc200 ) +MACHINE_CONFIG_DERIVED(amstrad_pc_state::ppc640, pc200) MCFG_CPU_REPLACE("maincpu", V30, 8000000) MCFG_CPU_PROGRAM_MAP(ppc640_map) MCFG_CPU_IO_MAP(ppc512_io) @@ -523,7 +529,7 @@ static MACHINE_CONFIG_DERIVED( ppc640, pc200 ) MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ppc512, ppc640 ) +MACHINE_CONFIG_DERIVED(amstrad_pc_state::ppc512, ppc640) MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("512K") MCFG_RAM_EXTRA_OPTIONS("640K") diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp index 6cdb0505ab9..af49931da6e 100644 --- a/src/mame/drivers/amstrad.cpp +++ b/src/mame/drivers/amstrad.cpp @@ -807,7 +807,7 @@ FLOPPY_FORMATS_MEMBER( amstrad_state::aleste_floppy_formats ) FLOPPY_MSX_FORMAT FLOPPY_FORMATS_END -static MACHINE_CONFIG_START( cpcplus_cartslot ) +MACHINE_CONFIG_START(amstrad_state::cpcplus_cartslot) MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "gx4000_cart") MCFG_GENERIC_EXTENSIONS("bin,cpr") MCFG_GENERIC_MANDATORY @@ -898,7 +898,7 @@ SLOT_INTERFACE_START(amstrad_centronics_devices) SLOT_INTERFACE("digiblst", CENTRONICS_DIGIBLASTER) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( amstrad_base ) +MACHINE_CONFIG_START(amstrad_state::amstrad_base) /* Machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(amstrad_mem) @@ -961,7 +961,7 @@ static MACHINE_CONFIG_START( amstrad_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cpc464, amstrad_base ) +MACHINE_CONFIG_DERIVED(amstrad_state::cpc464, amstrad_base) MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0) MCFG_DEVICE_SLOT_INTERFACE(cpc464_exp_cards, nullptr, false) MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(INPUTLINE("maincpu", 0)) @@ -975,7 +975,7 @@ static MACHINE_CONFIG_DERIVED( cpc464, amstrad_base ) MCFG_RAM_EXTRA_OPTIONS("128K,320K,576K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cpc664, amstrad_base ) +MACHINE_CONFIG_DERIVED(amstrad_state::cpc664, amstrad_base) MCFG_UPD765A_ADD("upd765", true, true) MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "35ssdd", floppy_image_device::default_floppy_formats) @@ -994,7 +994,7 @@ static MACHINE_CONFIG_DERIVED( cpc664, amstrad_base ) MCFG_RAM_EXTRA_OPTIONS("128K,320K,576K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cpc6128, amstrad_base ) +MACHINE_CONFIG_DERIVED(amstrad_state::cpc6128, amstrad_base) MCFG_UPD765A_ADD("upd765", true, true) MCFG_FLOPPY_DRIVE_ADD("upd765:0", amstrad_floppies, "3ssdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("upd765:1", amstrad_floppies, "35ssdd", floppy_image_device::default_floppy_formats) @@ -1014,7 +1014,7 @@ static MACHINE_CONFIG_DERIVED( cpc6128, amstrad_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kccomp, cpc6128 ) +MACHINE_CONFIG_DERIVED(amstrad_state::kccomp, cpc6128) MCFG_MACHINE_START_OVERRIDE(amstrad_state,kccomp) MCFG_MACHINE_RESET_OVERRIDE(amstrad_state,kccomp) @@ -1023,7 +1023,7 @@ static MACHINE_CONFIG_DERIVED( kccomp, cpc6128 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cpcplus ) +MACHINE_CONFIG_START(amstrad_state::cpcplus) /* Machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_40MHz / 10) MCFG_CPU_PROGRAM_MAP(amstrad_mem) @@ -1102,7 +1102,7 @@ static MACHINE_CONFIG_START( cpcplus ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gx4000 ) +MACHINE_CONFIG_START(amstrad_state::gx4000) /* Machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_40MHz / 10) MCFG_CPU_PROGRAM_MAP(amstrad_mem) @@ -1154,7 +1154,7 @@ static MACHINE_CONFIG_START( gx4000 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aleste, cpc6128 ) +MACHINE_CONFIG_DERIVED(amstrad_state::aleste, cpc6128) MCFG_MACHINE_START_OVERRIDE(amstrad_state,aleste) MCFG_MACHINE_RESET_OVERRIDE(amstrad_state,aleste) diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp index af39e4757e3..5137cf5d78e 100644 --- a/src/mame/drivers/amusco.cpp +++ b/src/mame/drivers/amusco.cpp @@ -127,6 +127,8 @@ public: MC6845_ON_UPDATE_ADDR_CHANGED(crtc_addr); MC6845_UPDATE_ROW(update_row); DECLARE_PALETTE_INIT(amusco); + void amusco(machine_config &config); + void draw88pkr(machine_config &config); protected: virtual void video_start() override; virtual void machine_start() override; @@ -520,7 +522,7 @@ PALETTE_INIT_MEMBER(amusco_state,amusco) * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( amusco ) +MACHINE_CONFIG_START(amusco_state::amusco) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, CPU_CLOCK) // 5 MHz ? @@ -587,7 +589,7 @@ static MACHINE_CONFIG_START( amusco ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( draw88pkr, amusco ) +MACHINE_CONFIG_DERIVED(amusco_state::draw88pkr, amusco) //MCFG_DEVICE_MODIFY("ppi_outputs") // Some bits are definitely different MACHINE_CONFIG_END diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp index 6a7b8db8d4b..ccdfaf50b5d 100644 --- a/src/mame/drivers/amust.cpp +++ b/src/mame/drivers/amust.cpp @@ -131,6 +131,7 @@ public: INTERRUPT_GEN_MEMBER(irq_vs); MC6845_UPDATE_ROW(crtc_update_row); + void amust(machine_config &config); private: u8 m_port04; u8 m_port06; @@ -370,7 +371,7 @@ DRIVER_INIT_MEMBER( amust_state, amust ) membank("bankw0")->configure_entry(0, &main[0xf800]); } -static MACHINE_CONFIG_START( amust ) +MACHINE_CONFIG_START(amust_state::amust) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/anes.cpp b/src/mame/drivers/anes.cpp index 7a3823c91f9..38bce775911 100644 --- a/src/mame/drivers/anes.cpp +++ b/src/mame/drivers/anes.cpp @@ -41,6 +41,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void anes(machine_config &config); protected: virtual void machine_start() override; @@ -149,7 +150,7 @@ void anes_state::machine_start() -static MACHINE_CONFIG_START( anes ) +MACHINE_CONFIG_START(anes_state::anes) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 2) // Z0840008PSC MCFG_CPU_PROGRAM_MAP(prg_map) diff --git a/src/mame/drivers/angelkds.cpp b/src/mame/drivers/angelkds.cpp index a544e2358ca..16858a22253 100644 --- a/src/mame/drivers/angelkds.cpp +++ b/src/mame/drivers/angelkds.cpp @@ -511,7 +511,7 @@ void angelkds_state::machine_reset() m_bgtopbank = 0; } -static MACHINE_CONFIG_START( angelkds ) +MACHINE_CONFIG_START(angelkds_state::angelkds) MCFG_CPU_ADD("maincpu", Z80, XTAL_6MHz) MCFG_CPU_PROGRAM_MAP(main_map) @@ -565,7 +565,7 @@ static MACHINE_CONFIG_START( angelkds ) MCFG_SOUND_ROUTE(3, "mono", 0.45) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spcpostn, angelkds ) +MACHINE_CONFIG_DERIVED(angelkds_state::spcpostn, angelkds) /* encryption */ MCFG_CPU_REPLACE("maincpu", SEGA_317_0005, XTAL_6MHz) MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/anzterm.cpp b/src/mame/drivers/anzterm.cpp index cfdc746b3f0..eb491fa3a4a 100644 --- a/src/mame/drivers/anzterm.cpp +++ b/src/mame/drivers/anzterm.cpp @@ -367,6 +367,7 @@ public: { return 0; } + void anzterm(machine_config &config); }; @@ -408,7 +409,7 @@ ADDRESS_MAP_START( anzterm, AS_PROGRAM, 8, anzterm_state ) ADDRESS_MAP_END -MACHINE_CONFIG_START( anzterm ) +MACHINE_CONFIG_START(anzterm_state::anzterm) MCFG_CPU_ADD("maincpu", M6809, 15974400/4) MCFG_CPU_PROGRAM_MAP(anzterm) diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp index a57bea333b5..f20879d0936 100644 --- a/src/mame/drivers/apc.cpp +++ b/src/mame/drivers/apc.cpp @@ -153,6 +153,7 @@ public: UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); + void apc(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -909,7 +910,7 @@ static SLOT_INTERFACE_START( apc_floppies ) SLOT_INTERFACE( "8", FLOPPY_8_DSDD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( apc ) +MACHINE_CONFIG_START(apc_state::apc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8086,MAIN_CLOCK) diff --git a/src/mame/drivers/apexc.cpp b/src/mame/drivers/apexc.cpp index 4335bad4df0..95443f9ddbc 100644 --- a/src/mame/drivers/apexc.cpp +++ b/src/mame/drivers/apexc.cpp @@ -52,6 +52,7 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_screen; + void apexc(machine_config &config); }; void apexc_state::machine_start() @@ -853,7 +854,7 @@ static ADDRESS_MAP_START(apexc_mem_map, AS_PROGRAM, 32, apexc_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( apexc ) +MACHINE_CONFIG_START(apexc_state::apexc) /* basic machine hardware */ /* APEXC CPU @ 2.0 kHz (memory word clock frequency) */ diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp index 0a9beac6e05..1d0ef3dfad2 100644 --- a/src/mame/drivers/apf.cpp +++ b/src/mame/drivers/apf.cpp @@ -121,6 +121,8 @@ public: DECLARE_READ8_MEMBER(serial_r); DECLARE_WRITE8_MEMBER(serial_w); + void apfm1000(machine_config &config); + void apfimag(machine_config &config); private: uint8_t m_latch; uint8_t m_keyboard_data; @@ -508,7 +510,7 @@ static SLOT_INTERFACE_START(apf_cart) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( apfm1000 ) +MACHINE_CONFIG_START(apf_state::apfm1000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_3_579545MHz / 4 ) // divided by 4 in external clock circuit @@ -544,7 +546,7 @@ static MACHINE_CONFIG_START( apfm1000 ) MCFG_SOFTWARE_LIST_ADD("cart_list", "apfm1000") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apfimag, apfm1000 ) +MACHINE_CONFIG_DERIVED(apf_state::apfimag, apfm1000) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( apfimag_map) diff --git a/src/mame/drivers/apogee.cpp b/src/mame/drivers/apogee.cpp index 5c482f4c071..0fc0b837bd5 100644 --- a/src/mame/drivers/apogee.cpp +++ b/src/mame/drivers/apogee.cpp @@ -42,6 +42,7 @@ public: I8275_DRAW_CHARACTER_MEMBER(display_pixels); required_device m_speaker; + void apogee(machine_config &config); }; @@ -212,7 +213,7 @@ GFXDECODE_END /* Machine driver */ -static MACHINE_CONFIG_START( apogee ) +MACHINE_CONFIG_START(apogee_state::apogee) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_16MHz / 9) MCFG_CPU_PROGRAM_MAP(apogee_mem) diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp index a6694589fe2..714cf19496f 100644 --- a/src/mame/drivers/apollo.cpp +++ b/src/mame/drivers/apollo.cpp @@ -1050,7 +1050,7 @@ READ_LINE_MEMBER( apollo_state::apollo_kbd_is_german ) MACHINE DRIVERS ***************************************************************************/ -static MACHINE_CONFIG_START( dn3500 ) +MACHINE_CONFIG_START(apollo_state::dn3500) /* basic machine hardware */ MCFG_CPU_ADD(MAINCPU, M68030, 25000000) /* 25 MHz 68030 */ MCFG_CPU_PROGRAM_MAP(dn3500_map) @@ -1076,7 +1076,7 @@ static MACHINE_CONFIG_START( dn3500 ) #endif MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dsp3500 ) +MACHINE_CONFIG_START(apollo_state::dsp3500) MCFG_CPU_ADD(MAINCPU, M68030, 25000000) /* 25 MHz 68030 */ MCFG_CPU_PROGRAM_MAP(dsp3500_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge) @@ -1098,7 +1098,7 @@ static MACHINE_CONFIG_START( dsp3500 ) MCFG_DEFAULT_LAYOUT( layout_apollo_dsp ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dn3500_19i, dn3500 ) +MACHINE_CONFIG_DERIVED(apollo_state::dn3500_19i, dn3500) /* video hardware 19" monochrome */ MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) @@ -1106,7 +1106,7 @@ static MACHINE_CONFIG_DERIVED( dn3500_19i, dn3500 ) MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dn3500_15i, dn3500 ) +MACHINE_CONFIG_DERIVED(apollo_state::dn3500_15i, dn3500) /* video hardware is 15" monochrome or color */ MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) @@ -1114,7 +1114,7 @@ static MACHINE_CONFIG_DERIVED( dn3500_15i, dn3500 ) MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dn3000, dn3500 ) +MACHINE_CONFIG_DERIVED(apollo_state::dn3000, dn3500) MCFG_CPU_REPLACE(MAINCPU, M68020PMMU, 12000000) /* 12 MHz */ MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge) MCFG_CPU_PROGRAM_MAP(dn3000_map) @@ -1124,7 +1124,7 @@ static MACHINE_CONFIG_DERIVED( dn3000, dn3500 ) MCFG_RAM_EXTRA_OPTIONS("4M") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dsp3000 ) +MACHINE_CONFIG_START(apollo_state::dsp3000) MCFG_CPU_ADD(MAINCPU, M68020PMMU, 12000000) /* 12 MHz */ MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge) MCFG_CPU_PROGRAM_MAP(dsp3000_map) @@ -1149,7 +1149,7 @@ static MACHINE_CONFIG_START( dsp3000 ) MCFG_DEFAULT_LAYOUT( layout_apollo_dsp ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dn3000_19i, dn3000 ) +MACHINE_CONFIG_DERIVED(apollo_state::dn3000_19i, dn3000) /* video hardware 19" monochrome */ MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) @@ -1157,7 +1157,7 @@ static MACHINE_CONFIG_DERIVED( dn3000_19i, dn3000 ) MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dn3000_15i, dn3000 ) +MACHINE_CONFIG_DERIVED(apollo_state::dn3000_15i, dn3000) /* video hardware 15" monochrome */ MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) @@ -1165,12 +1165,12 @@ static MACHINE_CONFIG_DERIVED( dn3000_15i, dn3000 ) MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dn5500, dn3500 ) +MACHINE_CONFIG_DERIVED(apollo_state::dn5500, dn3500) MCFG_CPU_REPLACE(MAINCPU, M68040, 25000000) /* 25 MHz */ MCFG_CPU_PROGRAM_MAP(dn5500_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dsp5500 ) +MACHINE_CONFIG_START(apollo_state::dsp5500) MCFG_CPU_ADD(MAINCPU, M68040, 25000000) /* 25 MHz */ MCFG_CPU_PROGRAM_MAP(dsp5500_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge) @@ -1187,7 +1187,7 @@ static MACHINE_CONFIG_START( dsp5500 ) MCFG_DEFAULT_LAYOUT( layout_apollo_dsp ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dn5500_19i, dn5500 ) +MACHINE_CONFIG_DERIVED(apollo_state::dn5500_19i, dn5500) /* video hardware 19" monochrome */ MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) @@ -1195,7 +1195,7 @@ static MACHINE_CONFIG_DERIVED( dn5500_19i, dn5500 ) MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dn5500_15i, dn5500 ) +MACHINE_CONFIG_DERIVED(apollo_state::dn5500_15i, dn5500) /* video hardware 15" monochrome */ MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG) MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0) diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp index 18c8dc81fe4..faf37205dad 100644 --- a/src/mame/drivers/apple1.cpp +++ b/src/mame/drivers/apple1.cpp @@ -126,6 +126,7 @@ public: TIMER_CALLBACK_MEMBER(ready_end_cb); TIMER_CALLBACK_MEMBER(keyboard_strobe_cb); + void apple1(machine_config &config); private: uint8_t *m_ram_ptr, *m_char_ptr; int m_ram_size, m_char_size; @@ -585,7 +586,7 @@ static SLOT_INTERFACE_START(apple1_cards) SLOT_INTERFACE("cffa", A1BUS_CFFA) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( apple1 ) +MACHINE_CONFIG_START(apple1_state::apple1) MCFG_CPU_ADD(A1_CPU_TAG, M6502, 960000) // effective CPU speed MCFG_CPU_PROGRAM_MAP(apple1_map) diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp index 2f9fe56a8c2..aa7decd6ed6 100644 --- a/src/mame/drivers/apple2.cpp +++ b/src/mame/drivers/apple2.cpp @@ -184,6 +184,11 @@ public: DECLARE_WRITE_LINE_MEMBER(ay3600_data_ready_w); DECLARE_WRITE_LINE_MEMBER(ay3600_ako_w); + void apple2_common(machine_config &config); + void apple2jp(machine_config &config); + void apple2(machine_config &config); + void space84(machine_config &config); + void apple2p(machine_config &config); private: int m_speaker_state; int m_cassette_state; @@ -1353,7 +1358,7 @@ static SLOT_INTERFACE_START(apple2_cards) // SLOT_INTERFACE("magicmusician", A2BUS_MAGICMUSICIAN) /* Magic Musician Card */ SLOT_INTERFACE_END -static MACHINE_CONFIG_START( apple2_common ) +MACHINE_CONFIG_START(napple2_state::apple2_common) /* basic machine hardware */ MCFG_CPU_ADD(A2_CPU_TAG, M6502, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2_map) @@ -1435,7 +1440,7 @@ static MACHINE_CONFIG_START( apple2_common ) MCFG_CASSETTE_INTERFACE("apple2_cass") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2, apple2_common ) +MACHINE_CONFIG_DERIVED(napple2_state::apple2, apple2_common) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("48K") @@ -1443,7 +1448,7 @@ static MACHINE_CONFIG_DERIVED( apple2, apple2_common ) MCFG_RAM_DEFAULT_VALUE(0x00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2p, apple2_common ) +MACHINE_CONFIG_DERIVED(napple2_state::apple2p, apple2_common) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("48K") @@ -1451,10 +1456,10 @@ static MACHINE_CONFIG_DERIVED( apple2p, apple2_common ) MCFG_RAM_DEFAULT_VALUE(0x00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( space84, apple2p ) +MACHINE_CONFIG_DERIVED(napple2_state::space84, apple2p) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2jp, apple2p ) +MACHINE_CONFIG_DERIVED(napple2_state::apple2jp, apple2p) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(napple2_state, screen_update_jp) MACHINE_CONFIG_END diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp index cefc26e00a7..8fb88629dd6 100644 --- a/src/mame/drivers/apple2e.cpp +++ b/src/mame/drivers/apple2e.cpp @@ -361,6 +361,19 @@ public: DECLARE_WRITE8_MEMBER(memexp_w); DECLARE_READ8_MEMBER(nsc_backing_r); + void apple2cp(machine_config &config); + void laser128ex2(machine_config &config); + void spectred(machine_config &config); + void laser128(machine_config &config); + void apple2c_iwm(machine_config &config); + void apple2c_mem(machine_config &config); + void ceci(machine_config &config); + void mprof3(machine_config &config); + void apple2e(machine_config &config); + void apple2ep(machine_config &config); + void apple2c(machine_config &config); + void tk3000(machine_config &config); + void apple2ee(machine_config &config); private: int m_speaker_state; int m_cassette_state, m_cassette_out; @@ -3833,7 +3846,7 @@ static SLOT_INTERFACE_START(apple2eaux_cards) SLOT_INTERFACE("rw3", A2EAUX_RAMWORKS3) /* Applied Engineering RamWorks III */ SLOT_INTERFACE_END -static MACHINE_CONFIG_START( apple2e ) +MACHINE_CONFIG_START(apple2e_state::apple2e) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2e_map) @@ -3993,18 +4006,18 @@ static MACHINE_CONFIG_START( apple2e ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mprof3, apple2e ) +MACHINE_CONFIG_DERIVED(apple2e_state::mprof3, apple2e) /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("128K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2ee, apple2e ) +MACHINE_CONFIG_DERIVED(apple2e_state::apple2ee, apple2e) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2e_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spectred, apple2e ) +MACHINE_CONFIG_DERIVED(apple2e_state::spectred, apple2e) MCFG_CPU_ADD("keyb_mcu", I8035, XTAL_4MHz) /* guessed frequency */ MCFG_CPU_PROGRAM_MAP(spectred_keyb_map) @@ -4012,7 +4025,7 @@ static MACHINE_CONFIG_DERIVED( spectred, apple2e ) // and then remove the keyb CPU inherited from apple2e MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tk3000, apple2e ) +MACHINE_CONFIG_DERIVED(apple2e_state::tk3000, apple2e) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2e_map) @@ -4020,12 +4033,12 @@ static MACHINE_CONFIG_DERIVED( tk3000, apple2e ) // MCFG_CPU_PROGRAM_MAP(tk3000_kbd_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2ep, apple2e ) +MACHINE_CONFIG_DERIVED(apple2e_state::apple2ep, apple2e) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2e_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2c, apple2ee ) +MACHINE_CONFIG_DERIVED(apple2e_state::apple2c, apple2ee) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2c_map) @@ -4089,20 +4102,20 @@ static const floppy_interface apple2cp_floppy35_floppy_interface = "floppy_3_5" }; -static MACHINE_CONFIG_DERIVED( apple2cp, apple2c ) +MACHINE_CONFIG_DERIVED(apple2e_state::apple2cp, apple2c) MCFG_A2BUS_SLOT_REMOVE("sl4") MCFG_A2BUS_SLOT_REMOVE("sl6") MCFG_IWM_ADD(IICP_IWM_TAG, a2cp_interface) MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(apple2cp_floppy35_floppy_interface) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2c_iwm, apple2c ) +MACHINE_CONFIG_DERIVED(apple2e_state::apple2c_iwm, apple2c) MCFG_A2BUS_SLOT_REMOVE("sl6") MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl6", A2BUS_IWM_FDC, NOOP) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2c_mem, apple2c ) +MACHINE_CONFIG_DERIVED(apple2e_state::apple2c_mem, apple2c) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2c_memexp_map) @@ -4131,7 +4144,7 @@ static const floppy_interface floppy_interface = "floppy_5_25" }; -static MACHINE_CONFIG_DERIVED( laser128, apple2c ) +MACHINE_CONFIG_DERIVED(apple2e_state::laser128, apple2c) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(laser128_map) @@ -4154,7 +4167,7 @@ static MACHINE_CONFIG_DERIVED( laser128, apple2c ) MCFG_RAM_EXTRA_OPTIONS("128K, 384K, 640K, 896K, 1152K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( laser128ex2, apple2c ) +MACHINE_CONFIG_DERIVED(apple2e_state::laser128ex2, apple2c) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(laser128_map) @@ -4177,7 +4190,7 @@ static MACHINE_CONFIG_DERIVED( laser128ex2, apple2c ) MCFG_RAM_EXTRA_OPTIONS("128K, 384K, 640K, 896K, 1152K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ceci, apple2e ) +MACHINE_CONFIG_DERIVED(apple2e_state::ceci, apple2e) MCFG_A2BUS_SLOT_REMOVE("sl1") MCFG_A2BUS_SLOT_REMOVE("sl2") MCFG_A2BUS_SLOT_REMOVE("sl3") diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp index 712c4de94b5..92c9b13e225 100644 --- a/src/mame/drivers/apple2gs.cpp +++ b/src/mame/drivers/apple2gs.cpp @@ -307,7 +307,7 @@ static SLOT_INTERFACE_START(apple2_cards) SLOT_INTERFACE("hsscsi", A2BUS_HSSCSI) /* Apple II High-Speed SCSI Card */ SLOT_INTERFACE_END -static MACHINE_CONFIG_START( apple2gs ) +MACHINE_CONFIG_START(apple2gs_state::apple2gs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", G65816, APPLE2GS_14M/5) MCFG_CPU_PROGRAM_MAP(apple2gs_map) @@ -415,7 +415,7 @@ static MACHINE_CONFIG_START( apple2gs ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop525_list", "apple2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple2gsr1, apple2gs ) +MACHINE_CONFIG_DERIVED(apple2gs_state::apple2gsr1, apple2gs) MCFG_MACHINE_START_OVERRIDE(apple2gs_state, apple2gsr1 ) #if RUN_ADB_MICRO diff --git a/src/mame/drivers/apple3.cpp b/src/mame/drivers/apple3.cpp index 0885ce7e47a..44b0347afeb 100644 --- a/src/mame/drivers/apple3.cpp +++ b/src/mame/drivers/apple3.cpp @@ -52,7 +52,7 @@ FLOPPY_FORMATS_MEMBER( apple3_state::floppy_formats ) FLOPPY_A216S_FORMAT, FLOPPY_RWTS18_FORMAT, FLOPPY_EDD_FORMAT FLOPPY_FORMATS_END -static MACHINE_CONFIG_START( apple3 ) +MACHINE_CONFIG_START(apple3_state::apple3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz */ MCFG_M6502_SYNC_CALLBACK(WRITELINE(apple3_state, apple3_sync_w)) diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp index 0b27a843b49..30671715471 100644 --- a/src/mame/drivers/applix.cpp +++ b/src/mame/drivers/applix.cpp @@ -143,6 +143,7 @@ public: DECLARE_PALETTE_INIT(applix); uint8_t m_palette_latch[4]; required_shared_ptr m_base; + void applix(machine_config &config); private: uint8_t m_pb; uint8_t m_analog_latch; @@ -833,7 +834,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(applix_state::cass_timer) } } -static MACHINE_CONFIG_START( applix ) +MACHINE_CONFIG_START(applix_state::applix) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_30MHz / 4) // MC68000-P10 @ 7.5 MHz MCFG_CPU_PROGRAM_MAP(applix_mem) diff --git a/src/mame/drivers/appoooh.cpp b/src/mame/drivers/appoooh.cpp index 2c35c9f2bba..113d21fa60e 100644 --- a/src/mame/drivers/appoooh.cpp +++ b/src/mame/drivers/appoooh.cpp @@ -416,7 +416,7 @@ INTERRUPT_GEN_MEMBER(appoooh_state::vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( appoooh_common ) +MACHINE_CONFIG_START(appoooh_state::appoooh_common) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */ @@ -444,7 +444,7 @@ static MACHINE_CONFIG_START( appoooh_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( appoooh, appoooh_common ) +MACHINE_CONFIG_DERIVED(appoooh_state::appoooh, appoooh_common) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -463,7 +463,7 @@ static MACHINE_CONFIG_DERIVED( appoooh, appoooh_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( robowres, appoooh_common ) +MACHINE_CONFIG_DERIVED(appoooh_state::robowres, appoooh_common) MCFG_DEVICE_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) @@ -484,7 +484,7 @@ static MACHINE_CONFIG_DERIVED( robowres, appoooh_common ) MCFG_VIDEO_START_OVERRIDE(appoooh_state,appoooh) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( robowrese, robowres ) +MACHINE_CONFIG_DERIVED(appoooh_state::robowrese, robowres) MCFG_CPU_REPLACE("maincpu", SEGA_315_5179,18432000/6) /* ??? the main xtal is 18.432 MHz */ MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp index d183210e690..cc4ffc38c85 100644 --- a/src/mame/drivers/apricot.cpp +++ b/src/mame/drivers/apricot.cpp @@ -89,6 +89,8 @@ public: MC6845_UPDATE_ROW(crtc_update_row); uint32_t screen_update_apricot(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void apricot(machine_config &config); + void apricotxi(machine_config &config); protected: virtual void machine_start() override; @@ -348,7 +350,7 @@ ADDRESS_MAP_END // MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( apricot ) +MACHINE_CONFIG_START(apricot_state::apricot) // main cpu MCFG_CPU_ADD("ic91", I8086, XTAL_15MHz / 3) MCFG_CPU_PROGRAM_MAP(apricot_mem) @@ -467,7 +469,7 @@ static MACHINE_CONFIG_START( apricot ) MCFG_EXPANSION_SLOT_ADD("exp:2", apricot_expansion_cards, nullptr) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apricotxi, apricot ) +MACHINE_CONFIG_DERIVED(apricot_state::apricotxi, apricot) MACHINE_CONFIG_END diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp index ce541dd27a8..29ec8a3a295 100644 --- a/src/mame/drivers/apricotf.cpp +++ b/src/mame/drivers/apricotf.cpp @@ -103,6 +103,7 @@ public: int m_40_80; int m_200_256; + void act_f1(machine_config &config); }; @@ -329,7 +330,7 @@ SLOT_INTERFACE_END // MACHINE_CONFIG( act_f1 ) //------------------------------------------------- -static MACHINE_CONFIG_START( act_f1 ) +MACHINE_CONFIG_START(f1_state::act_f1) /* basic machine hardware */ MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_14MHz/4) MCFG_CPU_PROGRAM_MAP(act_f1_mem) diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp index e75c8a19a35..77fe340d911 100644 --- a/src/mame/drivers/apricotp.cpp +++ b/src/mame/drivers/apricotp.cpp @@ -154,6 +154,7 @@ public: DECLARE_WRITE_LINE_MEMBER( write_centronics_select ); DECLARE_WRITE_LINE_MEMBER( write_centronics_fault ); DECLARE_WRITE_LINE_MEMBER( write_centronics_perror ); + void fp(machine_config &config); }; @@ -574,7 +575,7 @@ SLOT_INTERFACE_END // MACHINE_CONFIG( fp ) //------------------------------------------------- -static MACHINE_CONFIG_START( fp ) +MACHINE_CONFIG_START(fp_state::fp) /* basic machine hardware */ MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_15MHz/3) MCFG_CPU_PROGRAM_MAP(fp_mem) diff --git a/src/mame/drivers/aquarium.cpp b/src/mame/drivers/aquarium.cpp index 91d8032cdb2..3248b50264f 100644 --- a/src/mame/drivers/aquarium.cpp +++ b/src/mame/drivers/aquarium.cpp @@ -284,7 +284,7 @@ static GFXDECODE_START( aquarium ) GFXDECODE_ENTRY( "gfx4", 0, char5bpplayout, 0x400, 32 ) GFXDECODE_END -static MACHINE_CONFIG_START( aquarium ) +MACHINE_CONFIG_START(aquarium_state::aquarium) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // clock not verified on pcb diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp index 06eaa368fb9..3a98374f985 100644 --- a/src/mame/drivers/aquarius.cpp +++ b/src/mame/drivers/aquarius.cpp @@ -347,7 +347,7 @@ GFXDECODE_END MACHINE DRIVERS ***************************************************************************/ -static MACHINE_CONFIG_START( aquarius ) +MACHINE_CONFIG_START(aquarius_state::aquarius) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) // ??? MCFG_CPU_PROGRAM_MAP(aquarius_mem) diff --git a/src/mame/drivers/arabian.cpp b/src/mame/drivers/arabian.cpp index 0a19fb1413f..9f7589e81be 100644 --- a/src/mame/drivers/arabian.cpp +++ b/src/mame/drivers/arabian.cpp @@ -353,7 +353,7 @@ void arabian_state::machine_reset() m_video_control = 0; } -static MACHINE_CONFIG_START( arabian ) +MACHINE_CONFIG_START(arabian_state::arabian) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_OSC/4) diff --git a/src/mame/drivers/arachnid.cpp b/src/mame/drivers/arachnid.cpp index a84b40cc2e6..55ebbe329ea 100644 --- a/src/mame/drivers/arachnid.cpp +++ b/src/mame/drivers/arachnid.cpp @@ -109,6 +109,7 @@ public: DECLARE_WRITE_LINE_MEMBER(ptm_o1_callback); uint8_t read_keyboard(int pa); + void arachnid(machine_config &config); }; /*************************************************************************** @@ -417,7 +418,7 @@ void arachnid_state::machine_start() MACHINE_CONFIG_START( arachnid ) -------------------------------------------------*/ -static MACHINE_CONFIG_START( arachnid ) +MACHINE_CONFIG_START(arachnid_state::arachnid) // basic machine hardware MCFG_CPU_ADD(M6809_TAG, M6809, XTAL_1MHz) MCFG_CPU_PROGRAM_MAP(arachnid_map) diff --git a/src/mame/drivers/arcadecl.cpp b/src/mame/drivers/arcadecl.cpp index 79ebc19a18d..fa8188efe3b 100644 --- a/src/mame/drivers/arcadecl.cpp +++ b/src/mame/drivers/arcadecl.cpp @@ -318,7 +318,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( arcadecl ) +MACHINE_CONFIG_START(arcadecl_state::arcadecl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK) @@ -358,7 +358,7 @@ static MACHINE_CONFIG_START( arcadecl ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sparkz, arcadecl ) +MACHINE_CONFIG_DERIVED(arcadecl_state::sparkz, arcadecl) MCFG_DEVICE_REMOVE("mob") MACHINE_CONFIG_END diff --git a/src/mame/drivers/arcadia.cpp b/src/mame/drivers/arcadia.cpp index 216b7431046..cfa4d617fbc 100644 --- a/src/mame/drivers/arcadia.cpp +++ b/src/mame/drivers/arcadia.cpp @@ -469,7 +469,7 @@ static SLOT_INTERFACE_START(arcadia_cart) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( arcadia ) +MACHINE_CONFIG_START(arcadia_state::arcadia) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 3580000/4) /* 0.895 MHz */ MCFG_CPU_PROGRAM_MAP(arcadia_mem) diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp index 11fbeda0fcd..df24ad5f9b2 100644 --- a/src/mame/drivers/argo.cpp +++ b/src/mame/drivers/argo.cpp @@ -49,6 +49,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_DRIVER_INIT(argo); + void argo(machine_config &config); private: required_device m_maincpu; required_shared_ptr m_p_videoram; @@ -342,7 +343,7 @@ uint32_t argo_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, return 0; } -static MACHINE_CONFIG_START( argo ) +MACHINE_CONFIG_START(argo_state::argo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3500000) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/argox.cpp b/src/mame/drivers/argox.cpp index e3bf71dd394..e506809fb36 100644 --- a/src/mame/drivers/argox.cpp +++ b/src/mame/drivers/argox.cpp @@ -53,6 +53,7 @@ public: DECLARE_DRIVER_INIT(os214); required_device m_maincpu; + void os214(machine_config &config); }; static ADDRESS_MAP_START( os214_prg_map, AS_PROGRAM, 16, os214_state ) @@ -63,7 +64,7 @@ static ADDRESS_MAP_START( os214_io_map, AS_IO, 8, os214_state ) // ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_END -static MACHINE_CONFIG_START( os214 ) +MACHINE_CONFIG_START(os214_state::os214) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H83002, XTAL_16MHz) /* X1 xtal value is correct, but there can be some clock divider perhaps ? */ diff --git a/src/mame/drivers/argus.cpp b/src/mame/drivers/argus.cpp index 79137f2d5ac..8c4327c7684 100644 --- a/src/mame/drivers/argus.cpp +++ b/src/mame/drivers/argus.cpp @@ -530,7 +530,7 @@ static GFXDECODE_START( butasan ) GFXDECODE_END -static MACHINE_CONFIG_START( argus ) +MACHINE_CONFIG_START(argus_state::argus) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 4 MHz */ @@ -578,7 +578,7 @@ static MACHINE_CONFIG_START( argus ) MCFG_SOUND_ROUTE(3, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( valtric ) +MACHINE_CONFIG_START(argus_state::valtric) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */ @@ -626,7 +626,7 @@ static MACHINE_CONFIG_START( valtric ) MCFG_SOUND_ROUTE(3, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( butasan ) +MACHINE_CONFIG_START(argus_state::butasan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */ diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp index cd3527f08da..baae97d1c35 100644 --- a/src/mame/drivers/aristmk4.cpp +++ b/src/mame/drivers/aristmk4.cpp @@ -432,6 +432,9 @@ public: TIMER_CALLBACK_MEMBER(hopper_reset); TIMER_DEVICE_CALLBACK_MEMBER(aristmk4_pf); inline void uBackgroundColour(); + void aristmk4_poker(machine_config &config); + void aristmk4(machine_config &config); + void _86lions(machine_config &config); }; /* Partial Cashcade protocol */ @@ -1745,7 +1748,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(aristmk4_state::aristmk4_pf) } } -static MACHINE_CONFIG_START( aristmk4 ) +MACHINE_CONFIG_START(aristmk4_state::aristmk4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CLOCK/8) // M68B09E @ 1.5 MHz MCFG_CPU_PROGRAM_MAP(aristmk4_map) @@ -1817,7 +1820,7 @@ static MACHINE_CONFIG_START( aristmk4 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aristmk4_poker, aristmk4 ) +MACHINE_CONFIG_DERIVED(aristmk4_state::aristmk4_poker, aristmk4) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(aristmk4_poker_map) @@ -1847,7 +1850,7 @@ PALETTE_INIT_MEMBER(aristmk4_state,lions) } } -static MACHINE_CONFIG_DERIVED( 86lions, aristmk4 ) +MACHINE_CONFIG_DERIVED(aristmk4_state::_86lions, aristmk4) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(aristmk4_state,lions) MACHINE_CONFIG_END @@ -2499,7 +2502,7 @@ ROM_START( 86lions ) // ROM_LOAD( "prom.x", 0x00, 0x20, NO_DUMP ) ROM_END -GAMEL( 1985, 86lions, 0, 86lions, aristmk4, aristmk4_state, aristmk4, ROT0, "Aristocrat", "86 Lions", MACHINE_NOT_WORKING, layout_topgear ) +GAMEL( 1985, 86lions, 0, _86lions, aristmk4, aristmk4_state, aristmk4, ROT0, "Aristocrat", "86 Lions", MACHINE_NOT_WORKING, layout_topgear ) GAMEL( 1996, eforest, 0, aristmk4, eforest, aristmk4_state, aristmk4, ROT0, "Aristocrat", "Enchanted Forest (12XF528902, US)", 0, layout_eforest ) // 92.778% GAMEL( 1995, eforesta, eforest, aristmk4, aristmk4, aristmk4_state, aristmk4, ROT0, "Aristocrat", "Enchanted Forest (4VXFC818, NSW)", 0, layout_aristmk4 ) // 10c, $1 = 10 credits, 90.483% GAMEL( 1996, eforestb, eforest, aristmk4, arimk4nz, aristmk4_state, aristmk4, ROT0, "Aristocrat", "Enchanted Forest (3VXFC5343, New Zealand)", 0, layout_arimk4nz ) // 5c, $2 = 40 credits, 88.43% diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp index 5d026f260d9..abf9e74827a 100644 --- a/src/mame/drivers/aristmk5.cpp +++ b/src/mame/drivers/aristmk5.cpp @@ -518,6 +518,10 @@ public: CUSTOM_INPUT_MEMBER(coin_usa_r); CUSTOM_INPUT_MEMBER(hopper_r); + void aristmk5(machine_config &config); + void aristmk5_touch(machine_config &config); + void aristmk5_usa_touch(machine_config &config); + void aristmk5_usa(machine_config &config); private: required_device_array m_eeprom; required_device m_rtc; @@ -2011,7 +2015,7 @@ void aristmk5_state::machine_reset() } -static MACHINE_CONFIG_START( aristmk5 ) +MACHINE_CONFIG_START(aristmk5_state::aristmk5) MCFG_CPU_ADD("maincpu", ARM, MASTER_CLOCK/6) // 12000000 MCFG_CPU_PROGRAM_MAP(aristmk5_drame_map) @@ -2087,19 +2091,19 @@ static MACHINE_CONFIG_START( aristmk5 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aristmk5_touch, aristmk5 ) +MACHINE_CONFIG_DERIVED(aristmk5_state::aristmk5_touch, aristmk5) MCFG_DEVICE_MODIFY("uart_0a") MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx)) MCFG_MICROTOUCH_ADD("microtouch", 2400, DEVWRITELINE("uart_0a", ins8250_uart_device, rx_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aristmk5_usa, aristmk5 ) +MACHINE_CONFIG_DERIVED(aristmk5_state::aristmk5_usa, aristmk5) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(aristmk5_usa_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aristmk5_usa_touch, aristmk5_usa ) +MACHINE_CONFIG_DERIVED(aristmk5_state::aristmk5_usa_touch, aristmk5_usa) MCFG_DEVICE_MODIFY("uart_0a") MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx)) diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp index c1064e06920..a60b30d7afd 100644 --- a/src/mame/drivers/aristmk6.cpp +++ b/src/mame/drivers/aristmk6.cpp @@ -68,6 +68,7 @@ public: required_device m_eeprom0; required_device m_palette; required_shared_ptr m_vram; + void aristmk6(machine_config &config); }; @@ -318,7 +319,7 @@ INPUT_PORTS_END #define ARISTMK6_CPU_CLOCK XTAL_200MHz // ? -static MACHINE_CONFIG_START( aristmk6 ) +MACHINE_CONFIG_START(aristmk6_state::aristmk6) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH4LE, ARISTMK6_CPU_CLOCK) MCFG_SH4_MD0(1) diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp index eb6ed5af8af..c95fcc34c0e 100644 --- a/src/mame/drivers/arkanoid.cpp +++ b/src/mame/drivers/arkanoid.cpp @@ -1333,7 +1333,7 @@ Pixel clock: 3 MHz = 192 HTotal, assuming it's 6 MHz #define ARKANOID_VBEND 16 #define ARKANOID_VBSTART 240 -static MACHINE_CONFIG_START( arkanoid ) +MACHINE_CONFIG_START(arkanoid_state::arkanoid) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */ @@ -1371,14 +1371,14 @@ static MACHINE_CONFIG_START( arkanoid ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.66) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( p3mcu, arkanoid ) +MACHINE_CONFIG_DERIVED(arkanoid_state::p3mcu, arkanoid) /* unprotected MCU */ MCFG_DEVICE_REPLACE("mcu", ARKANOID_68705P3, XTAL_12MHz/4) MCFG_ARKANOID_MCU_PORTB_R_CB(IOPORT("MUX")) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( p3mcuay, arkanoid ) +MACHINE_CONFIG_DERIVED(arkanoid_state::p3mcuay, arkanoid) /* unprotected MCU */ MCFG_DEVICE_REPLACE("mcu", ARKANOID_68705P3, XTAL_12MHz/4) @@ -1391,7 +1391,7 @@ static MACHINE_CONFIG_DERIVED( p3mcuay, arkanoid ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.66) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bootleg, arkanoid ) +MACHINE_CONFIG_DERIVED(arkanoid_state::bootleg, arkanoid) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1400,7 +1400,7 @@ static MACHINE_CONFIG_DERIVED( bootleg, arkanoid ) MCFG_DEVICE_REMOVE("mcu") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aysnd, bootleg ) +MACHINE_CONFIG_DERIVED(arkanoid_state::aysnd, bootleg) MCFG_SOUND_REPLACE("aysnd", AY8910, XTAL_12MHz/4) MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) MCFG_AY8910_PORT_A_READ_CB(IOPORT("UNUSED")) @@ -1409,7 +1409,7 @@ static MACHINE_CONFIG_DERIVED( aysnd, bootleg ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hexa ) +MACHINE_CONFIG_START(arkanoid_state::hexa) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Imported from arkanoid - correct? */ @@ -1439,7 +1439,7 @@ static MACHINE_CONFIG_START( hexa ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hexaa, hexa ) +MACHINE_CONFIG_DERIVED(arkanoid_state::hexaa, hexa) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(hexaa_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold) @@ -1450,7 +1450,7 @@ static MACHINE_CONFIG_DERIVED( hexaa, hexa ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( brixian ) +MACHINE_CONFIG_START(arkanoid_state::brixian) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp index f3937924e11..e407a6995b5 100644 --- a/src/mame/drivers/armedf.cpp +++ b/src/mame/drivers/armedf.cpp @@ -1237,7 +1237,7 @@ MACHINE_RESET_MEMBER(armedf_state,armedf) } -static MACHINE_CONFIG_START( terraf_sound ) +MACHINE_CONFIG_START(armedf_state::terraf_sound) MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_CPU_IO_MAP(sound_portmap) @@ -1257,7 +1257,7 @@ static MACHINE_CONFIG_START( terraf_sound ) MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( terraf ) +MACHINE_CONFIG_START(armedf_state::terraf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz? @@ -1292,7 +1292,7 @@ static MACHINE_CONFIG_START( terraf ) MCFG_FRAGMENT_ADD(terraf_sound) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( terrafjb ) +MACHINE_CONFIG_START(armedf_state::terrafjb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz @@ -1344,11 +1344,11 @@ static MACHINE_CONFIG_START( terrafjb ) MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( terrafb, terraf ) +MACHINE_CONFIG_DERIVED(armedf_state::terrafb, terraf) MCFG_DEVICE_REMOVE("nb1414m4") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( kozure ) +MACHINE_CONFIG_START(armedf_state::kozure) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz @@ -1382,7 +1382,7 @@ static MACHINE_CONFIG_START( kozure ) MCFG_FRAGMENT_ADD(terraf_sound) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( armedf ) +MACHINE_CONFIG_START(armedf_state::armedf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz @@ -1430,7 +1430,7 @@ static MACHINE_CONFIG_START( armedf ) MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cclimbr2 ) +MACHINE_CONFIG_START(armedf_state::cclimbr2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz @@ -1480,7 +1480,7 @@ static MACHINE_CONFIG_START( cclimbr2 ) MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( legion ) +MACHINE_CONFIG_START(armedf_state::legion) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz @@ -1530,7 +1530,7 @@ static MACHINE_CONFIG_START( legion ) MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( legionjb ) +MACHINE_CONFIG_START(armedf_state::legionjb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz @@ -1578,7 +1578,7 @@ static MACHINE_CONFIG_START( legionjb ) MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bigfghtr ) +MACHINE_CONFIG_START(bigfghtr_state::bigfghtr) MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // verified MCFG_CPU_PROGRAM_MAP(bigfghtr_map) diff --git a/src/mame/drivers/arsystems.cpp b/src/mame/drivers/arsystems.cpp index 3c87838ed64..9b0cefff927 100644 --- a/src/mame/drivers/arsystems.cpp +++ b/src/mame/drivers/arsystems.cpp @@ -92,6 +92,8 @@ public: inline void generic_decode(const char *tag, int bit7, int bit6, int bit5, int bit4, int bit3, int bit2, int bit1, int bit0); + void arcadia(machine_config &config); + void argh(machine_config &config); protected: virtual void machine_reset() override; @@ -288,7 +290,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( arcadia ) +MACHINE_CONFIG_START(arcadia_amiga_state::arcadia) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC) @@ -341,7 +343,7 @@ static MACHINE_CONFIG_START( arcadia ) MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(amiga_state, fdc_dsksyn_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( argh, arcadia ) +MACHINE_CONFIG_DERIVED(arcadia_amiga_state::argh, arcadia) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/artmagic.cpp b/src/mame/drivers/artmagic.cpp index ea7f18d4fe1..7615b3f529a 100644 --- a/src/mame/drivers/artmagic.cpp +++ b/src/mame/drivers/artmagic.cpp @@ -799,7 +799,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( artmagic ) +MACHINE_CONFIG_START(artmagic_state::artmagic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/2) @@ -834,7 +834,7 @@ static MACHINE_CONFIG_START( artmagic ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cheesech, artmagic ) +MACHINE_CONFIG_DERIVED(artmagic_state::cheesech, artmagic) MCFG_SOUND_MODIFY("oki") MCFG_SOUND_ROUTES_RESET() @@ -842,7 +842,7 @@ static MACHINE_CONFIG_DERIVED( cheesech, artmagic ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( stonebal, artmagic ) +MACHINE_CONFIG_DERIVED(artmagic_state::stonebal, artmagic) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(stonebal_map) @@ -855,7 +855,7 @@ static MACHINE_CONFIG_DERIVED( stonebal, artmagic ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shtstar, artmagic ) +MACHINE_CONFIG_DERIVED(artmagic_state::shtstar, artmagic) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(shtstar_map) diff --git a/src/mame/drivers/ashnojoe.cpp b/src/mame/drivers/ashnojoe.cpp index 6e8b9b6b2f8..9022e064d72 100644 --- a/src/mame/drivers/ashnojoe.cpp +++ b/src/mame/drivers/ashnojoe.cpp @@ -301,7 +301,7 @@ void ashnojoe_state::machine_reset() } -static MACHINE_CONFIG_START( ashnojoe ) +MACHINE_CONFIG_START(ashnojoe_state::ashnojoe) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) diff --git a/src/mame/drivers/asst128.cpp b/src/mame/drivers/asst128.cpp index 70f091da1de..96c64ef5cd4 100644 --- a/src/mame/drivers/asst128.cpp +++ b/src/mame/drivers/asst128.cpp @@ -52,6 +52,7 @@ public: DECLARE_WRITE8_MEMBER(asst128_fdc_dor_w); void machine_start() override; + void asst128(machine_config &config); }; void asst128_state::machine_start() @@ -92,7 +93,7 @@ static DEVICE_INPUT_DEFAULTS_START( asst128 ) DEVICE_INPUT_DEFAULTS("DSW0", 0x30, 0x20) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( asst128 ) +MACHINE_CONFIG_START(asst128_state::asst128) MCFG_CPU_ADD("maincpu", I8086, 4772720) MCFG_CPU_PROGRAM_MAP(asst128_map) MCFG_CPU_IO_MAP(asst128_io) diff --git a/src/mame/drivers/asterix.cpp b/src/mame/drivers/asterix.cpp index 44591ecad2d..4c836c6c51e 100644 --- a/src/mame/drivers/asterix.cpp +++ b/src/mame/drivers/asterix.cpp @@ -257,7 +257,7 @@ void asterix_state::machine_reset() } } -static MACHINE_CONFIG_START( asterix ) +MACHINE_CONFIG_START(asterix_state::asterix) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) // 12MHz diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp index e2d6306244c..0abbede0a58 100644 --- a/src/mame/drivers/asteroid.cpp +++ b/src/mame/drivers/asteroid.cpp @@ -187,7 +187,6 @@ There is not a rev 03 known or dumped. An Asteroids rev 03 is not mentioned in a #include "emu.h" #include "includes/asteroid.h" -#include "audio/llander.h" #include "cpu/m6502/m6502.h" #include "machine/74259.h" #include "machine/atari_vg.h" @@ -650,7 +649,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( asteroid_base ) +MACHINE_CONFIG_START(asteroid_state::asteroid_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) @@ -671,13 +670,13 @@ static MACHINE_CONFIG_START( asteroid_base ) MCFG_AVGDVG_VECTOR("vector") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( asteroid, asteroid_base ) +MACHINE_CONFIG_DERIVED(asteroid_state::asteroid, asteroid_base) /* sound hardware */ MCFG_FRAGMENT_ADD(asteroid_sound) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( asterock, asteroid ) +MACHINE_CONFIG_DERIVED(asteroid_state::asterock, asteroid) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -685,7 +684,7 @@ static MACHINE_CONFIG_DERIVED( asterock, asteroid ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( astdelux, asteroid_base ) +MACHINE_CONFIG_DERIVED(asteroid_state::astdelux, asteroid_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -712,7 +711,7 @@ static MACHINE_CONFIG_DERIVED( astdelux, asteroid_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( llander, asteroid_base ) +MACHINE_CONFIG_DERIVED(asteroid_state::llander, asteroid_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp index c85fefdadb2..313f1bf8ad9 100644 --- a/src/mame/drivers/astinvad.cpp +++ b/src/mame/drivers/astinvad.cpp @@ -92,6 +92,9 @@ public: TIMER_CALLBACK_MEMBER(kamikaze_int_off); TIMER_CALLBACK_MEMBER(kamizake_int_gen); + void spcking2(machine_config &config); + void spaceint(machine_config &config); + void kamikaze(machine_config &config); private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; void plot_byte( bitmap_rgb32 &bitmap, uint8_t y, uint8_t x, uint8_t data, uint8_t color ); @@ -652,7 +655,7 @@ static const char *const astinvad_sample_names[] = * *************************************/ -static MACHINE_CONFIG_START( kamikaze ) +MACHINE_CONFIG_START(astinvad_state::kamikaze) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) @@ -688,7 +691,7 @@ static MACHINE_CONFIG_START( kamikaze ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spcking2, kamikaze ) +MACHINE_CONFIG_DERIVED(astinvad_state::spcking2, kamikaze) /* basic machine hardware */ MCFG_DEVICE_MODIFY("ppi8255_1") @@ -703,7 +706,7 @@ static MACHINE_CONFIG_DERIVED( spcking2, kamikaze ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( spaceint ) +MACHINE_CONFIG_START(astinvad_state::spaceint) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* a guess */ diff --git a/src/mame/drivers/astrafr.cpp b/src/mame/drivers/astrafr.cpp index d679b2ae94f..88ebb62f48f 100644 --- a/src/mame/drivers/astrafr.cpp +++ b/src/mame/drivers/astrafr.cpp @@ -118,6 +118,17 @@ public: DECLARE_MACHINE_START(astra_2e); DECLARE_MACHINE_START(astra_37); DECLARE_MACHINE_START(astra_57); + void astra_single(machine_config &config); + void astra_single_alt(machine_config &config); + void astrafr_dual(machine_config &config); + void astrafr_dual_alt(machine_config &config); + void astrafr_dual_alt_37(machine_config &config); + void astra_single_2e(machine_config &config); + void astra_single_alt_37(machine_config &config); + void astra_single_alt_57(machine_config &config); + void astra_single_37(machine_config &config); + void astrafr_dual_2e(machine_config &config); + void astrafr_dual_37(machine_config &config); }; @@ -288,7 +299,7 @@ MACHINE_START_MEMBER(astrafr_state,astra_2e) } -static MACHINE_CONFIG_START( astrafr_dual ) +MACHINE_CONFIG_START(astrafr_state::astrafr_dual) MCFG_CPU_ADD("maincpu", M68340, 16000000) MCFG_CPU_PROGRAM_MAP(astrafr_master_map) @@ -298,15 +309,15 @@ static MACHINE_CONFIG_START( astrafr_dual ) MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( astrafr_dual_2e, astrafr_dual ) +MACHINE_CONFIG_DERIVED(astrafr_state::astrafr_dual_2e, astrafr_dual) MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_2e ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( astrafr_dual_37, astrafr_dual ) +MACHINE_CONFIG_DERIVED(astrafr_state::astrafr_dual_37, astrafr_dual) MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_37 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( astrafr_dual_alt ) +MACHINE_CONFIG_START(astrafr_state::astrafr_dual_alt) MCFG_CPU_ADD("maincpu", M68340, 16000000) MCFG_CPU_PROGRAM_MAP(astrafr_master_alt_map) @@ -314,23 +325,23 @@ static MACHINE_CONFIG_START( astrafr_dual_alt ) MCFG_CPU_PROGRAM_MAP(astrafr_slave_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( astrafr_dual_alt_37, astrafr_dual_alt ) +MACHINE_CONFIG_DERIVED(astrafr_state::astrafr_dual_alt_37, astrafr_dual_alt) MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_37 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( astra_single ) +MACHINE_CONFIG_START(astrafr_state::astra_single) MCFG_CPU_ADD("maincpu", M68340, 16000000) MCFG_CPU_PROGRAM_MAP(astra_map) MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( astra_single_37, astra_single ) +MACHINE_CONFIG_DERIVED(astrafr_state::astra_single_37, astra_single) MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_37 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( astra_single_2e, astra_single ) +MACHINE_CONFIG_DERIVED(astrafr_state::astra_single_2e, astra_single) MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_2e ) MACHINE_CONFIG_END @@ -343,17 +354,17 @@ MACHINE_START_MEMBER(astrafr_state,astra_57) } -static MACHINE_CONFIG_START( astra_single_alt ) +MACHINE_CONFIG_START(astrafr_state::astra_single_alt) MCFG_CPU_ADD("maincpu", M68340, 16000000) MCFG_CPU_PROGRAM_MAP(astra_map) MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( astra_single_alt_57, astra_single_alt ) +MACHINE_CONFIG_DERIVED(astrafr_state::astra_single_alt_57, astra_single_alt) MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_57 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( astra_single_alt_37, astra_single_alt ) +MACHINE_CONFIG_DERIVED(astrafr_state::astra_single_alt_37, astra_single_alt) MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_37 ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp index 56cea09962a..ffc2e3803e4 100644 --- a/src/mame/drivers/astrcorp.cpp +++ b/src/mame/drivers/astrcorp.cpp @@ -93,6 +93,10 @@ public: uint32_t screen_update_astrocorp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(skilldrp_scanline); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void skilldrp(machine_config &config); + void showhand(machine_config &config); + void speeddrp(machine_config &config); + void showhanc(machine_config &config); }; /*************************************************************************** @@ -493,7 +497,7 @@ TODO: understand if later hardware uses different parameters (XTAL is almost sur #define ASTROCORP_VBEND 0 #define ASTROCORP_VBSTART 240 -static MACHINE_CONFIG_START( showhand ) +MACHINE_CONFIG_START(astrocorp_state::showhand) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2) @@ -528,7 +532,7 @@ static MACHINE_CONFIG_START( showhand ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( showhanc, showhand ) +MACHINE_CONFIG_DERIVED(astrocorp_state::showhanc, showhand) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(showhanc_map) MACHINE_CONFIG_END @@ -545,7 +549,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(astrocorp_state::skilldrp_scanline) m_maincpu->set_input_line(2, HOLD_LINE); } -static MACHINE_CONFIG_START( skilldrp ) +MACHINE_CONFIG_START(astrocorp_state::skilldrp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) // JX-1689F1028N GRX586.V5 @@ -582,7 +586,7 @@ static MACHINE_CONFIG_START( skilldrp ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( speeddrp, skilldrp ) +MACHINE_CONFIG_DERIVED(astrocorp_state::speeddrp, skilldrp) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(speeddrp_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp index 0568c4773f7..21939f2343b 100644 --- a/src/mame/drivers/astrocde.cpp +++ b/src/mame/drivers/astrocde.cpp @@ -1245,7 +1245,7 @@ static const z80_daisy_config tenpin_daisy_chain[] = * *************************************/ -static MACHINE_CONFIG_START( astrocade_base ) +MACHINE_CONFIG_START(astrocde_state::astrocade_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, ASTROCADE_CLOCK/4) @@ -1264,7 +1264,7 @@ static MACHINE_CONFIG_START( astrocade_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( astrocade_16color_base, astrocade_base ) +MACHINE_CONFIG_DERIVED(astrocde_state::astrocade_16color_base, astrocade_base) /* basic machine hardware */ MCFG_DEVICE_ADD("bank4000", ADDRESS_MAP_BANK, 0) @@ -1288,7 +1288,7 @@ static MACHINE_CONFIG_DERIVED( astrocade_16color_base, astrocade_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( astrocade_mono_sound ) +MACHINE_CONFIG_START(astrocde_state::astrocade_mono_sound) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1298,7 +1298,7 @@ static MACHINE_CONFIG_START( astrocade_mono_sound ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( astrocade_stereo_sound ) +MACHINE_CONFIG_START(astrocde_state::astrocade_stereo_sound) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1318,7 +1318,7 @@ MACHINE_CONFIG_END * *************************************/ -static MACHINE_CONFIG_DERIVED( seawolf2, astrocade_base ) +MACHINE_CONFIG_DERIVED(astrocde_state::seawolf2, astrocade_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1344,7 +1344,7 @@ static MACHINE_CONFIG_DERIVED( seawolf2, astrocade_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ebases, astrocade_base ) +MACHINE_CONFIG_DERIVED(astrocde_state::ebases, astrocade_base) MCFG_FRAGMENT_ADD(astrocade_mono_sound) /* basic machine hardware */ @@ -1354,7 +1354,7 @@ static MACHINE_CONFIG_DERIVED( ebases, astrocade_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spacezap, astrocade_base ) +MACHINE_CONFIG_DERIVED(astrocde_state::spacezap, astrocade_base) MCFG_FRAGMENT_ADD(astrocade_mono_sound) /* basic machine hardware */ @@ -1363,7 +1363,7 @@ static MACHINE_CONFIG_DERIVED( spacezap, astrocade_base ) MCFG_CPU_IO_MAP(port_map_mono_pattern) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wow, astrocade_base ) +MACHINE_CONFIG_DERIVED(astrocde_state::wow, astrocade_base) MCFG_FRAGMENT_ADD(astrocade_stereo_sound) /* basic machine hardware */ @@ -1384,7 +1384,7 @@ static MACHINE_CONFIG_DERIVED( wow, astrocade_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gorf, astrocade_base ) +MACHINE_CONFIG_DERIVED(astrocde_state::gorf, astrocade_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1410,7 +1410,7 @@ static MACHINE_CONFIG_DERIVED( gorf, astrocade_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( robby, astrocade_base ) +MACHINE_CONFIG_DERIVED(astrocde_state::robby, astrocade_base) MCFG_FRAGMENT_ADD(astrocade_stereo_sound) /* basic machine hardware */ @@ -1422,7 +1422,7 @@ static MACHINE_CONFIG_DERIVED( robby, astrocade_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( profpac, astrocade_16color_base ) +MACHINE_CONFIG_DERIVED(astrocde_state::profpac, astrocade_16color_base) MCFG_FRAGMENT_ADD(astrocade_stereo_sound) /* basic machine hardware */ @@ -1436,7 +1436,7 @@ static MACHINE_CONFIG_DERIVED( profpac, astrocade_16color_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( demndrgn, astrocade_16color_base ) +MACHINE_CONFIG_DERIVED(astrocde_state::demndrgn, astrocade_16color_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1445,7 +1445,7 @@ static MACHINE_CONFIG_DERIVED( demndrgn, astrocade_16color_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tenpindx, astrocade_16color_base ) +MACHINE_CONFIG_DERIVED(astrocde_state::tenpindx, astrocade_16color_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp index 18d6789e4b9..239bc63c8aa 100644 --- a/src/mame/drivers/astrof.cpp +++ b/src/mame/drivers/astrof.cpp @@ -910,7 +910,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( base ) +MACHINE_CONFIG_START(astrof_state::base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK) @@ -923,7 +923,7 @@ static MACHINE_CONFIG_START( base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( astrof, base ) +MACHINE_CONFIG_DERIVED(astrof_state::astrof, base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -940,7 +940,7 @@ static MACHINE_CONFIG_DERIVED( astrof, base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( abattle, astrof ) +MACHINE_CONFIG_DERIVED(astrof_state::abattle, astrof) /* basic machine hardware */ @@ -949,7 +949,7 @@ static MACHINE_CONFIG_DERIVED( abattle, astrof ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spfghmk2, base ) +MACHINE_CONFIG_DERIVED(astrof_state::spfghmk2, base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -966,7 +966,7 @@ static MACHINE_CONFIG_DERIVED( spfghmk2, base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tomahawk, base ) +MACHINE_CONFIG_DERIVED(astrof_state::tomahawk, base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/astrohome.cpp b/src/mame/drivers/astrohome.cpp index e024e535922..3626fd37fa7 100644 --- a/src/mame/drivers/astrohome.cpp +++ b/src/mame/drivers/astrohome.cpp @@ -34,6 +34,7 @@ public: required_device m_cart; required_device m_exp; DECLARE_MACHINE_START(astrocde); + void astrocde(machine_config &config); }; /********************************************************************************* @@ -190,7 +191,7 @@ static SLOT_INTERFACE_START(astrocade_exp) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( astrocde ) +MACHINE_CONFIG_START(astrocde_mess_state::astrocde) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, ASTROCADE_CLOCK/4) /* 1.789 MHz */ MCFG_CPU_PROGRAM_MAP(astrocade_mem) diff --git a/src/mame/drivers/astropc.cpp b/src/mame/drivers/astropc.cpp index 7d190e95660..f7653508979 100644 --- a/src/mame/drivers/astropc.cpp +++ b/src/mame/drivers/astropc.cpp @@ -23,6 +23,7 @@ public: m_maincpu(*this, "maincpu") { } + void astropc(machine_config &config); protected: // devices @@ -45,7 +46,7 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( astropc ) +MACHINE_CONFIG_START(astropc_state::astropc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I486, 40000000 ) // ?? MCFG_CPU_PROGRAM_MAP(astropc_map) diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp index faa569aa2e6..92736e2379f 100644 --- a/src/mame/drivers/asuka.cpp +++ b/src/mame/drivers/asuka.cpp @@ -825,7 +825,7 @@ WRITE_LINE_MEMBER(asuka_state::screen_vblank_asuka) } } -static MACHINE_CONFIG_START( bonzeadv ) +MACHINE_CONFIG_START(asuka_state::bonzeadv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* checked on PCB */ @@ -882,7 +882,7 @@ static MACHINE_CONFIG_START( bonzeadv ) MCFG_TC0140SYT_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( asuka ) +MACHINE_CONFIG_START(asuka_state::asuka) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */ @@ -953,7 +953,7 @@ static MACHINE_CONFIG_START( asuka ) MCFG_PC060HA_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cadash ) +MACHINE_CONFIG_START(asuka_state::cadash) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 68000p12 running at 16Mhz, verified on pcb */ @@ -1021,7 +1021,7 @@ static MACHINE_CONFIG_START( cadash ) MCFG_PC060HA_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mofflott ) +MACHINE_CONFIG_START(asuka_state::mofflott) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */ @@ -1092,7 +1092,7 @@ static MACHINE_CONFIG_START( mofflott ) MCFG_PC060HA_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( galmedes ) +MACHINE_CONFIG_START(asuka_state::galmedes) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */ @@ -1155,7 +1155,7 @@ static MACHINE_CONFIG_START( galmedes ) MCFG_PC060HA_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( eto ) +MACHINE_CONFIG_START(asuka_state::eto) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */ diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp index 8ec6d0eb9b0..75a183ecca6 100644 --- a/src/mame/drivers/at.cpp +++ b/src/mame/drivers/at.cpp @@ -100,6 +100,28 @@ public: void init_at_common(int xmsbase); uint16_t m_ps1_reg[2]; + void pc30iii(machine_config &config); + void k286i(machine_config &config); + void ibm5170(machine_config &config); + void ct386sx(machine_config &config); + void xb42639(machine_config &config); + void at486l(machine_config &config); + void megapcpla(machine_config &config); + void comportiii(machine_config &config); + void ibm5162(machine_config &config); + void neat(machine_config &config); + void at386l(machine_config &config); + void ibm5170a(machine_config &config); + void ec1842(machine_config &config); + void at486(machine_config &config); + void ficpio2(machine_config &config); + void at386sx(machine_config &config); + void pc40iii(machine_config &config); + void atvga(machine_config &config); + void ibmps1(machine_config &config); + void at386(machine_config &config); + + static void cfg_single_1200K(device_t *device); }; class megapc_state : public driver_device @@ -127,6 +149,8 @@ public: DECLARE_WRITE_LINE_MEMBER( wd7600_hold ); DECLARE_WRITE8_MEMBER( wd7600_tc ) { m_isabus->eop_w(offset, data); } DECLARE_WRITE_LINE_MEMBER( wd7600_spkr ) { m_speaker->level_w(state); } + void megapcpl(machine_config &config); + void megapc(machine_config &config); }; @@ -328,18 +352,17 @@ MACHINE_START_MEMBER(at_state,vrom_fix) membank("vrom_bank")->set_base(machine().root_device().memregion("bios")->base()); } -static MACHINE_CONFIG_START( cfg_single_1200K ) - MCFG_DEVICE_MODIFY("fdc:0") - MCFG_SLOT_DEFAULT_OPTION("525hd") - MCFG_DEVICE_MODIFY("fdc:1") - MCFG_SLOT_DEFAULT_OPTION("") -MACHINE_CONFIG_END +void at_state::cfg_single_1200K(device_t *device) +{ + device_slot_interface::static_set_default_option(*device->subdevice("fdc:0"), "525hd"); + device_slot_interface::static_set_default_option(*device->subdevice("fdc:1"), ""); +} static SLOT_INTERFACE_START( pci_devices ) SLOT_INTERFACE_INTERNAL("vt82c505", VT82C505) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( ibm5170 ) +MACHINE_CONFIG_START(at_state::ibm5170) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80286, XTAL_12MHz/2 /*6000000*/) MCFG_CPU_PROGRAM_MAP(at16_map) @@ -349,7 +372,7 @@ static MACHINE_CONFIG_START( ibm5170 ) MCFG_DEVICE_ADD("mb", AT_MB, 0) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_FRAGMENT_ADD(at_softlists) + downcast(device)->at_softlists(config); MCFG_ISA16_SLOT_ADD("mb:isabus","isa1", pc_isa16_cards, "ega", false) MCFG_ISA16_SLOT_ADD("mb:isabus","isa2", pc_isa16_cards, "fdc", false) @@ -364,24 +387,24 @@ static MACHINE_CONFIG_START( ibm5170 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ibm5170a, ibm5170 ) +MACHINE_CONFIG_DERIVED(at_state::ibm5170a, ibm5170) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(XTAL_16MHz/2) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ec1842, ibm5170 ) +MACHINE_CONFIG_DERIVED(at_state::ec1842, ibm5170) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(12000000) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ibm5162, ibm5170 ) +MACHINE_CONFIG_DERIVED(at_state::ibm5162, ibm5170) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(6000000) MCFG_DEVICE_MODIFY("isa1") MCFG_DEVICE_SLOT_INTERFACE(pc_isa16_cards, "cga", false) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ibmps1, ibm5170 ) +MACHINE_CONFIG_DERIVED(at_state::ibmps1, ibm5170) MCFG_MACHINE_START_OVERRIDE(at_state, vrom_fix) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(XTAL_10MHz) @@ -393,7 +416,7 @@ static MACHINE_CONFIG_DERIVED( ibmps1, ibm5170 ) MCFG_DEVICE_SLOT_INTERFACE(pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL, false) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( atvga, ibm5170 ) +MACHINE_CONFIG_DERIVED(at_state::atvga, ibm5170) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(12000000) MCFG_DEVICE_MODIFY("isa1") @@ -403,7 +426,7 @@ static MACHINE_CONFIG_DERIVED( atvga, ibm5170 ) MCFG_ISA16_SLOT_ADD("mb:isabus","isa5", pc_isa16_cards, nullptr, false) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( neat, atvga ) +MACHINE_CONFIG_DERIVED(at_state::neat, atvga) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(neat_io) MCFG_DEVICE_REMOVE("mb:rtc") // TODO: move this into the cs8221 @@ -413,12 +436,12 @@ static MACHINE_CONFIG_DERIVED( neat, atvga ) MCFG_CS8221_ADD("cs8221", "maincpu", "mb:isa", "bios") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( xb42639, atvga ) +MACHINE_CONFIG_DERIVED(at_state::xb42639, atvga) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(12500000) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( k286i, ibm5162 ) +MACHINE_CONFIG_DERIVED(at_state::k286i, ibm5162) MCFG_DEVICE_MODIFY("kbd") MCFG_DEVICE_SLOT_INTERFACE(pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL, false) MCFG_ISA16_SLOT_ADD("mb:isabus","isa5", pc_isa16_cards, nullptr, false) @@ -427,7 +450,7 @@ static MACHINE_CONFIG_DERIVED( k286i, ibm5162 ) MCFG_ISA16_SLOT_ADD("mb:isabus","isa8", pc_isa16_cards, nullptr, false) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( at386 ) +MACHINE_CONFIG_START(at_state::at386) MCFG_CPU_ADD("maincpu", I386, 12000000) MCFG_CPU_PROGRAM_MAP(at32_map) MCFG_CPU_IO_MAP(at32_io) @@ -435,7 +458,7 @@ static MACHINE_CONFIG_START( at386 ) MCFG_DEVICE_ADD("mb", AT_MB, 0) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_FRAGMENT_ADD(at_softlists) + downcast(device)->at_softlists(config); MCFG_NVRAM_ADD_0FILL("nvram") // on board devices @@ -457,38 +480,38 @@ static MACHINE_CONFIG_START( at386 ) MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,15M,16M,32M,64M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( at386l, at386 ) +MACHINE_CONFIG_DERIVED(at_state::at386l, at386) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(at32l_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( at486, at386 ) +MACHINE_CONFIG_DERIVED(at_state::at486, at386) MCFG_CPU_REPLACE("maincpu", I486, 25000000) MCFG_CPU_PROGRAM_MAP(at32_map) MCFG_CPU_IO_MAP(at32_io) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( at486l, at486 ) +MACHINE_CONFIG_DERIVED(at_state::at486l, at486) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(at32l_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( at386sx, atvga ) +MACHINE_CONFIG_DERIVED(at_state::at386sx, atvga) MCFG_CPU_REPLACE("maincpu", I386SX, 16000000) /* 386SX */ MCFG_CPU_PROGRAM_MAP(at16_map) MCFG_CPU_IO_MAP(at16_io) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ct386sx, at386sx ) +MACHINE_CONFIG_DERIVED(at_state::ct386sx, at386sx) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(neat_io) MCFG_CS8221_ADD("cs8221", "maincpu", "mb:isa", "maincpu") MACHINE_CONFIG_END // Commodore PC 30-III -static MACHINE_CONFIG_DERIVED( pc30iii, ibm5170 ) +MACHINE_CONFIG_DERIVED(at_state::pc30iii, ibm5170) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(6000000) // should be XTAL_24MHz/2, but doesn't post with that setting MCFG_DEVICE_MODIFY("isa1") @@ -496,14 +519,14 @@ static MACHINE_CONFIG_DERIVED( pc30iii, ibm5170 ) MACHINE_CONFIG_END // Commodore PC 40-III -static MACHINE_CONFIG_DERIVED( pc40iii, ibm5170 ) +MACHINE_CONFIG_DERIVED(at_state::pc40iii, ibm5170) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(6000000) // should be XTAL_24MHz/2, but doesn't post with that setting MCFG_DEVICE_MODIFY("isa1") MCFG_DEVICE_SLOT_INTERFACE(pc_isa16_cards, "vga", false) // should be onboard Paradise VGA, see ROM declarations MACHINE_CONFIG_END -static MACHINE_CONFIG_START( megapc ) +MACHINE_CONFIG_START(megapc_state::megapc) MCFG_CPU_ADD("maincpu", I386SX, XTAL_50MHz / 2) MCFG_CPU_PROGRAM_MAP(megapc_map) MCFG_CPU_IO_MAP(megapc_io) @@ -577,18 +600,17 @@ static MACHINE_CONFIG_START( megapc ) MCFG_PALETTE_ADD("palette", 256) // todo: really needed? /* software lists */ - MCFG_FRAGMENT_ADD( at_softlists ) MCFG_SOFTWARE_LIST_ADD("disk_list","megapc") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( megapcpl, megapc ) +MACHINE_CONFIG_DERIVED(megapc_state::megapcpl, megapc) MCFG_CPU_REPLACE("maincpu", I486, 66000000 / 2) MCFG_CPU_PROGRAM_MAP(megapcpl_map) MCFG_CPU_IO_MAP(megapcpl_io) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("wd7600", wd7600_device, intack_cb) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( megapcpla ) +MACHINE_CONFIG_START(at_state::megapcpla) MCFG_CPU_ADD("maincpu", I486, 66000000 / 2) // 486SLC MCFG_CPU_PROGRAM_MAP(at32l_map) MCFG_CPU_IO_MAP(at32_io) @@ -597,7 +619,7 @@ static MACHINE_CONFIG_START( megapcpla ) MCFG_DEVICE_ADD("mb", AT_MB, 0) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_FRAGMENT_ADD(at_softlists) + downcast(device)->at_softlists(config); MCFG_NVRAM_ADD_0FILL("nvram") // on board devices @@ -622,7 +644,7 @@ static MACHINE_CONFIG_START( megapcpla ) MCFG_SOFTWARE_LIST_ADD("disk_list","megapc") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ficpio2 ) +MACHINE_CONFIG_START(at_state::ficpio2) MCFG_CPU_ADD("maincpu", I486, 25000000) MCFG_CPU_PROGRAM_MAP(ficpio_map) MCFG_CPU_IO_MAP(ficpio_io) @@ -630,7 +652,7 @@ static MACHINE_CONFIG_START( ficpio2 ) MCFG_DEVICE_ADD("mb", AT_MB, 0) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_FRAGMENT_ADD(at_softlists) + downcast(device)->at_softlists(config); MCFG_DEVICE_REMOVE("mb:rtc") MCFG_DS12885_ADD("mb:rtc") @@ -665,7 +687,7 @@ static MACHINE_CONFIG_START( ficpio2 ) MACHINE_CONFIG_END // Compaq Portable III -static MACHINE_CONFIG_START( comportiii ) +MACHINE_CONFIG_START(at_state::comportiii) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80286, XTAL_48MHz/4 /*12000000*/) MCFG_CPU_PROGRAM_MAP(at16_map) @@ -675,7 +697,7 @@ static MACHINE_CONFIG_START( comportiii ) MCFG_DEVICE_ADD("mb", AT_MB, 0) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_FRAGMENT_ADD(at_softlists) + downcast(device)->at_softlists(config); MCFG_ISA16_SLOT_ADD("mb:isabus","board1", pc_isa16_cards, "fdc", true) MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc", cfg_single_1200K) diff --git a/src/mame/drivers/atari400.cpp b/src/mame/drivers/atari400.cpp index 08cce420ebd..6994ea0755f 100644 --- a/src/mame/drivers/atari400.cpp +++ b/src/mame/drivers/atari400.cpp @@ -300,6 +300,19 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(a800xl_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(a5200_interrupt); + void atari_common_nodac(machine_config &config); + void atari_common(machine_config &config); + void a800pal(machine_config &config); + void a400pal(machine_config &config); + void a5200(machine_config &config); + void a800(machine_config &config); + void a1200xl(machine_config &config); + void a800xlpal(machine_config &config); + void a130xe(machine_config &config); + void a800xl(machine_config &config); + void a600xl(machine_config &config); + void xegs(machine_config &config); + void a400(machine_config &config); protected: //required_device m_maincpu; // maincpu is already contained in atari_common_state required_device m_ram; @@ -2078,7 +2091,7 @@ WRITE8_MEMBER(a400_state::a800xl_pia_pb_w) **************************************************************/ -static MACHINE_CONFIG_START( atari_common_nodac ) +MACHINE_CONFIG_START(a400_state::atari_common_nodac) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT) @@ -2123,7 +2136,7 @@ static MACHINE_CONFIG_START( atari_common_nodac ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( atari_common, atari_common_nodac ) +MACHINE_CONFIG_DERIVED(a400_state::atari_common, atari_common_nodac) MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.03) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) @@ -2152,7 +2165,7 @@ MACHINE_CONFIG_END // memory map A400 + NTSC screen -static MACHINE_CONFIG_DERIVED( a400, atari_common ) +MACHINE_CONFIG_DERIVED(a400_state::a400, atari_common) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(a400_mem) @@ -2167,7 +2180,7 @@ MACHINE_CONFIG_END // memory map A400 + PAL screen -static MACHINE_CONFIG_DERIVED( a400pal, atari_common ) +MACHINE_CONFIG_DERIVED(a400_state::a400pal, atari_common) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(a400_mem) @@ -2182,7 +2195,7 @@ MACHINE_CONFIG_END // memory map A800 + NTSC screen + Right cartslot -static MACHINE_CONFIG_DERIVED( a800, atari_common ) +MACHINE_CONFIG_DERIVED(a400_state::a800, atari_common) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(a400_mem) @@ -2199,7 +2212,7 @@ MACHINE_CONFIG_END // memory map A800 + PAL screen + Right cartslot -static MACHINE_CONFIG_DERIVED( a800pal, atari_common ) +MACHINE_CONFIG_DERIVED(a400_state::a800pal, atari_common) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(a400_mem) @@ -2216,7 +2229,7 @@ MACHINE_CONFIG_END // memory map A600XL (same as 800XL but less RAM) + NTSC screen + MMU via PIA portB -static MACHINE_CONFIG_DERIVED( a600xl, atari_common ) +MACHINE_CONFIG_DERIVED(a400_state::a600xl, atari_common) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(a600xl_mem) @@ -2237,7 +2250,7 @@ MACHINE_CONFIG_END // memory map A800XL + NTSC screen + MMU via PIA portB -static MACHINE_CONFIG_DERIVED( a800xl, atari_common ) +MACHINE_CONFIG_DERIVED(a400_state::a800xl, atari_common) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(a800xl_mem) @@ -2258,7 +2271,7 @@ MACHINE_CONFIG_END // memory map A800XL + PAL screen + MMU via PIA portB -static MACHINE_CONFIG_DERIVED( a800xlpal, a800xl ) +MACHINE_CONFIG_DERIVED(a400_state::a800xlpal, a800xl) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_CLOCK( 1773000 ) @@ -2273,7 +2286,7 @@ MACHINE_CONFIG_END // memory map A1200XL+ MMU via PIA portB -static MACHINE_CONFIG_DERIVED( a1200xl, a800xl ) +MACHINE_CONFIG_DERIVED(a400_state::a1200xl, a800xl) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(a1200xl_mem) @@ -2284,7 +2297,7 @@ MACHINE_CONFIG_END // memory map A130XE (extra RAM only partially emulated) -static MACHINE_CONFIG_DERIVED( a130xe, a800xl ) +MACHINE_CONFIG_DERIVED(a400_state::a130xe, a800xl) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(a130xe_mem) @@ -2295,7 +2308,7 @@ MACHINE_CONFIG_END // memory map XEGS, only XEGS bankswitch supported -static MACHINE_CONFIG_DERIVED( xegs, a800xl ) +MACHINE_CONFIG_DERIVED(a400_state::xegs, a800xl) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(xegs_mem) @@ -2308,7 +2321,7 @@ MACHINE_CONFIG_END // memory map A5200, different ports, less RAM -static MACHINE_CONFIG_DERIVED( a5200, atari_common_nodac ) +MACHINE_CONFIG_DERIVED(a400_state::a5200, atari_common_nodac) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(a5200_mem) diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp index 5889e6e987e..36519754105 100644 --- a/src/mame/drivers/atari_s1.cpp +++ b/src/mame/drivers/atari_s1.cpp @@ -89,6 +89,9 @@ public: DECLARE_WRITE8_MEMBER(midearth_w); TIMER_DEVICE_CALLBACK_MEMBER(nmi); TIMER_DEVICE_CALLBACK_MEMBER(timer_s); + void midearth(machine_config &config); + void atari_s1(machine_config &config); + void atarians(machine_config &config); private: bool m_audiores; uint8_t m_timer_s[3]; @@ -436,7 +439,7 @@ void atari_s1_state::machine_reset() m_audiores = 0; } -static MACHINE_CONFIG_START( atari_s1 ) +MACHINE_CONFIG_START(atari_s1_state::atari_s1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, MASTER_CLK) MCFG_CPU_PROGRAM_MAP(atari_s1_map) @@ -458,12 +461,12 @@ static MACHINE_CONFIG_START( atari_s1 ) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_s", atari_s1_state, timer_s, attotime::from_hz(AUDIO_CLK)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( atarians, atari_s1 ) +MACHINE_CONFIG_DERIVED(atari_s1_state::atarians, atari_s1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(atarians_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( midearth, atari_s1 ) +MACHINE_CONFIG_DERIVED(atari_s1_state::midearth, atari_s1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(midearth_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp index 7ca3b2b1628..0acbd73284b 100644 --- a/src/mame/drivers/atari_s2.cpp +++ b/src/mame/drivers/atari_s2.cpp @@ -53,6 +53,8 @@ public: DECLARE_WRITE8_MEMBER(display_w); TIMER_DEVICE_CALLBACK_MEMBER(irq); TIMER_DEVICE_CALLBACK_MEMBER(timer_s); + void atari_s2(machine_config &config); + void atari_s3(machine_config &config); private: bool m_timer_sb; uint8_t m_timer_s[5]; @@ -465,7 +467,7 @@ void atari_s2_state::machine_reset() } -static MACHINE_CONFIG_START( atari_s2 ) +MACHINE_CONFIG_START(atari_s2_state::atari_s2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_4MHz / 4) MCFG_CPU_PROGRAM_MAP(atari_s2_map) @@ -489,7 +491,7 @@ static MACHINE_CONFIG_START( atari_s2 ) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_s", atari_s2_state, timer_s, attotime::from_hz(150000)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( atari_s3, atari_s2 ) +MACHINE_CONFIG_DERIVED(atari_s2_state::atari_s3, atari_s2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(atari_s3_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/atarifb.cpp b/src/mame/drivers/atarifb.cpp index e6d2468ae2c..f935090a5ad 100644 --- a/src/mame/drivers/atarifb.cpp +++ b/src/mame/drivers/atarifb.cpp @@ -550,7 +550,7 @@ void atarifb_state::machine_reset() m_counter_y_in2b = 0; } -static MACHINE_CONFIG_START( atarifb ) +MACHINE_CONFIG_START(atarifb_state::atarifb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 750000) @@ -581,7 +581,7 @@ static MACHINE_CONFIG_START( atarifb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( atarifb4, atarifb ) +MACHINE_CONFIG_DERIVED(atarifb_state::atarifb4, atarifb) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -589,7 +589,7 @@ static MACHINE_CONFIG_DERIVED( atarifb4, atarifb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( abaseb, atarifb ) +MACHINE_CONFIG_DERIVED(atarifb_state::abaseb, atarifb) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -606,7 +606,7 @@ static MACHINE_CONFIG_DERIVED( abaseb, atarifb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( soccer, atarifb ) +MACHINE_CONFIG_DERIVED(atarifb_state::soccer, atarifb) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/atarig1.cpp b/src/mame/drivers/atarig1.cpp index 4ae33e667ee..0e0d029ad9e 100644 --- a/src/mame/drivers/atarig1.cpp +++ b/src/mame/drivers/atarig1.cpp @@ -424,7 +424,7 @@ static const atari_rle_objects_config modesc_pitfight = * *************************************/ -static MACHINE_CONFIG_START( atarig1 ) +MACHINE_CONFIG_START(atarig1_state::atarig1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz) @@ -466,42 +466,42 @@ static MACHINE_CONFIG_START( atarig1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hydra, atarig1 ) +MACHINE_CONFIG_DERIVED(atarig1_state::hydra, atarig1) MCFG_ATARIRLE_ADD("rle", modesc_hydra) MCFG_SLAPSTIC_ADD("slapstic", 116) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hydrap, hydra ) +MACHINE_CONFIG_DERIVED(atarig1_state::hydrap, hydra) MCFG_DEVICE_REMOVE("slapstic") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pitfight9, atarig1 ) +MACHINE_CONFIG_DERIVED(atarig1_state::pitfight9, atarig1) MCFG_ATARIRLE_ADD("rle", modesc_pitfight) MCFG_SLAPSTIC_ADD("slapstic", 114) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pitfight7, atarig1 ) +MACHINE_CONFIG_DERIVED(atarig1_state::pitfight7, atarig1) MCFG_ATARIRLE_ADD("rle", modesc_pitfight) MCFG_SLAPSTIC_ADD("slapstic", 112) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pitfight, atarig1 ) +MACHINE_CONFIG_DERIVED(atarig1_state::pitfight, atarig1) MCFG_ATARIRLE_ADD("rle", modesc_pitfight) MCFG_SLAPSTIC_ADD("slapstic", 111) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pitfightj, atarig1 ) +MACHINE_CONFIG_DERIVED(atarig1_state::pitfightj, atarig1) MCFG_ATARIRLE_ADD("rle", modesc_pitfight) MCFG_SLAPSTIC_ADD("slapstic", 113) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pitfightb, atarig1 ) +MACHINE_CONFIG_DERIVED(atarig1_state::pitfightb, atarig1) MCFG_ATARIRLE_ADD("rle", modesc_pitfight) MACHINE_CONFIG_END diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp index 832d32896fc..a3b2a4690d7 100644 --- a/src/mame/drivers/atarig42.cpp +++ b/src/mame/drivers/atarig42.cpp @@ -522,7 +522,7 @@ static const atari_rle_objects_config modesc_0x400 = * *************************************/ -static MACHINE_CONFIG_START( atarig42 ) +MACHINE_CONFIG_START(atarig42_state::atarig42) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz) @@ -563,14 +563,14 @@ static MACHINE_CONFIG_START( atarig42 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( atarig42_0x200, atarig42 ) +MACHINE_CONFIG_DERIVED(atarig42_state::atarig42_0x200, atarig42) MCFG_ATARIRLE_ADD("rle", modesc_0x200) /* ASIC65 */ MCFG_ASIC65_ADD("asic65", ASIC65_ROMBASED) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( atarig42_0x400, atarig42 ) +MACHINE_CONFIG_DERIVED(atarig42_state::atarig42_0x400, atarig42) MCFG_ATARIRLE_ADD("rle", modesc_0x400) /* ASIC65 */ diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp index 5d2fd10fad7..3227c8a6d73 100644 --- a/src/mame/drivers/atarigt.cpp +++ b/src/mame/drivers/atarigt.cpp @@ -800,7 +800,7 @@ static const atari_rle_objects_config modesc = * *************************************/ -static MACHINE_CONFIG_START( atarigt ) +MACHINE_CONFIG_START(atarigt_state::atarigt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_50MHz/2) @@ -833,21 +833,21 @@ static MACHINE_CONFIG_START( atarigt ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tmek, atarigt ) +MACHINE_CONFIG_DERIVED(atarigt_state::tmek, atarigt) /* sound hardware */ MCFG_DEVICE_ADD("cage", ATARI_CAGE, 0) MCFG_ATARI_CAGE_SPEEDUP(0x4fad) MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(atarigt_state,cage_irq_callback)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( primrage, atarigt ) +MACHINE_CONFIG_DERIVED(atarigt_state::primrage, atarigt) /* sound hardware */ MCFG_DEVICE_ADD("cage", ATARI_CAGE, 0) MCFG_ATARI_CAGE_SPEEDUP(0x42f2) MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(atarigt_state,cage_irq_callback)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( primrage20, atarigt ) +MACHINE_CONFIG_DERIVED(atarigt_state::primrage20, atarigt) /* sound hardware */ MCFG_DEVICE_ADD("cage", ATARI_CAGE, 0) MCFG_ATARI_CAGE_SPEEDUP(0x48a4) diff --git a/src/mame/drivers/atarigx2.cpp b/src/mame/drivers/atarigx2.cpp index c0bce2e4999..716358f38a3 100644 --- a/src/mame/drivers/atarigx2.cpp +++ b/src/mame/drivers/atarigx2.cpp @@ -1494,7 +1494,7 @@ static const atari_rle_objects_config modesc_0x400 = * *************************************/ -static MACHINE_CONFIG_START( atarigx2 ) +MACHINE_CONFIG_START(atarigx2_state::atarigx2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_14MHz) @@ -1534,12 +1534,12 @@ static MACHINE_CONFIG_START( atarigx2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( atarigx2_0x200, atarigx2 ) +MACHINE_CONFIG_DERIVED(atarigx2_state::atarigx2_0x200, atarigx2) MCFG_DEVICE_ADD("xga", ATARI_136094_0072, 0) MCFG_ATARIRLE_ADD("rle", modesc_0x200) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( atarigx2_0x400, atarigx2 ) +MACHINE_CONFIG_DERIVED(atarigx2_state::atarigx2_0x400, atarigx2) MCFG_DEVICE_ADD("xga", ATARI_136095_0072, 0) MCFG_ATARIRLE_ADD("rle", modesc_0x400) MACHINE_CONFIG_END diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp index d8ea63c8e22..dc6eb9ea3b7 100644 --- a/src/mame/drivers/atarist.cpp +++ b/src/mame/drivers/atarist.cpp @@ -2072,7 +2072,7 @@ SLOT_INTERFACE_END // MACHINE_CONFIG( st ) //------------------------------------------------- -static MACHINE_CONFIG_START( st ) +MACHINE_CONFIG_START(st_state::st) // basic machine hardware MCFG_CPU_ADD(M68000_TAG, M68000, Y2/4) MCFG_CPU_PROGRAM_MAP(st_map) @@ -2162,7 +2162,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( megast ) //------------------------------------------------- -static MACHINE_CONFIG_START( megast ) +MACHINE_CONFIG_START(megast_state::megast) // basic machine hardware MCFG_CPU_ADD(M68000_TAG, M68000, Y2/4) MCFG_CPU_PROGRAM_MAP(megast_map) @@ -2253,7 +2253,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( ste ) //------------------------------------------------- -static MACHINE_CONFIG_START( ste ) +MACHINE_CONFIG_START(ste_state::ste) // basic machine hardware MCFG_CPU_ADD(M68000_TAG, M68000, Y2/4) MCFG_CPU_PROGRAM_MAP(ste_map) @@ -2351,7 +2351,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( megaste ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( megaste, ste ) +MACHINE_CONFIG_DERIVED(megaste_state::megaste, ste) MCFG_CPU_MODIFY(M68000_TAG) MCFG_CPU_PROGRAM_MAP(megaste_map) MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL_32_768kHz) @@ -2368,7 +2368,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( stbook ) //------------------------------------------------- #if 0 -static MACHINE_CONFIG_START( stbook ) +static MACHINE_CONFIG_START(stbook_state::stbook) // basic machine hardware MCFG_CPU_ADD(M68000_TAG, M68000, U517/2) MCFG_CPU_PROGRAM_MAP(stbook_map) @@ -2454,7 +2454,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( tt030 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( tt030, ste ) +MACHINE_CONFIG_DERIVED(ste_state::tt030, ste) MACHINE_CONFIG_END @@ -2462,7 +2462,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( falcon ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( falcon, ste ) +MACHINE_CONFIG_DERIVED(ste_state::falcon, ste) MACHINE_CONFIG_END @@ -2470,7 +2470,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( falcon40 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( falcon40, ste ) +MACHINE_CONFIG_DERIVED(ste_state::falcon40, ste) MACHINE_CONFIG_END diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp index f015ea086b5..21034a7a5bc 100644 --- a/src/mame/drivers/atarisy1.cpp +++ b/src/mame/drivers/atarisy1.cpp @@ -725,7 +725,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( atarisy1 ) +MACHINE_CONFIG_START(atarisy1_state::atarisy1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2) @@ -802,27 +802,27 @@ static MACHINE_CONFIG_START( atarisy1 ) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(atarisy1_state, via_pb_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( marble, atarisy1 ) +MACHINE_CONFIG_DERIVED(atarisy1_state::marble, atarisy1) MCFG_SLAPSTIC_ADD("slapstic", 103) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( peterpak, atarisy1 ) +MACHINE_CONFIG_DERIVED(atarisy1_state::peterpak, atarisy1) MCFG_SLAPSTIC_ADD("slapstic", 107) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( indytemp, atarisy1 ) +MACHINE_CONFIG_DERIVED(atarisy1_state::indytemp, atarisy1) MCFG_SLAPSTIC_ADD("slapstic", 105) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( roadrunn, atarisy1 ) +MACHINE_CONFIG_DERIVED(atarisy1_state::roadrunn, atarisy1) MCFG_SLAPSTIC_ADD("slapstic", 108) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( roadb109, atarisy1 ) +MACHINE_CONFIG_DERIVED(atarisy1_state::roadb109, atarisy1) MCFG_SLAPSTIC_ADD("slapstic", 109) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( roadb110, atarisy1 ) +MACHINE_CONFIG_DERIVED(atarisy1_state::roadb110, atarisy1) MCFG_SLAPSTIC_ADD("slapstic", 110) MACHINE_CONFIG_END diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp index c33db51c5e8..a7330a98126 100644 --- a/src/mame/drivers/atarisy2.cpp +++ b/src/mame/drivers/atarisy2.cpp @@ -1185,7 +1185,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( atarisy2 ) +MACHINE_CONFIG_START(atarisy2_state::atarisy2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", T11, MASTER_CLOCK/2) @@ -1244,12 +1244,12 @@ static MACHINE_CONFIG_START( atarisy2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( paperboy, atarisy2 ) +MACHINE_CONFIG_DERIVED(atarisy2_state::paperboy, atarisy2) MCFG_SLAPSTIC_ADD("slapstic", 105) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( 720, atarisy2 ) +MACHINE_CONFIG_DERIVED(atarisy2_state::_720, atarisy2) /* without the default EEPROM, 720 hangs at startup due to communication issues with the sound CPU; temporarily increasing the sound CPU frequency to ~2.2MHz "fixes" the problem */ @@ -1258,7 +1258,7 @@ static MACHINE_CONFIG_DERIVED( 720, atarisy2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ssprint, atarisy2 ) +MACHINE_CONFIG_DERIVED(atarisy2_state::ssprint, atarisy2) MCFG_SLAPSTIC_ADD("slapstic", 108) /* sound hardware */ @@ -1266,7 +1266,7 @@ static MACHINE_CONFIG_DERIVED( ssprint, atarisy2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( csprint, atarisy2 ) +MACHINE_CONFIG_DERIVED(atarisy2_state::csprint, atarisy2) MCFG_SLAPSTIC_ADD("slapstic", 109) /* sound hardware */ @@ -1274,7 +1274,7 @@ static MACHINE_CONFIG_DERIVED( csprint, atarisy2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apb, atarisy2 ) +MACHINE_CONFIG_DERIVED(atarisy2_state::apb, atarisy2) MCFG_SLAPSTIC_ADD("slapstic", 110) MACHINE_CONFIG_END @@ -3236,12 +3236,12 @@ GAME( 1984, paperboy, 0, paperboy, paperboy, atarisy2_state, paperboy, GAME( 1984, paperboyr2,paperboy, paperboy, paperboy, atarisy2_state, paperboy, ROT0, "Atari Games", "Paperboy (rev 2)", MACHINE_SUPPORTS_SAVE ) GAME( 1984, paperboyr1,paperboy, paperboy, paperboy, atarisy2_state, paperboy, ROT0, "Atari Games", "Paperboy (rev 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1986, 720, 0, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 4)", MACHINE_SUPPORTS_SAVE ) -GAME( 1986, 720r3, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 3)", MACHINE_SUPPORTS_SAVE ) -GAME( 1986, 720r2, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1986, 720r1, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1986, 720g, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (German, rev 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1986, 720gr1, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (German, rev 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, 720, 0, _720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 4)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, 720r3, 720, _720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 3)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, 720r2, 720, _720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, 720r1, 720, _720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, 720g, 720, _720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (German, rev 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, 720gr1, 720, _720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (German, rev 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1986, ssprint, 0, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (rev 4)", MACHINE_SUPPORTS_SAVE ) GAME( 1986, ssprint3, ssprint, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (rev 3)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/atarisy4.cpp b/src/mame/drivers/atarisy4.cpp index e574272d416..b53c6607f1d 100644 --- a/src/mame/drivers/atarisy4.cpp +++ b/src/mame/drivers/atarisy4.cpp @@ -107,6 +107,8 @@ public: inline uint8_t hex_to_ascii(uint8_t in); void load_ldafile(address_space &space, const uint8_t *file); void load_hexfile(address_space &space, const uint8_t *file); + void airrace(machine_config &config); + void atarisy4(machine_config &config); }; @@ -757,7 +759,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( atarisy4 ) +MACHINE_CONFIG_START(atarisy4_state::atarisy4) MCFG_CPU_ADD("maincpu", M68000, 8000000) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", atarisy4_state, vblank_int) @@ -776,7 +778,7 @@ static MACHINE_CONFIG_START( atarisy4 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( airrace, atarisy4 ) +MACHINE_CONFIG_DERIVED(atarisy4_state::airrace, atarisy4) MCFG_CPU_ADD("dsp1", TMS32010, 16000000) MCFG_CPU_PROGRAM_MAP(dsp1_map) diff --git a/src/mame/drivers/atarittl.cpp b/src/mame/drivers/atarittl.cpp index 23a83e7292f..2b602ecb803 100644 --- a/src/mame/drivers/atarittl.cpp +++ b/src/mame/drivers/atarittl.cpp @@ -117,6 +117,7 @@ public: required_device m_maincpu; required_device m_video; + void atarikee(machine_config &config); protected: // driver_device overrides @@ -163,6 +164,7 @@ public: uint32_t screen_update_stuntcyc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void stuntcyc(machine_config &config); protected: // driver_device overrides @@ -306,7 +308,7 @@ uint32_t stuntcyc_state::screen_update_stuntcyc(screen_device &screen, bitmap_rg return 0; } -static MACHINE_CONFIG_START( atarikee ) +MACHINE_CONFIG_START(atarikee_state::atarikee) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) MCFG_NETLIST_SETUP(atarikee) @@ -323,7 +325,7 @@ MACHINE_CONFIG_END //#define STUNTCYC_NL_CLOCK (14318181*69) #define STUNTCYC_NL_CLOCK (SC_HTOTAL*SC_VTOTAL*60*140) -static MACHINE_CONFIG_START( stuntcyc ) +MACHINE_CONFIG_START(stuntcyc_state::stuntcyc) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, STUNTCYC_NL_CLOCK) MCFG_NETLIST_SETUP(stuntcyc) diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp index 6b454f78d2d..41d3b3b4b07 100644 --- a/src/mame/drivers/atetris.cpp +++ b/src/mame/drivers/atetris.cpp @@ -326,7 +326,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( atetris ) +MACHINE_CONFIG_START(atetris_state::atetris) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,MASTER_CLOCK/8) @@ -365,7 +365,7 @@ static MACHINE_CONFIG_START( atetris ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( atetrisb2 ) +MACHINE_CONFIG_START(atetris_state::atetrisb2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,BOOTLEG_CLOCK/8) @@ -405,7 +405,7 @@ static MACHINE_CONFIG_START( atetrisb2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( atetrisb3, atetrisb2 ) +MACHINE_CONFIG_DERIVED(atetris_state::atetrisb3, atetrisb2) MCFG_CPU_REPLACE("maincpu", M6502, MASTER_CLOCK/8) MCFG_CPU_PROGRAM_MAP(atetrisb3_map) diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp index 7cff5475c97..1129a7b9fd5 100644 --- a/src/mame/drivers/atlantis.cpp +++ b/src/mame/drivers/atlantis.cpp @@ -182,6 +182,7 @@ public: DECLARE_READ8_MEMBER(parallel_r); DECLARE_WRITE8_MEMBER(parallel_w); + void mwskins(machine_config &config); }; // Parallel Port @@ -792,7 +793,7 @@ DEVICE_INPUT_DEFAULTS_END * *************************************/ -static MACHINE_CONFIG_START( mwskins ) +MACHINE_CONFIG_START(atlantis_state::mwskins) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", VR4310LE, 166666666) // clock is TRUSTED diff --git a/src/mame/drivers/atm.cpp b/src/mame/drivers/atm.cpp index 32d65b443c8..8fafbc3fbb3 100644 --- a/src/mame/drivers/atm.cpp +++ b/src/mame/drivers/atm.cpp @@ -35,6 +35,8 @@ public: DECLARE_READ8_MEMBER(beta_disable_r); DECLARE_MACHINE_RESET(atm); + void atm(machine_config &config); + void atmtb2(machine_config &config); protected: required_memory_bank m_bank1; required_memory_bank m_bank2; @@ -178,7 +180,7 @@ static GFXDECODE_START( atmtb2 ) GFXDECODE_END -static MACHINE_CONFIG_DERIVED( atm, spectrum_128 ) +MACHINE_CONFIG_DERIVED(atm_state::atm, spectrum_128) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(atm_mem) MCFG_CPU_IO_MAP(atm_io) @@ -192,7 +194,7 @@ static MACHINE_CONFIG_DERIVED( atm, spectrum_128 ) MCFG_DEVICE_REMOVE("exp") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( atmtb2, atm ) +MACHINE_CONFIG_DERIVED(atm_state::atmtb2, atm) MCFG_GFXDECODE_MODIFY("gfxdecode", atmtb2) MACHINE_CONFIG_END diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp index db0969a9912..b9c059c3431 100644 --- a/src/mame/drivers/atom.cpp +++ b/src/mame/drivers/atom.cpp @@ -704,7 +704,7 @@ FLOPPY_FORMATS_END0 MACHINE_DRIVER( atom ) -------------------------------------------------*/ -static MACHINE_CONFIG_START( atom ) +MACHINE_CONFIG_START(atom_state::atom) /* basic machine hardware */ MCFG_CPU_ADD(SY6502_TAG, M6502, X2/4) MCFG_CPU_PROGRAM_MAP(atom_mem) @@ -781,7 +781,7 @@ MACHINE_CONFIG_END MCFG_GENERIC_EXTENSIONS("bin,rom") \ MCFG_GENERIC_LOAD(atomeb_state, _load) -static MACHINE_CONFIG_DERIVED( atomeb, atom ) +MACHINE_CONFIG_DERIVED(atomeb_state::atomeb, atom) MCFG_CPU_MODIFY(SY6502_TAG) MCFG_CPU_PROGRAM_MAP(atomeb_mem) @@ -813,7 +813,7 @@ MACHINE_CONFIG_END MACHINE_DRIVER( atombb ) -------------------------------------------------*/ -static MACHINE_CONFIG_START( atombb ) +MACHINE_CONFIG_START(atom_state::atombb) /* basic machine hardware */ MCFG_CPU_ADD(SY6502_TAG, M6502, X2/4) MCFG_CPU_PROGRAM_MAP(atombb_mem) diff --git a/src/mame/drivers/atpci.cpp b/src/mame/drivers/atpci.cpp index c0090ef0b92..13d50d183f3 100644 --- a/src/mame/drivers/atpci.cpp +++ b/src/mame/drivers/atpci.cpp @@ -21,6 +21,12 @@ public: required_device m_maincpu; DECLARE_WRITE8_MEMBER(boot_state_w); + void at586x3(machine_config &config); + void at586(machine_config &config); + void at_softlists(machine_config &config); + + static void tx_config(device_t *device); + static void sb_config(device_t *device); }; WRITE8_MEMBER(at586_state::boot_state_w) @@ -28,14 +34,18 @@ WRITE8_MEMBER(at586_state::boot_state_w) logerror("Boot state %02x\n", data); } -static MACHINE_CONFIG_START( tx_config ) +void at586_state::tx_config(device_t *device) +{ MCFG_I82439TX_CPU( "maincpu" ) MCFG_I82439TX_REGION( "isa" ) -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_START(sb_config) +void at586_state::sb_config(device_t *device) +{ + devcb_base *devcb = nullptr; + (void)devcb; MCFG_I82371SB_BOOT_STATE_HOOK(DEVWRITE8(":", at586_state, boot_state_w)) -MACHINE_CONFIG_END +} static SLOT_INTERFACE_START( pci_devices ) SLOT_INTERFACE_INTERNAL("i82439tx", I82439TX) @@ -55,7 +65,14 @@ static ADDRESS_MAP_START( at586_io, AS_IO, 32, at586_state ) AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_device, read, write) ADDRESS_MAP_END -static MACHINE_CONFIG_START( at586 ) +MACHINE_CONFIG_START(at586_state::at_softlists) + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") + MCFG_SOFTWARE_LIST_ADD("at_disk_list","ibm5170") + MCFG_SOFTWARE_LIST_ADD("at_cdrom_list","ibm5170_cdrom") +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(at586_state::at586) MCFG_CPU_ADD("maincpu", PENTIUM, 60000000) MCFG_CPU_PROGRAM_MAP(at586_map) MCFG_CPU_IO_MAP(at586_io) @@ -80,7 +97,7 @@ static MACHINE_CONFIG_START( at586 ) MCFG_FRAGMENT_ADD( at_softlists ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( at586x3 ) +MACHINE_CONFIG_START(at586_state::at586x3) MCFG_CPU_ADD("maincpu", PENTIUM, 60000000) MCFG_CPU_PROGRAM_MAP(at586_map) MCFG_CPU_IO_MAP(at586_io) diff --git a/src/mame/drivers/atronic.cpp b/src/mame/drivers/atronic.cpp index 48dd7be2f6a..05ccf71dc35 100644 --- a/src/mame/drivers/atronic.cpp +++ b/src/mame/drivers/atronic.cpp @@ -29,6 +29,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void atronic(machine_config &config); protected: // devices @@ -58,7 +59,7 @@ static INPUT_PORTS_START( atronic ) INPUT_PORTS_END -static MACHINE_CONFIG_START( atronic ) +MACHINE_CONFIG_START(atronic_state::atronic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, 6000000) MCFG_CPU_PROGRAM_MAP(atronic_map) diff --git a/src/mame/drivers/att4425.cpp b/src/mame/drivers/att4425.cpp index 5e8ea2a9770..1c63726adb8 100644 --- a/src/mame/drivers/att4425.cpp +++ b/src/mame/drivers/att4425.cpp @@ -60,6 +60,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void att4425(machine_config &config); private: virtual void machine_start() override; virtual void video_start() override; @@ -231,7 +232,7 @@ static const z80_daisy_config att4425_daisy_chain[] = { nullptr } }; -static MACHINE_CONFIG_START( att4425 ) +MACHINE_CONFIG_START(att4425_state::att4425) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_32MHz/8) // XXX MCFG_CPU_PROGRAM_MAP(att4425_mem) diff --git a/src/mame/drivers/att630.cpp b/src/mame/drivers/att630.cpp index 2ed925968f7..f87a2f96fca 100644 --- a/src/mame/drivers/att630.cpp +++ b/src/mame/drivers/att630.cpp @@ -21,6 +21,7 @@ public: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void att630(machine_config &config); private: required_device m_maincpu; }; @@ -43,7 +44,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( att630 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( att630 ) +MACHINE_CONFIG_START(att630_state::att630) MCFG_CPU_ADD("maincpu", M68000, XTAL_40MHz / 4) // clock not confirmed MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index 3a31304a53a..da17214bc1a 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -180,6 +180,7 @@ public: void keyboard_clock_w(bool state); uint8_t keyboard_data_r(); uint16_t get_key(); + void attache(machine_config &config); private: required_device m_maincpu; required_memory_region m_rom; @@ -257,6 +258,7 @@ public: virtual void machine_reset() override; + void attache816(machine_config &config); private: required_device m_extcpu; required_device m_ppi; @@ -1094,7 +1096,7 @@ void attache816_state::machine_reset() attache_state::machine_reset(); } -static MACHINE_CONFIG_START( attache ) +MACHINE_CONFIG_START(attache_state::attache) MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(attache_map) MCFG_CPU_IO_MAP(attache_io) @@ -1172,7 +1174,7 @@ static MACHINE_CONFIG_START( attache ) MCFG_SOFTWARE_LIST_ADD("disk_list","attache") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( attache816 ) +MACHINE_CONFIG_START(attache816_state::attache816) MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(attache_map) MCFG_CPU_IO_MAP(attache816_io) diff --git a/src/mame/drivers/attckufo.cpp b/src/mame/drivers/attckufo.cpp index 5d4eac1be22..fe748071947 100644 --- a/src/mame/drivers/attckufo.cpp +++ b/src/mame/drivers/attckufo.cpp @@ -32,6 +32,7 @@ public: DECLARE_READ8_MEMBER( vic_videoram_r ); DECLARE_READ8_MEMBER( vic_colorram_r ); + void attckufo(machine_config &config); private: required_device m_maincpu; }; @@ -110,7 +111,7 @@ READ8_MEMBER(attckufo_state::vic_colorram_r) // MACHINE DEFINTIONS //************************************************************************** -static MACHINE_CONFIG_START( attckufo ) +MACHINE_CONFIG_START(attckufo_state::attckufo) MCFG_CPU_ADD("maincpu", M6502, XTAL_14_31818MHz / 14) MCFG_CPU_PROGRAM_MAP(cpu_map) diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp index 4592a980750..38e31873ed6 100644 --- a/src/mame/drivers/atvtrack.cpp +++ b/src/mame/drivers/atvtrack.cpp @@ -144,6 +144,7 @@ public: u16 gpu_irq_mask; void gpu_irq_test(); void gpu_irq_set(int); + void atvtrack(machine_config &config); protected: bool m_slaverun; }; @@ -157,6 +158,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void smashdrv(machine_config &config); }; void atvtrack_state::logbinary(uint32_t data,int high=31,int low=0) @@ -550,7 +552,7 @@ INPUT_PORTS_END #define ATV_CPU_CLOCK XTAL_33MHz*6 -static MACHINE_CONFIG_START( atvtrack ) +MACHINE_CONFIG_START(atvtrack_state::atvtrack) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH4LE, ATV_CPU_CLOCK) MCFG_SH4_MD0(1) @@ -593,7 +595,7 @@ static MACHINE_CONFIG_START( atvtrack ) MCFG_PALETTE_ADD("palette", 0x1000) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( smashdrv, atvtrack ) +MACHINE_CONFIG_DERIVED(smashdrv_state::smashdrv, atvtrack) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(smashdrv_main_map) MCFG_CPU_IO_MAP(smashdrv_main_port) diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp index fdf46923f6e..3271bb4dc70 100644 --- a/src/mame/drivers/aussiebyte.cpp +++ b/src/mame/drivers/aussiebyte.cpp @@ -441,7 +441,7 @@ MACHINE_RESET_MEMBER( aussiebyte_state, aussiebyte ) m_maincpu->reset(); } -static MACHINE_CONFIG_START( aussiebyte ) +MACHINE_CONFIG_START(aussiebyte_state::aussiebyte) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(aussiebyte_map) diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp index e1e9628eb2b..c0bd018cf95 100644 --- a/src/mame/drivers/avalnche.cpp +++ b/src/mame/drivers/avalnche.cpp @@ -230,7 +230,7 @@ void avalnche_state::machine_start() save_item(NAME(m_avalance_video_inverted)); } -static MACHINE_CONFIG_START( avalnche_base ) +MACHINE_CONFIG_START(avalnche_state::avalnche_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,MASTER_CLOCK/16) /* clock input is the "2H" signal divided by two */ @@ -255,19 +255,19 @@ static MACHINE_CONFIG_START( avalnche_base ) MCFG_SCREEN_UPDATE_DRIVER(avalnche_state, screen_update_avalnche) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( avalnche, avalnche_base) +MACHINE_CONFIG_DERIVED(avalnche_state::avalnche, avalnche_base) /* sound hardware */ MCFG_FRAGMENT_ADD(avalnche_sound) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( catch, avalnche_base ) +MACHINE_CONFIG_DERIVED(avalnche_state::acatch, avalnche_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(catch_map) /* sound hardware... */ - MCFG_FRAGMENT_ADD(catch_sound) + MCFG_FRAGMENT_ADD(acatch_sound) MACHINE_CONFIG_END @@ -317,4 +317,4 @@ ROM_END GAMEL( 1978, avalnche, 0, avalnche, avalnche, avalnche_state, 0, ROT0, "Atari", "Avalanche", MACHINE_SUPPORTS_SAVE, layout_avalnche ) GAMEL( 1978, cascade, avalnche, avalnche, cascade, avalnche_state, 0, ROT0, "bootleg? (Sidam)", "Cascade", MACHINE_SUPPORTS_SAVE, layout_avalnche ) -GAME ( 1977, catchp, 0, catch, catch, avalnche_state, 0, ROT0, "Atari", "Catch (prototype)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND ) // pre-production board, evolved into Avalanche +GAME ( 1977, catchp, 0, acatch, catch, avalnche_state, 0, ROT0, "Atari", "Catch (prototype)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND ) // pre-production board, evolved into Avalanche diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp index 9b486dc2ce3..0ce9c77b669 100644 --- a/src/mame/drivers/avigo.cpp +++ b/src/mame/drivers/avigo.cpp @@ -746,7 +746,7 @@ void avigo_state::nvram_init(nvram_device &nvram, void *base, size_t size) memset(base, 0x00, size); } -static MACHINE_CONFIG_START( avigo ) +MACHINE_CONFIG_START(avigo_state::avigo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(avigo_mem) diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp index 29ac0dac2d2..809fe1f8e35 100644 --- a/src/mame/drivers/avt.cpp +++ b/src/mame/drivers/avt.cpp @@ -459,6 +459,8 @@ public: DECLARE_PALETTE_INIT(avt); uint32_t screen_update_avt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void avtnfl(machine_config &config); + void avt(machine_config &config); private: tilemap_t *m_bg_tilemap; uint8_t m_crtc_vreg[0x100],m_crtc_index; @@ -952,7 +954,7 @@ WRITE_LINE_MEMBER( avt_state::avtbingo_w ) m_pio0->port_b_write(ioport("IN0")->read()); } -static MACHINE_CONFIG_START( avt ) +MACHINE_CONFIG_START(avt_state::avt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* guess */ MCFG_Z80_DAISY_CHAIN(daisy_chain) @@ -1009,7 +1011,7 @@ WRITE_LINE_MEMBER( avt_state::avtnfl_w ) m_pio1->port_b_write((m_pio1->port_b_read() & 0xbf) | (state ? 0x40 : 0)); } -static MACHINE_CONFIG_DERIVED( avtnfl, avt ) +MACHINE_CONFIG_DERIVED(avt_state::avtnfl, avt) MCFG_DEVICE_REMOVE("crtc") MCFG_MC6845_ADD("crtc", MC6845, "screen", CRTC_CLOCK) /* guess */ MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/drivers/ax20.cpp b/src/mame/drivers/ax20.cpp index ab4382bf502..aef08791b16 100644 --- a/src/mame/drivers/ax20.cpp +++ b/src/mame/drivers/ax20.cpp @@ -44,6 +44,7 @@ public: DECLARE_READ8_MEMBER(unk_r); DECLARE_WRITE8_MEMBER(tc_w); DECLARE_WRITE8_MEMBER(ctl_w); + void ax20(machine_config &config); }; READ8_MEMBER(ax20_state::unk_r) @@ -121,7 +122,7 @@ static SLOT_INTERFACE_START( ax20_floppies ) SLOT_INTERFACE( "525dd", FLOPPY_525_DD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( ax20 ) +MACHINE_CONFIG_START(ax20_state::ax20) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3) MCFG_CPU_PROGRAM_MAP(ax20_map) diff --git a/src/mame/drivers/aztarac.cpp b/src/mame/drivers/aztarac.cpp index 7c4b92ce0fa..3804241c1ff 100644 --- a/src/mame/drivers/aztarac.cpp +++ b/src/mame/drivers/aztarac.cpp @@ -147,7 +147,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( aztarac ) +MACHINE_CONFIG_START(aztarac_state::aztarac) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) diff --git a/src/mame/drivers/b16.cpp b/src/mame/drivers/b16.cpp index 30944f6e273..807b46461e3 100644 --- a/src/mame/drivers/b16.cpp +++ b/src/mame/drivers/b16.cpp @@ -55,6 +55,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void b16(machine_config &config); }; #define mc6845_h_char_total (m_crtc_vreg[0]) @@ -269,7 +270,7 @@ WRITE8_MEMBER(b16_state::memory_write_byte) } -static MACHINE_CONFIG_START( b16 ) +MACHINE_CONFIG_START(b16_state::b16) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8086, XTAL_14_31818MHz/2) //unknown xtal MCFG_CPU_PROGRAM_MAP(b16_map) diff --git a/src/mame/drivers/b2m.cpp b/src/mame/drivers/b2m.cpp index 0d383ac4e06..9a72f7d5581 100644 --- a/src/mame/drivers/b2m.cpp +++ b/src/mame/drivers/b2m.cpp @@ -185,7 +185,7 @@ SLOT_INTERFACE_END /* Machine driver */ -static MACHINE_CONFIG_START( b2m ) +MACHINE_CONFIG_START(b2m_state::b2m) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, 2000000) MCFG_CPU_PROGRAM_MAP(b2m_mem) @@ -251,7 +251,7 @@ static MACHINE_CONFIG_START( b2m ) MCFG_RAM_DEFAULT_VALUE(0x00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( b2mrom, b2m ) +MACHINE_CONFIG_DERIVED(b2m_state::b2mrom, b2m) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(b2m_rom_io) MACHINE_CONFIG_END diff --git a/src/mame/drivers/babbage.cpp b/src/mame/drivers/babbage.cpp index d3a0470cdcf..f55491bbda6 100644 --- a/src/mame/drivers/babbage.cpp +++ b/src/mame/drivers/babbage.cpp @@ -52,6 +52,7 @@ public: DECLARE_WRITE_LINE_MEMBER(ctc_z2_w); TIMER_DEVICE_CALLBACK_MEMBER(keyboard_callback); + void babbage(machine_config &config); private: uint8_t m_segment; uint8_t m_key; @@ -216,7 +217,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(babbage_state::keyboard_callback) ***************************************************************************/ -static MACHINE_CONFIG_START( babbage ) +MACHINE_CONFIG_START(babbage_state::babbage) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK) //2.5MHz MCFG_CPU_PROGRAM_MAP(babbage_map) diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp index 01a5891858f..b2d3272d292 100644 --- a/src/mame/drivers/backfire.cpp +++ b/src/mame/drivers/backfire.cpp @@ -107,6 +107,7 @@ public: required_ioport m_io_in3; required_device m_palette; required_shared_ptr m_generic_paletteram_32; + void backfire(machine_config &config); }; //uint32_t *backfire_180010, *backfire_188010; @@ -470,7 +471,7 @@ void backfire_state::machine_start() { } -static MACHINE_CONFIG_START( backfire ) +MACHINE_CONFIG_START(backfire_state::backfire) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM, 28000000/4) /* Unconfirmed */ diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp index 1e04ff7c31c..b3a0ceca63b 100644 --- a/src/mame/drivers/badlands.cpp +++ b/src/mame/drivers/badlands.cpp @@ -500,7 +500,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( badlands ) +MACHINE_CONFIG_START(badlands_state::badlands) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) @@ -756,7 +756,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(badlands_state::bootleg_sound_scanline) m_audiocpu->set_input_line(0, HOLD_LINE); } -static MACHINE_CONFIG_START( badlandsb ) +MACHINE_CONFIG_START(badlands_state::badlandsb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/4) /* Divisor estimated */ diff --git a/src/mame/drivers/bagman.cpp b/src/mame/drivers/bagman.cpp index b4d1aa77e85..693405f8693 100644 --- a/src/mame/drivers/bagman.cpp +++ b/src/mame/drivers/bagman.cpp @@ -447,7 +447,7 @@ INTERRUPT_GEN_MEMBER(bagman_state::vblank_irq) } -static MACHINE_CONFIG_START( bagman ) +MACHINE_CONFIG_START(bagman_state::bagman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0) @@ -511,12 +511,12 @@ static MACHINE_CONFIG_START( bagman ) MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(bagman_state, tmsprom_csq1_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sbagman, bagman ) +MACHINE_CONFIG_DERIVED(bagman_state::sbagman, bagman) MCFG_DEVICE_MODIFY("mainlatch") MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(bagman_state, video_enable_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sbagmani, sbagman ) +MACHINE_CONFIG_DERIVED(bagman_state::sbagmani, sbagman) // only 1 AY8910 MCFG_DEVICE_REMOVE("tmsprom") @@ -524,7 +524,7 @@ static MACHINE_CONFIG_DERIVED( sbagmani, sbagman ) MCFG_DEVICE_REMOVE("tmslatch") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pickin ) +MACHINE_CONFIG_START(bagman_state::pickin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0) @@ -584,7 +584,7 @@ z80 */ -static MACHINE_CONFIG_START( botanic ) +MACHINE_CONFIG_START(bagman_state::botanic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0) @@ -625,7 +625,7 @@ static MACHINE_CONFIG_START( botanic ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( squaitsa, botanic ) +MACHINE_CONFIG_DERIVED(bagman_state::squaitsa, botanic) MCFG_MACHINE_START_OVERRIDE(bagman_state, squaitsa) MCFG_SOUND_MODIFY("aysnd") diff --git a/src/mame/drivers/bailey.cpp b/src/mame/drivers/bailey.cpp index ef1f4c9a34d..df0cf702688 100644 --- a/src/mame/drivers/bailey.cpp +++ b/src/mame/drivers/bailey.cpp @@ -47,6 +47,7 @@ public: required_device m_maincpu; required_device m_video; + void bailey(machine_config &config); protected: // driver_device overrides @@ -87,7 +88,7 @@ void bailey_state::video_start() { } -static MACHINE_CONFIG_START( bailey ) +MACHINE_CONFIG_START(bailey_state::bailey) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/balsente.cpp b/src/mame/drivers/balsente.cpp index 04dcafcb0f0..1603d7b32c7 100644 --- a/src/mame/drivers/balsente.cpp +++ b/src/mame/drivers/balsente.cpp @@ -1277,7 +1277,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( balsente ) +MACHINE_CONFIG_START(balsente_state::balsente) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_20MHz/16) /* xtal verified but not speed */ @@ -1362,7 +1362,7 @@ static MACHINE_CONFIG_START( balsente ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shrike, balsente ) +MACHINE_CONFIG_DERIVED(balsente_state::shrike, balsente) /* basic machine hardware */ diff --git a/src/mame/drivers/banctec.cpp b/src/mame/drivers/banctec.cpp index 7854fcef5eb..f786e2120e7 100644 --- a/src/mame/drivers/banctec.cpp +++ b/src/mame/drivers/banctec.cpp @@ -38,6 +38,7 @@ public: DECLARE_WRITE8_MEMBER(videoram_w); required_device m_palette; + void banctec(machine_config &config); private: u8 m_video_address; virtual void machine_reset() override; @@ -127,7 +128,7 @@ static GFXDECODE_START( banctec ) GFXDECODE_ENTRY( "chargen", 0x00000, banctec_gfx_layout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( banctec ) +MACHINE_CONFIG_START(banctec_state::banctec) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C31, XTAL_11_0592MHz) diff --git a/src/mame/drivers/bankp.cpp b/src/mame/drivers/bankp.cpp index 3f0e4bb52ef..be8342ead7e 100644 --- a/src/mame/drivers/bankp.cpp +++ b/src/mame/drivers/bankp.cpp @@ -291,7 +291,7 @@ INTERRUPT_GEN_MEMBER(bankp_state::vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( bankp ) +MACHINE_CONFIG_START(bankp_state::bankp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp index 4c64a2efa9a..7e5f962cf32 100644 --- a/src/mame/drivers/baraduke.cpp +++ b/src/mame/drivers/baraduke.cpp @@ -370,7 +370,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( baraduke ) +MACHINE_CONFIG_START(baraduke_state::baraduke) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_49_152MHz/32) // 68A09E diff --git a/src/mame/drivers/barata.cpp b/src/mame/drivers/barata.cpp index 5cd63e07c58..9983df33cd0 100644 --- a/src/mame/drivers/barata.cpp +++ b/src/mame/drivers/barata.cpp @@ -56,6 +56,7 @@ public: void fpga_send(unsigned char cmd); required_device m_maincpu; + void barata(machine_config &config); private: unsigned char row_selection; }; @@ -304,7 +305,7 @@ ADDRESS_MAP_END * Machine Drivers * ************************/ -static MACHINE_CONFIG_START( barata ) +MACHINE_CONFIG_START(barata_state::barata) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8051, CPU_CLOCK) MCFG_CPU_IO_MAP(i8051_io_port) diff --git a/src/mame/drivers/barni.cpp b/src/mame/drivers/barni.cpp index 96a328cb671..80b82806731 100644 --- a/src/mame/drivers/barni.cpp +++ b/src/mame/drivers/barni.cpp @@ -30,6 +30,7 @@ public: : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } + void barni(machine_config &config); private: required_device m_maincpu; }; @@ -55,7 +56,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( barni ) INPUT_PORTS_END -static MACHINE_CONFIG_START( barni ) +MACHINE_CONFIG_START(barni_state::barni) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_4MHz / 4) MCFG_CPU_PROGRAM_MAP(maincpu_map) diff --git a/src/mame/drivers/bartop52.cpp b/src/mame/drivers/bartop52.cpp index 9dc3a4eaef9..d1be82ff465 100644 --- a/src/mame/drivers/bartop52.cpp +++ b/src/mame/drivers/bartop52.cpp @@ -40,6 +40,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER( bartop_interrupt ); virtual void machine_reset() override; + void a5200(machine_config &config); }; @@ -120,7 +121,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( bartop52_state::bartop_interrupt ) m_antic->generic_interrupt(4); } -static MACHINE_CONFIG_START( a5200 ) +MACHINE_CONFIG_START(bartop52_state::a5200) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT) MCFG_CPU_PROGRAM_MAP(a5200_mem) diff --git a/src/mame/drivers/basic52.cpp b/src/mame/drivers/basic52.cpp index b998fe53ba6..cc54d3ee011 100644 --- a/src/mame/drivers/basic52.cpp +++ b/src/mame/drivers/basic52.cpp @@ -50,6 +50,8 @@ public: DECLARE_READ8_MEMBER(unk_r); DECLARE_READ8_MEMBER(from_term); + void basic52(machine_config &config); + void basic31(machine_config &config); private: uint8_t m_term_data; required_device m_maincpu; @@ -98,7 +100,7 @@ void basic52_state::kbd_put(u8 data) m_term_data = data; } -static MACHINE_CONFIG_START( basic31 ) +MACHINE_CONFIG_START(basic52_state::basic31) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8031, XTAL_11_0592MHz) MCFG_CPU_PROGRAM_MAP(basic52_mem) @@ -113,7 +115,7 @@ static MACHINE_CONFIG_START( basic31 ) MCFG_DEVICE_ADD("ppi8255", I8255, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( basic52, basic31 ) +MACHINE_CONFIG_DERIVED(basic52_state::basic52, basic31) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", I8052, XTAL_11_0592MHz) MCFG_CPU_PROGRAM_MAP(basic52_mem) diff --git a/src/mame/drivers/batman.cpp b/src/mame/drivers/batman.cpp index ea9432aacff..2b530fdfbe9 100644 --- a/src/mame/drivers/batman.cpp +++ b/src/mame/drivers/batman.cpp @@ -197,7 +197,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( batman ) +MACHINE_CONFIG_START(batman_state::batman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz) diff --git a/src/mame/drivers/battlane.cpp b/src/mame/drivers/battlane.cpp index 2b0101e93e5..2cf644b5651 100644 --- a/src/mame/drivers/battlane.cpp +++ b/src/mame/drivers/battlane.cpp @@ -270,7 +270,7 @@ void battlane_state::machine_reset() m_cpu_control = 0; } -static MACHINE_CONFIG_START( battlane ) +MACHINE_CONFIG_START(battlane_state::battlane) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 1500000) /* 1.5 MHz ? */ diff --git a/src/mame/drivers/battlera.cpp b/src/mame/drivers/battlera.cpp index 89411d0dfa2..03acaba566e 100644 --- a/src/mame/drivers/battlera.cpp +++ b/src/mame/drivers/battlera.cpp @@ -268,7 +268,7 @@ uint32_t battlera_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -static MACHINE_CONFIG_START( battlera ) +MACHINE_CONFIG_START(battlera_state::battlera) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H6280,21477200/3) diff --git a/src/mame/drivers/battlex.cpp b/src/mame/drivers/battlex.cpp index 0cd77ee5458..28817b66699 100644 --- a/src/mame/drivers/battlex.cpp +++ b/src/mame/drivers/battlex.cpp @@ -288,7 +288,7 @@ void battlex_state::machine_reset() m_in0_b4 = 0; } -static MACHINE_CONFIG_START( battlex ) +MACHINE_CONFIG_START(battlex_state::battlex) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,XTAL_10MHz/4 ) // ? @@ -315,7 +315,7 @@ static MACHINE_CONFIG_START( battlex ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dodgeman, battlex ) +MACHINE_CONFIG_DERIVED(battlex_state::dodgeman, battlex) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(dodgeman_io_map) diff --git a/src/mame/drivers/battlnts.cpp b/src/mame/drivers/battlnts.cpp index c696358af6a..b5b424aebdc 100644 --- a/src/mame/drivers/battlnts.cpp +++ b/src/mame/drivers/battlnts.cpp @@ -229,7 +229,7 @@ void battlnts_state::machine_reset() m_spritebank = 0; } -static MACHINE_CONFIG_START( battlnts ) +MACHINE_CONFIG_START(battlnts_state::battlnts) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309, XTAL_24MHz / 2 /* 3000000*4? */) diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp index ed6c9312fe2..f3c4ce2d070 100644 --- a/src/mame/drivers/bbc.cpp +++ b/src/mame/drivers/bbc.cpp @@ -825,7 +825,7 @@ WRITE_LINE_MEMBER(bbc_state::econet_clk_w) } // 4 x EPROM sockets (16K) in BBC-A, these should grow to 16 for BBC-B and later... -static MACHINE_CONFIG_START( bbc_eprom_sockets ) +MACHINE_CONFIG_START(bbc_state::bbc_eprom_sockets) MCFG_GENERIC_SOCKET_ADD("exp_rom1", generic_linear_slot, "bbc_cart") MCFG_GENERIC_EXTENSIONS("bin,rom") MCFG_GENERIC_LOAD(bbc_state, exp1_load) @@ -851,7 +851,7 @@ MACHINE_CONFIG_END ****************************************************************************/ -static MACHINE_CONFIG_START( bbca ) +MACHINE_CONFIG_START(bbc_state::bbca) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_16MHz/8) /* 2.00 MHz */ MCFG_CPU_PROGRAM_MAP(bbca_mem) @@ -940,7 +940,7 @@ static MACHINE_CONFIG_START( bbca ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbcb, bbca ) +MACHINE_CONFIG_DERIVED(bbc_state::bbcb, bbca) /* basic machine hardware */ MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(bbcb_nofdc_mem) @@ -1015,7 +1015,7 @@ static MACHINE_CONFIG_DERIVED( bbcb, bbca ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbcb_de, bbcb ) +MACHINE_CONFIG_DERIVED(bbc_state::bbcb_de, bbcb) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bbcb_mem) @@ -1036,7 +1036,7 @@ static MACHINE_CONFIG_DERIVED( bbcb_de, bbcb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbcb_us, bbcb ) +MACHINE_CONFIG_DERIVED(bbc_state::bbcb_us, bbcb) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bbcb_mem) @@ -1063,7 +1063,7 @@ static MACHINE_CONFIG_DERIVED( bbcb_us, bbcb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbcbp, bbcb ) +MACHINE_CONFIG_DERIVED(bbc_state::bbcbp, bbcb) /* basic machine hardware */ MCFG_CPU_MODIFY( "maincpu" ) /* M6512 */ MCFG_CPU_PROGRAM_MAP(bbcbp_mem) @@ -1084,7 +1084,7 @@ static MACHINE_CONFIG_DERIVED( bbcbp, bbcb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbcbp128, bbcbp ) +MACHINE_CONFIG_DERIVED(bbc_state::bbcbp128, bbcbp) /* basic machine hardware */ MCFG_CPU_MODIFY( "maincpu" ) /* M6512 */ MCFG_CPU_PROGRAM_MAP(bbcbp128_mem) @@ -1101,7 +1101,7 @@ MACHINE_CONFIG_END ****************************************************************************/ -static MACHINE_CONFIG_DERIVED( torchf, bbcb ) +MACHINE_CONFIG_DERIVED(torch240_state::torchf, bbcb) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bbcb_mem) @@ -1126,7 +1126,7 @@ static MACHINE_CONFIG_DERIVED( torchf, bbcb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( torchh10, torchf ) +MACHINE_CONFIG_DERIVED(torch240_state::torchh10, torchf) /* fdc */ MCFG_DEVICE_REMOVE("i8271:1") @@ -1135,7 +1135,7 @@ static MACHINE_CONFIG_DERIVED( torchh10, torchf ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( torchh21, torchf ) +MACHINE_CONFIG_DERIVED(torch240_state::torchh21, torchf) /* fdc */ MCFG_DEVICE_REMOVE("i8271:1") @@ -1151,7 +1151,7 @@ MACHINE_CONFIG_END ****************************************************************************/ -static MACHINE_CONFIG_DERIVED( abc110, bbcbp ) +MACHINE_CONFIG_DERIVED(bbc_state::abc110, bbcbp) /* fdc */ MCFG_DEVICE_REMOVE("wd1770:1") @@ -1183,7 +1183,7 @@ static MACHINE_CONFIG_DERIVED( abc110, bbcbp ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( acw443, bbcbp ) +MACHINE_CONFIG_DERIVED(bbc_state::acw443, bbcbp) /* fdc */ MCFG_DEVICE_REMOVE("wd1770:1") @@ -1207,7 +1207,7 @@ static MACHINE_CONFIG_DERIVED( acw443, bbcbp ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( abc310, bbcbp ) +MACHINE_CONFIG_DERIVED(bbc_state::abc310, bbcbp) /* fdc */ MCFG_DEVICE_REMOVE("wd1770:1") @@ -1234,7 +1234,7 @@ MACHINE_CONFIG_END ****************************************************************************/ -static MACHINE_CONFIG_DERIVED( reutapm, bbcbp ) +MACHINE_CONFIG_DERIVED(bbc_state::reutapm, bbcbp) /* basic machine hardware */ MCFG_CPU_MODIFY( "maincpu" ) /* M6512 */ MCFG_CPU_PROGRAM_MAP(reutapm_mem) @@ -1270,7 +1270,7 @@ MACHINE_CONFIG_END ****************************************************************************/ -static MACHINE_CONFIG_DERIVED( econx25, bbcbp ) +MACHINE_CONFIG_DERIVED(bbc_state::econx25, bbcbp) /* sound hardware */ MCFG_DEVICE_REMOVE("vsm") MCFG_DEVICE_REMOVE("tms5220") @@ -1297,7 +1297,7 @@ MACHINE_CONFIG_END ****************************************************************************/ -static MACHINE_CONFIG_START( bbcm ) +MACHINE_CONFIG_START(bbc_state::bbcm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65SC02, XTAL_16MHz/8) /* 2.00 MHz */ MCFG_CPU_PROGRAM_MAP(bbcm_mem) @@ -1453,7 +1453,7 @@ static MACHINE_CONFIG_START( bbcm ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbcmt, bbcm ) +MACHINE_CONFIG_DERIVED(bbc_state::bbcmt, bbcm) /* Add 65C102 co-processor */ MCFG_DEVICE_MODIFY("intube") MCFG_SLOT_DEFAULT_OPTION("65c102") @@ -1461,7 +1461,7 @@ static MACHINE_CONFIG_DERIVED( bbcmt, bbcm ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbcmaiv, bbcm ) +MACHINE_CONFIG_DERIVED(bbc_state::bbcmaiv, bbcm) /* Add 65C102 co-processor */ MCFG_DEVICE_MODIFY("intube") MCFG_SLOT_DEFAULT_OPTION("65c102") @@ -1474,7 +1474,7 @@ static MACHINE_CONFIG_DERIVED( bbcmaiv, bbcm ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbcmet, bbcm ) +MACHINE_CONFIG_DERIVED(bbc_state::bbcmet, bbcm) /* printer */ MCFG_DEVICE_REMOVE("centronics") MCFG_DEVICE_REMOVE("cent_data_out") @@ -1510,7 +1510,7 @@ static MACHINE_CONFIG_DERIVED( bbcmet, bbcm ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbcm512, bbcm ) +MACHINE_CONFIG_DERIVED(bbc_state::bbcm512, bbcm) /* Add Intel 80186 co-processor */ MCFG_DEVICE_MODIFY("intube") MCFG_SLOT_DEFAULT_OPTION("80186") @@ -1518,7 +1518,7 @@ static MACHINE_CONFIG_DERIVED( bbcm512, bbcm ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbcmarm, bbcm ) +MACHINE_CONFIG_DERIVED(bbc_state::bbcmarm, bbcm) /* Add ARM co-processor */ MCFG_DEVICE_MODIFY("extube") MCFG_SLOT_DEFAULT_OPTION("arm") @@ -1526,7 +1526,7 @@ static MACHINE_CONFIG_DERIVED( bbcmarm, bbcm ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( discmate, bbcm ) +MACHINE_CONFIG_DERIVED(bbc_state::discmate, bbcm) /* Add Sony CDK-3000PII Auto Disc Loader */ /* Add interface boards connected to cassette and RS423 */ @@ -1541,7 +1541,7 @@ static MACHINE_CONFIG_DERIVED( discmate, bbcm ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cfa3000, bbcm ) +MACHINE_CONFIG_DERIVED(bbc_state::cfa3000, bbcm) MCFG_MACHINE_START_OVERRIDE(bbc_state, cfa3000) /* fdc */ @@ -1579,7 +1579,7 @@ MACHINE_CONFIG_END ****************************************************************************/ -static MACHINE_CONFIG_DERIVED( bbcmc, bbcm ) +MACHINE_CONFIG_DERIVED(bbc_state::bbcmc, bbcm) /* cassette */ MCFG_DEVICE_REMOVE("cassette") @@ -1624,7 +1624,7 @@ static MACHINE_CONFIG_DERIVED( bbcmc, bbcm ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(pro128s, bbcmc) +MACHINE_CONFIG_DERIVED(bbc_state::pro128s, bbcmc) /* software lists */ MCFG_SOFTWARE_LIST_REMOVE("flop_ls_mc") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_pro128s") @@ -1641,13 +1641,13 @@ MACHINE_CONFIG_END /* Both LTM machines used a 9" Hantarex MT3000 green monitor */ -static MACHINE_CONFIG_DERIVED(ltmpbp, bbcbp) +MACHINE_CONFIG_DERIVED(bbc_state::ltmpbp, bbcbp) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(bbc_state, ltmpbp) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(ltmpm, bbcm) +MACHINE_CONFIG_DERIVED(bbc_state::ltmpm, bbcm) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(bbc_state, ltmpm) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bbcbc.cpp b/src/mame/drivers/bbcbc.cpp index ea0ba852ccb..d392e07a9c4 100644 --- a/src/mame/drivers/bbcbc.cpp +++ b/src/mame/drivers/bbcbc.cpp @@ -48,6 +48,7 @@ public: DECLARE_READ8_MEMBER(input_r); DECLARE_WRITE8_MEMBER(input_select_w); + void bbcbc(machine_config &config); private: uint8_t m_input_select; virtual void machine_start() override; @@ -105,7 +106,7 @@ static const z80_daisy_config bbcbc_daisy_chain[] = }; -static MACHINE_CONFIG_START( bbcbc ) +MACHINE_CONFIG_START(bbcbc_state::bbcbc) MCFG_CPU_ADD( "maincpu", Z80, MAIN_CLOCK / 8 ) MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/bbusters.cpp b/src/mame/drivers/bbusters.cpp index 771d2b08e78..1e62c500d71 100644 --- a/src/mame/drivers/bbusters.cpp +++ b/src/mame/drivers/bbusters.cpp @@ -647,7 +647,7 @@ GFXDECODE_END /******************************************************************************/ -static MACHINE_CONFIG_START( bbusters ) +MACHINE_CONFIG_START(bbusters_state::bbusters) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) @@ -692,7 +692,7 @@ static MACHINE_CONFIG_START( bbusters ) MCFG_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mechatt ) +MACHINE_CONFIG_START(bbusters_state::mechatt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp index e015a97d214..baccc7cf6d3 100644 --- a/src/mame/drivers/bcs3.cpp +++ b/src/mame/drivers/bcs3.cpp @@ -82,6 +82,9 @@ public: u32 screen_update_bcs3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); u32 screen_update_bcs3a(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void bcs3a(machine_config &config); + void bcs3(machine_config &config); + void bcs3b(machine_config &config); private: bool m_cass_bit; u8 s_curs; @@ -374,7 +377,7 @@ DRIVER_INIT_MEMBER( bcs3_state, bcs3d ) s_cols = 29; } -static MACHINE_CONFIG_START( bcs3 ) +MACHINE_CONFIG_START(bcs3_state::bcs3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz /2) @@ -401,7 +404,7 @@ static MACHINE_CONFIG_START( bcs3 ) MCFG_CASSETTE_ADD( "cassette" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bcs3a ) +MACHINE_CONFIG_START(bcs3_state::bcs3a) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_7MHz /2) @@ -428,7 +431,7 @@ static MACHINE_CONFIG_START( bcs3a ) MCFG_CASSETTE_ADD( "cassette" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bcs3b, bcs3a ) +MACHINE_CONFIG_DERIVED(bcs3_state::bcs3b, bcs3a) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(40*8, 24*10) MCFG_SCREEN_VISIBLE_AREA(0,40*8-1,0,24*10-1) diff --git a/src/mame/drivers/beaminv.cpp b/src/mame/drivers/beaminv.cpp index 9056cbef8d8..04ca90dec71 100644 --- a/src/mame/drivers/beaminv.cpp +++ b/src/mame/drivers/beaminv.cpp @@ -90,6 +90,7 @@ public: TIMER_CALLBACK_MEMBER(interrupt_callback); void create_interrupt_timer(); void start_interrupt_timer(); + void beaminv(machine_config &config); }; @@ -335,7 +336,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( beaminv ) +MACHINE_CONFIG_START(beaminv_state::beaminv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */ diff --git a/src/mame/drivers/beathead.cpp b/src/mame/drivers/beathead.cpp index 67306d9a825..735a5d04b03 100644 --- a/src/mame/drivers/beathead.cpp +++ b/src/mame/drivers/beathead.cpp @@ -360,7 +360,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( beathead ) +MACHINE_CONFIG_START(beathead_state::beathead) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ASAP, ATARI_CLOCK_14MHz) diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp index 451ea06a0b4..c3bd10f0cdf 100644 --- a/src/mame/drivers/bebox.cpp +++ b/src/mame/drivers/bebox.cpp @@ -118,11 +118,11 @@ static SLOT_INTERFACE_START( bebox_floppies ) SLOT_INTERFACE( "35hd", FLOPPY_35_HD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( mpc105_config ) +void bebox_state::mpc105_config(device_t *device) +{ MCFG_MPC105_CPU( "ppc1" ) MCFG_MPC105_BANK_BASE_DEFAULT( 0 ) -MACHINE_CONFIG_END - +} /************************************* * @@ -141,7 +141,7 @@ static SLOT_INTERFACE_START( pci_devices ) SLOT_INTERFACE("cirrus", PCI_CIRRUS_SVGA) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( bebox ) +MACHINE_CONFIG_START(bebox_state::bebox) /* basic machine hardware */ MCFG_CPU_ADD("ppc1", PPC603, 66000000) /* 66 MHz */ MCFG_CPU_PROGRAM_MAP(bebox_mem) @@ -187,8 +187,12 @@ static MACHINE_CONFIG_START( bebox ) MCFG_DEVICE_ADD( "ns16550_3", NS16550, 0 ) /* TODO: Verify model */ /* video hardware */ - MCFG_FRAGMENT_ADD( pcvideo_cirrus_gd5428 ) - + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update) + + MCFG_PALETTE_ADD("palette", 0x100) + MCFG_DEVICE_ADD("vga", CIRRUS_GD5428, 0) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ym3812", YM3812, 3579545) @@ -236,7 +240,7 @@ static MACHINE_CONFIG_START( bebox ) MCFG_RAM_EXTRA_OPTIONS("8M,16M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bebox2, bebox ) +MACHINE_CONFIG_DERIVED(bebox_state::bebox2, bebox) MCFG_CPU_REPLACE("ppc1", PPC603E, 133000000) /* 133 MHz */ MCFG_CPU_PROGRAM_MAP(bebox_mem) diff --git a/src/mame/drivers/beehive.cpp b/src/mame/drivers/beehive.cpp index 3b3f2153e93..74651e8aa68 100644 --- a/src/mame/drivers/beehive.cpp +++ b/src/mame/drivers/beehive.cpp @@ -39,6 +39,7 @@ public: DECLARE_WRITE8_MEMBER(beehive_62_w); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void beehive(machine_config &config); private: required_device m_maincpu; required_shared_ptr m_p_videoram; @@ -285,7 +286,7 @@ uint32_t beehive_state::screen_update(screen_device &screen, bitmap_ind16 &bitma return 0; } -static MACHINE_CONFIG_START( beehive ) +MACHINE_CONFIG_START(beehive_state::beehive) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(beehive_mem) diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp index 7d24112dce6..64a06efbcaf 100644 --- a/src/mame/drivers/beezer.cpp +++ b/src/mame/drivers/beezer.cpp @@ -90,6 +90,7 @@ public: DECLARE_WRITE8_MEMBER(via_system_pb_w); DECLARE_WRITE8_MEMBER(bankswitch_w); + void beezer(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -459,7 +460,7 @@ void beezer_state::machine_reset() // MACHINE DEFINTIONS //************************************************************************** -static MACHINE_CONFIG_START( beezer ) +MACHINE_CONFIG_START(beezer_state::beezer) // basic machine hardware MCFG_CPU_ADD("maincpu", MC6809, XTAL_12MHz / 3) MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/belatra.cpp b/src/mame/drivers/belatra.cpp index e22320d7d95..d8c5d70a67d 100644 --- a/src/mame/drivers/belatra.cpp +++ b/src/mame/drivers/belatra.cpp @@ -54,6 +54,7 @@ public: m_maincpu(*this, "maincpu") { } + void belatra(machine_config &config); protected: // devices @@ -67,7 +68,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( belatra ) INPUT_PORTS_END -static MACHINE_CONFIG_START( belatra ) +MACHINE_CONFIG_START(belatra_state::belatra) MCFG_CPU_ADD("maincpu", ARM7, 54000000) // guess... MCFG_CPU_PROGRAM_MAP(belatra_map) diff --git a/src/mame/drivers/berzerk.cpp b/src/mame/drivers/berzerk.cpp index d0d19c69151..82b0899d9ce 100644 --- a/src/mame/drivers/berzerk.cpp +++ b/src/mame/drivers/berzerk.cpp @@ -93,6 +93,8 @@ public: void create_nmi_timer(); void start_nmi_timer(); void get_pens(rgb_t *pens); + void berzerk(machine_config &config); + void frenzy(machine_config &config); }; @@ -1103,7 +1105,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( berzerk ) +MACHINE_CONFIG_START(berzerk_state::berzerk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK) @@ -1130,7 +1132,7 @@ static MACHINE_CONFIG_START( berzerk ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( frenzy, berzerk ) +MACHINE_CONFIG_DERIVED(berzerk_state::frenzy, berzerk) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/besta.cpp b/src/mame/drivers/besta.cpp index 76f0ef71c11..95ca127aec3 100644 --- a/src/mame/drivers/besta.cpp +++ b/src/mame/drivers/besta.cpp @@ -44,6 +44,7 @@ public: DECLARE_WRITE8_MEMBER( mpcc_reg_w ); void kbd_put(u8 data); + void besta(machine_config &config); protected: virtual void machine_reset() override; @@ -133,7 +134,7 @@ void besta_state::machine_reset() } /* CP31 processor board */ -static MACHINE_CONFIG_START( besta ) +MACHINE_CONFIG_START(besta_state::besta) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68030, 2*16670000) MCFG_CPU_PROGRAM_MAP(besta_mem) diff --git a/src/mame/drivers/bestleag.cpp b/src/mame/drivers/bestleag.cpp index 6aee7c966db..2fac42cfd95 100644 --- a/src/mame/drivers/bestleag.cpp +++ b/src/mame/drivers/bestleag.cpp @@ -72,6 +72,8 @@ public: uint32_t screen_update_bestleag(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_bestleaw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void bestleag(machine_config &config); + void bestleaw(machine_config &config); }; @@ -375,7 +377,7 @@ static GFXDECODE_START( bestleag ) GFXDECODE_ENTRY( "gfx2", 0, bestleag_char16layout, 0x300, 16 ) GFXDECODE_END -static MACHINE_CONFIG_START( bestleag ) +MACHINE_CONFIG_START(bestleag_state::bestleag) MCFG_CPU_ADD("maincpu", M68000, 12000000) MCFG_CPU_PROGRAM_MAP(bestleag_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", bestleag_state, irq6_line_hold) @@ -399,7 +401,7 @@ static MACHINE_CONFIG_START( bestleag ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bestleaw, bestleag ) +MACHINE_CONFIG_DERIVED(bestleag_state::bestleaw, bestleag) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(bestleag_state, screen_update_bestleaw) MACHINE_CONFIG_END diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp index 4d397507861..1ae78f61b11 100644 --- a/src/mame/drivers/beta.cpp +++ b/src/mame/drivers/beta.cpp @@ -96,6 +96,7 @@ public: emu_timer *m_led_refresh_timer; TIMER_CALLBACK_MEMBER(led_refresh); + void beta(machine_config &config); }; @@ -335,7 +336,7 @@ void beta_state::machine_start() /* Machine Driver */ -static MACHINE_CONFIG_START( beta ) +MACHINE_CONFIG_START(beta_state::beta) /* basic machine hardware */ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_4MHz/4) MCFG_CPU_PROGRAM_MAP(beta_mem) diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp index 9dc0225079f..287a04efb82 100644 --- a/src/mame/drivers/bfcobra.cpp +++ b/src/mame/drivers/bfcobra.cpp @@ -298,6 +298,7 @@ public: required_device m_upd7759; required_device m_palette; required_device m_meters; + void bfcobra(machine_config &config); }; @@ -1627,7 +1628,7 @@ INTERRUPT_GEN_MEMBER(bfcobra_state::vblank_gen) update_irqs(); } -static MACHINE_CONFIG_START( bfcobra ) +MACHINE_CONFIG_START(bfcobra_state::bfcobra) MCFG_CPU_ADD("maincpu", Z80, Z80_XTAL) MCFG_CPU_PROGRAM_MAP(z80_prog_map) MCFG_CPU_IO_MAP(z80_io_map) diff --git a/src/mame/drivers/bfm_ad5.cpp b/src/mame/drivers/bfm_ad5.cpp index 07238c4bac8..a683181bb67 100644 --- a/src/mame/drivers/bfm_ad5.cpp +++ b/src/mame/drivers/bfm_ad5.cpp @@ -77,7 +77,7 @@ INTERRUPT_GEN_MEMBER(adder5_state::ad5_fake_timer_int) // m_maincpu->set_input_line_and_vector(5, HOLD_LINE, 0x8c); } -MACHINE_CONFIG_START( bfm_ad5 ) +MACHINE_CONFIG_START(adder5_state::bfm_ad5) MCFG_CPU_ADD("maincpu", MCF5206E, 40000000) /* MCF5206eFT */ MCFG_CPU_PROGRAM_MAP(ad5_map) MCFG_CPU_PERIODIC_INT_DRIVER(adder5_state, ad5_fake_timer_int, 1000) diff --git a/src/mame/drivers/bfm_ad5sw.hxx b/src/mame/drivers/bfm_ad5sw.hxx index 12ebc062a3e..d859c7ac18f 100644 --- a/src/mame/drivers/bfm_ad5sw.hxx +++ b/src/mame/drivers/bfm_ad5sw.hxx @@ -14,7 +14,6 @@ */ -MACHINE_CONFIG_EXTERN( bfm_ad5 ); INPUT_PORTS_EXTERN( bfm_ad5 ); #define ad5crcpt_others \ diff --git a/src/mame/drivers/bfm_sc1.cpp b/src/mame/drivers/bfm_sc1.cpp index 592736e7bbc..8590c5b23d2 100644 --- a/src/mame/drivers/bfm_sc1.cpp +++ b/src/mame/drivers/bfm_sc1.cpp @@ -215,6 +215,9 @@ public: optional_device m_upd7759; optional_device m_vfd0; required_device m_meters; + void scorpion1_adder2(machine_config &config); + void scorpion1(machine_config &config); + void scorpion1_viper(machine_config &config); }; #define VFD_RESET 0x20 @@ -1077,7 +1080,7 @@ INPUT_PORTS_END // machine driver for scorpion1 board /////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////// -static MACHINE_CONFIG_START( scorpion1 ) +MACHINE_CONFIG_START(bfm_sc1_state::scorpion1) MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz MCFG_CPU_PROGRAM_MAP(sc1_base) // setup read and write memorymap MCFG_CPU_PERIODIC_INT_DRIVER(bfm_sc1_state, timer_irq, 1000) // generate 1000 IRQ's per second @@ -1116,7 +1119,7 @@ MACHINE_CONFIG_END // machine driver for scorpion1 board + adder2 extension //////////////////////////// ///////////////////////////////////////////////////////////////////////////////////// -static MACHINE_CONFIG_DERIVED( scorpion1_adder2, scorpion1 ) +MACHINE_CONFIG_DERIVED(bfm_sc1_state::scorpion1_adder2, scorpion1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sc1_adder2) // setup read and write memorymap @@ -1130,7 +1133,7 @@ MACHINE_CONFIG_END // machine driver for scorpion1 board /////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////// -static MACHINE_CONFIG_DERIVED( scorpion1_viper, scorpion1 ) +MACHINE_CONFIG_DERIVED(bfm_sc1_state::scorpion1_viper, scorpion1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sc1_viper) // setup read and write memorymap diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp index 874a69605df..a9f64d907b0 100644 --- a/src/mame/drivers/bfm_sc2.cpp +++ b/src/mame/drivers/bfm_sc2.cpp @@ -365,6 +365,16 @@ public: void sc2awp_common_init(int reels, int decrypt); void sc2awpdmd_common_init(int reels, int decrypt); void save_state(); + void _3meters(machine_config &config); + void _5meters(machine_config &config); + void _8meters(machine_config &config); + void scorpion2_dm01(machine_config &config); + void scorpion2_vid(machine_config &config); + void scorpion2_dm01_5m(machine_config &config); + void scorpion3(machine_config &config); + void scorpion2_dm01_3m(machine_config &config); + void scorpion2_vidm(machine_config &config); + void scorpion2(machine_config &config); }; @@ -2186,17 +2196,17 @@ INPUT_PORTS_END // machine config fragments for different meters numbers ////////////////// /////////////////////////////////////////////////////////////////////////// -MACHINE_CONFIG_START( _3meters ) +MACHINE_CONFIG_START(bfm_sc2_state::_3meters) MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(3) MACHINE_CONFIG_END -MACHINE_CONFIG_START( _5meters ) +MACHINE_CONFIG_START(bfm_sc2_state::_5meters) MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(5) MACHINE_CONFIG_END -MACHINE_CONFIG_START( _8meters ) +MACHINE_CONFIG_START(bfm_sc2_state::_8meters) MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(8) MACHINE_CONFIG_END @@ -2214,7 +2224,7 @@ MACHINE_START_MEMBER(bfm_sc2_state,bfm_sc2) save_state(); } -static MACHINE_CONFIG_START( scorpion2_vid ) +MACHINE_CONFIG_START(bfm_sc2_state::scorpion2_vid) MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 ) // 6809 CPU at 2 Mhz MCFG_CPU_PROGRAM_MAP(memmap_vid) // setup scorpion2 board memorymap MCFG_CPU_PERIODIC_INT_DRIVER(bfm_sc2_state, timer_irq, 1000) // generate 1000 IRQ's per second @@ -2245,7 +2255,7 @@ static MACHINE_CONFIG_START( scorpion2_vid ) MACHINE_CONFIG_END /* machine driver for scorpion2_vid board with meters (i.e. quintoon uk). Are we really sure the other games don't?*/ -static MACHINE_CONFIG_DERIVED( scorpion2_vidm, scorpion2_vid ) +MACHINE_CONFIG_DERIVED(bfm_sc2_state::scorpion2_vidm, scorpion2_vid) MCFG_FRAGMENT_ADD(_8meters) MACHINE_CONFIG_END @@ -3688,7 +3698,7 @@ MACHINE_START_MEMBER(bfm_sc2_state,sc2dmd) /* machine driver for scorpion2 board */ -static MACHINE_CONFIG_START( scorpion2 ) +MACHINE_CONFIG_START(bfm_sc2_state::scorpion2) MCFG_MACHINE_RESET_OVERRIDE(bfm_sc2_state,awp_init) MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 ) MCFG_CPU_PROGRAM_MAP(memmap_no_vid) @@ -3739,7 +3749,7 @@ MACHINE_CONFIG_END #endif /* machine driver for scorpion3 board */ -static MACHINE_CONFIG_DERIVED( scorpion3, scorpion2 ) +MACHINE_CONFIG_DERIVED(bfm_sc2_state::scorpion3, scorpion2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(memmap_no_vid) @@ -3749,7 +3759,7 @@ MACHINE_CONFIG_END /* machine driver for scorpion2 board + matrix board */ -static MACHINE_CONFIG_START( scorpion2_dm01 ) +MACHINE_CONFIG_START(bfm_sc2_state::scorpion2_dm01) MCFG_MACHINE_RESET_OVERRIDE(bfm_sc2_state,dm01_init) MCFG_QUANTUM_TIME(attotime::from_hz(960)) // needed for serial communication !! MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 ) @@ -3791,12 +3801,12 @@ static MACHINE_CONFIG_START( scorpion2_dm01 ) MCFG_FRAGMENT_ADD( _8meters) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( scorpion2_dm01_3m, scorpion2_dm01 ) +MACHINE_CONFIG_DERIVED(bfm_sc2_state::scorpion2_dm01_3m, scorpion2_dm01) MCFG_DEVICE_REMOVE("meters") MCFG_FRAGMENT_ADD( _3meters) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( scorpion2_dm01_5m, scorpion2_dm01 ) +MACHINE_CONFIG_DERIVED(bfm_sc2_state::scorpion2_dm01_5m, scorpion2_dm01) MCFG_DEVICE_REMOVE("meters") MCFG_FRAGMENT_ADD( _5meters) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp index fde0a7c2643..b951e449d56 100644 --- a/src/mame/drivers/bfm_sc4.cpp +++ b/src/mame/drivers/bfm_sc4.cpp @@ -890,7 +890,7 @@ WRITE_LINE_MEMBER(sc4_state::bfmdm01_busy) // Must tie back to inputs somehow! } -MACHINE_CONFIG_START( sc4_common ) +MACHINE_CONFIG_START(sc4_state::sc4_common) MCFG_CPU_ADD("maincpu", M68307, 16000000) // 68307! (EC000 core) MCFG_CPU_PROGRAM_MAP(sc4_map) MCFG_MC68307_SERIAL_A_TX_CALLBACK(WRITELINE(sc4_state, m68307_duart_txa)) @@ -921,7 +921,7 @@ MACHINE_CONFIG_START( sc4_common ) MACHINE_CONFIG_END //Standard 6 reels all connected -MACHINE_CONFIG_START( sc4 ) +MACHINE_CONFIG_START(sc4_state::sc4) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -939,7 +939,7 @@ MACHINE_CONFIG_START( sc4 ) MACHINE_CONFIG_END //Standard 3 reels -MACHINE_CONFIG_START( sc4_3reel ) +MACHINE_CONFIG_START(sc4_state::sc4_3reel) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -952,7 +952,7 @@ MACHINE_CONFIG_START( sc4_3reel ) MACHINE_CONFIG_END //Standard 4 reels -MACHINE_CONFIG_START( sc4_4reel ) +MACHINE_CONFIG_START(sc4_state::sc4_4reel) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -966,7 +966,7 @@ MACHINE_CONFIG_START( sc4_4reel ) MACHINE_CONFIG_END //4 reels, with the last connected to RL4 not RL3 -MACHINE_CONFIG_START( sc4_4reel_alt ) +MACHINE_CONFIG_START(sc4_state::sc4_4reel_alt) MCFG_FRAGMENT_ADD(sc4_common) @@ -983,7 +983,7 @@ MACHINE_CONFIG_END //Standard 5 reels -MACHINE_CONFIG_START( sc4_5reel ) +MACHINE_CONFIG_START(sc4_state::sc4_5reel) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -999,7 +999,7 @@ MACHINE_CONFIG_START( sc4_5reel ) MACHINE_CONFIG_END //5 reels, with RL4 skipped -MACHINE_CONFIG_START( sc4_5reel_alt ) +MACHINE_CONFIG_START(sc4_state::sc4_5reel_alt) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -1017,7 +1017,7 @@ MACHINE_CONFIG_START( sc4_5reel_alt ) MACHINE_CONFIG_END //6 reels, last 200 steps -MACHINE_CONFIG_START( sc4_200_std ) +MACHINE_CONFIG_START(sc4_state::sc4_200_std) MCFG_FRAGMENT_ADD(sc4_common) @@ -1036,7 +1036,7 @@ MACHINE_CONFIG_START( sc4_200_std ) MACHINE_CONFIG_END //6 reels, last 200 steps -MACHINE_CONFIG_START( sc4_200_alt ) +MACHINE_CONFIG_START(sc4_state::sc4_200_alt) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -1054,7 +1054,7 @@ MACHINE_CONFIG_START( sc4_200_alt ) MACHINE_CONFIG_END //6 reels, RL4 200 steps -MACHINE_CONFIG_START( sc4_200_alta ) +MACHINE_CONFIG_START(sc4_state::sc4_200_alta) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -1072,7 +1072,7 @@ MACHINE_CONFIG_START( sc4_200_alta ) MACHINE_CONFIG_END //6 reels, 3 48 step, 3 200 step -MACHINE_CONFIG_START( sc4_200_altb ) +MACHINE_CONFIG_START(sc4_state::sc4_200_altb) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_200STEP_ADD("reel1") @@ -1090,7 +1090,7 @@ MACHINE_CONFIG_START( sc4_200_altb ) MACHINE_CONFIG_END //5 reels, last one 200 steps -MACHINE_CONFIG_START( sc4_200_5r ) +MACHINE_CONFIG_START(sc4_state::sc4_200_5r) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -1108,7 +1108,7 @@ MACHINE_CONFIG_END //5 reels, last one 200 steps, RL4 skipped -MACHINE_CONFIG_START( sc4_200_5ra ) +MACHINE_CONFIG_START(sc4_state::sc4_200_5ra) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -1125,7 +1125,7 @@ MACHINE_CONFIG_START( sc4_200_5ra ) MACHINE_CONFIG_END //5 reels, last one 200 steps, RL5 skipped -MACHINE_CONFIG_START( sc4_200_5rb ) +MACHINE_CONFIG_START(sc4_state::sc4_200_5rb) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -1142,7 +1142,7 @@ MACHINE_CONFIG_START( sc4_200_5rb ) MACHINE_CONFIG_END //5 reels, RL5 200 steps, RL4 skipped -MACHINE_CONFIG_START( sc4_200_5rc ) +MACHINE_CONFIG_START(sc4_state::sc4_200_5rc) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -1159,7 +1159,7 @@ MACHINE_CONFIG_START( sc4_200_5rc ) MACHINE_CONFIG_END //4 reels, last one 200 steps -MACHINE_CONFIG_START( sc4_200_4r ) +MACHINE_CONFIG_START(sc4_state::sc4_200_4r) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -1173,7 +1173,7 @@ MACHINE_CONFIG_START( sc4_200_4r ) MACHINE_CONFIG_END //4 reels, last one 200 steps, RL4 skipped -MACHINE_CONFIG_START( sc4_200_4ra ) +MACHINE_CONFIG_START(sc4_state::sc4_200_4ra) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -1189,7 +1189,7 @@ MACHINE_CONFIG_END //4 reels, last one 200 steps, RL4,5 skipped -MACHINE_CONFIG_START( sc4_200_4rb ) +MACHINE_CONFIG_START(sc4_state::sc4_200_4rb) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_RM20_48STEP_ADD("reel1") @@ -1203,7 +1203,7 @@ MACHINE_CONFIG_START( sc4_200_4rb ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel6_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( sc4_4reel_200 ) +MACHINE_CONFIG_START(sc4_state::sc4_4reel_200) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_200STEP_ADD("reel1") @@ -1216,7 +1216,7 @@ MACHINE_CONFIG_START( sc4_4reel_200 ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( sc4_3reel_200 ) +MACHINE_CONFIG_START(sc4_state::sc4_3reel_200) MCFG_FRAGMENT_ADD(sc4_common) MCFG_STARPOINT_200STEP_ADD("reel1") @@ -1227,7 +1227,7 @@ MACHINE_CONFIG_START( sc4_3reel_200 ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( sc4_3reel_200_48 ) +MACHINE_CONFIG_START(sc4_state::sc4_3reel_200_48) MCFG_FRAGMENT_ADD(sc4_common) @@ -1241,7 +1241,7 @@ MACHINE_CONFIG_START( sc4_3reel_200_48 ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( sc4_no_reels ) +MACHINE_CONFIG_START(sc4_state::sc4_no_reels) MCFG_FRAGMENT_ADD(sc4_common) MACHINE_CONFIG_END @@ -1252,7 +1252,7 @@ MACHINE_START_MEMBER(sc4_adder4_state,adder4) MACHINE_START_CALL_MEMBER(sc4); } -MACHINE_CONFIG_START( sc4_adder4 ) +MACHINE_CONFIG_START(sc4_adder4_state::sc4_adder4) MCFG_FRAGMENT_ADD(sc4_common) MCFG_CPU_ADD("adder4", M68340, 25175000) // 68340 (CPU32 core) @@ -1261,7 +1261,7 @@ MACHINE_CONFIG_START( sc4_adder4 ) MCFG_MACHINE_START_OVERRIDE(sc4_adder4_state, adder4 ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( sc4dmd ) +MACHINE_CONFIG_START(sc4_state::sc4dmd) MCFG_FRAGMENT_ADD(sc4_common) /* video hardware */ diff --git a/src/mame/drivers/bfm_sc5.cpp b/src/mame/drivers/bfm_sc5.cpp index 9619d4516eb..5e76fe3c237 100644 --- a/src/mame/drivers/bfm_sc5.cpp +++ b/src/mame/drivers/bfm_sc5.cpp @@ -209,7 +209,7 @@ WRITE8_MEMBER(bfm_sc5_state::bfm_sc5_duart_output_w) logerror("bfm_sc5_duart_output_w\n"); } -MACHINE_CONFIG_START( bfm_sc5 ) +MACHINE_CONFIG_START(bfm_sc5_state::bfm_sc5) MCFG_CPU_ADD("maincpu", MCF5206E, 40000000) /* MCF5206eFT */ MCFG_CPU_PROGRAM_MAP(sc5_map) MCFG_MCF5206E_PERIPHERAL_ADD("maincpu_onboard") diff --git a/src/mame/drivers/bfm_sc5sw.hxx b/src/mame/drivers/bfm_sc5sw.hxx index 02a09a715a5..f5c5933f9b1 100644 --- a/src/mame/drivers/bfm_sc5sw.hxx +++ b/src/mame/drivers/bfm_sc5sw.hxx @@ -13,7 +13,6 @@ */ -MACHINE_CONFIG_EXTERN( bfm_sc5 ); INPUT_PORTS_EXTERN( bfm_sc5 ); ROM_START( sc5plays ) diff --git a/src/mame/drivers/bfm_swp.cpp b/src/mame/drivers/bfm_swp.cpp index b65331880c4..7f9844fbe18 100644 --- a/src/mame/drivers/bfm_swp.cpp +++ b/src/mame/drivers/bfm_swp.cpp @@ -127,6 +127,7 @@ public: return 0; } + void bfm_swp(machine_config &config); protected: // devices @@ -198,7 +199,7 @@ void bfm_swp_state::machine_start() } -static MACHINE_CONFIG_START( bfm_swp ) +MACHINE_CONFIG_START(bfm_swp_state::bfm_swp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68340, 16000000) diff --git a/src/mame/drivers/bfmsys83.cpp b/src/mame/drivers/bfmsys83.cpp index e6aa532b181..e775074c06c 100644 --- a/src/mame/drivers/bfmsys83.cpp +++ b/src/mame/drivers/bfmsys83.cpp @@ -18,6 +18,7 @@ public: uint8_t m_codec_data[256]; required_device m_maincpu; + void bfmsys83(machine_config &config); }; @@ -31,7 +32,7 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( bfmsys83 ) +MACHINE_CONFIG_START(bfmsys83_state::bfmsys83) MCFG_CPU_ADD("maincpu", M6802, 40000000/4) MCFG_CPU_PROGRAM_MAP(memmap) diff --git a/src/mame/drivers/bfmsys85.cpp b/src/mame/drivers/bfmsys85.cpp index d41c9523d39..08417de869c 100644 --- a/src/mame/drivers/bfmsys85.cpp +++ b/src/mame/drivers/bfmsys85.cpp @@ -134,6 +134,7 @@ public: required_device m_reel3; required_device m_acia6850_0; required_device m_meters; + void bfmsys85(machine_config &config); }; #define MASTER_CLOCK (XTAL_4MHz) @@ -385,7 +386,7 @@ ADDRESS_MAP_END // machine driver for system85 board ////////////////////////////////////// -static MACHINE_CONFIG_START( bfmsys85 ) +MACHINE_CONFIG_START(bfmsys85_state::bfmsys85) MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz MCFG_CPU_PROGRAM_MAP(memmap) // setup read and write memorymap MCFG_CPU_PERIODIC_INT_DRIVER(bfmsys85_state, timer_irq, 1000) // generate 1000 IRQ's per second diff --git a/src/mame/drivers/bgt.cpp b/src/mame/drivers/bgt.cpp index 929f1d4bdfe..9718524fb75 100644 --- a/src/mame/drivers/bgt.cpp +++ b/src/mame/drivers/bgt.cpp @@ -21,6 +21,7 @@ public: m_maincpu(*this, "maincpu") { } + void bgt(machine_config &config); protected: // devices @@ -44,7 +45,7 @@ static INPUT_PORTS_START( bgt ) INPUT_PORTS_END -static MACHINE_CONFIG_START( bgt ) +MACHINE_CONFIG_START(bgt_state::bgt) MCFG_CPU_ADD("maincpu", V30, 12000000 ) // ? unknown CPU.. definitely x86 based tho MCFG_CPU_PROGRAM_MAP(bgt_map) MCFG_CPU_IO_MAP(bgt_io) diff --git a/src/mame/drivers/big10.cpp b/src/mame/drivers/big10.cpp index e52df91acfb..b61be68cd0f 100644 --- a/src/mame/drivers/big10.cpp +++ b/src/mame/drivers/big10.cpp @@ -82,6 +82,7 @@ public: required_device m_maincpu; required_device m_hopper; required_ioport_array<6> m_in; + void big10(machine_config &config); }; @@ -217,7 +218,7 @@ INPUT_PORTS_END * Machine Driver * **************************************/ -static MACHINE_CONFIG_START( big10 ) +MACHINE_CONFIG_START(big10_state::big10) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* guess */ diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp index 8486bdfda8d..46c5ff9cdbf 100644 --- a/src/mame/drivers/bigbord2.cpp +++ b/src/mame/drivers/bigbord2.cpp @@ -132,6 +132,7 @@ public: DECLARE_WRITE8_MEMBER(io_write_byte); MC6845_UPDATE_ROW(crtc_update_row); + void bigbord2(machine_config &config); private: u8 crt8002(u8 ac_ra, u8 ac_chr, u8 ac_attr, uint16_t ac_cnt, bool ac_curs); u8 m_term_data; @@ -540,7 +541,7 @@ MC6845_UPDATE_ROW( bigbord2_state::crtc_update_row ) #define MAIN_CLOCK XTAL_8MHz / 2 -static MACHINE_CONFIG_START( bigbord2 ) +MACHINE_CONFIG_START(bigbord2_state::bigbord2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK) MCFG_CPU_PROGRAM_MAP(bigbord2_mem) diff --git a/src/mame/drivers/bigevglf.cpp b/src/mame/drivers/bigevglf.cpp index 37e9355ac50..87d46624c3a 100644 --- a/src/mame/drivers/bigevglf.cpp +++ b/src/mame/drivers/bigevglf.cpp @@ -445,7 +445,7 @@ void bigevglf_state::machine_reset() } -static MACHINE_CONFIG_START( bigevglf ) +MACHINE_CONFIG_START(bigevglf_state::bigevglf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,10000000/2) /* 5 MHz ? */ diff --git a/src/mame/drivers/bigstrkb.cpp b/src/mame/drivers/bigstrkb.cpp index 19cda2f6eb0..e4837e1a0c3 100644 --- a/src/mame/drivers/bigstrkb.cpp +++ b/src/mame/drivers/bigstrkb.cpp @@ -199,7 +199,7 @@ GFXDECODE_END /* Machine Driver */ -static MACHINE_CONFIG_START( bigstrkb ) +MACHINE_CONFIG_START(bigstrkb_state::bigstrkb) MCFG_CPU_ADD("maincpu", M68000, 12000000) MCFG_CPU_PROGRAM_MAP(bigstrkb_map) diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp index 8f5ef0baa6c..9e7861b0a08 100644 --- a/src/mame/drivers/binbug.cpp +++ b/src/mame/drivers/binbug.cpp @@ -88,6 +88,7 @@ public: required_device m_maincpu; required_device m_cass; + void binbug(machine_config &config); private: uint8_t m_framecnt; required_shared_ptr m_p_videoram; @@ -293,7 +294,7 @@ static DEVICE_INPUT_DEFAULTS_START( keyboard ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( binbug ) +MACHINE_CONFIG_START(binbug_state::binbug) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz) MCFG_CPU_PROGRAM_MAP(binbug_mem) @@ -422,6 +423,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(time_tick); TIMER_DEVICE_CALLBACK_MEMBER(uart_tick); + void dg680(machine_config &config); private: uint8_t m_pio_b; uint8_t m_term_data; @@ -525,7 +527,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(dg680_state::uart_tick) m_ctc->trg3(0); } -static MACHINE_CONFIG_START( dg680 ) +MACHINE_CONFIG_START(dg680_state::dg680) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz / 4) MCFG_CPU_PROGRAM_MAP(dg680_mem) diff --git a/src/mame/drivers/bingo.cpp b/src/mame/drivers/bingo.cpp index 742220ae428..9efd1ac6a03 100644 --- a/src/mame/drivers/bingo.cpp +++ b/src/mame/drivers/bingo.cpp @@ -14,6 +14,7 @@ public: m_maincpu(*this, "maincpu") { } + void bingo(machine_config &config); protected: // devices @@ -43,7 +44,7 @@ DRIVER_INIT_MEMBER(bingo_state,bingo) { } -static MACHINE_CONFIG_START( bingo ) +MACHINE_CONFIG_START(bingo_state::bingo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 1000000) MCFG_CPU_PROGRAM_MAP(bingo_map) @@ -57,6 +58,7 @@ public: m_maincpu(*this, "maincpu") { } + void seeben(machine_config &config); protected: // devices @@ -83,7 +85,7 @@ DRIVER_INIT_MEMBER(seeben_state,seeben) { } -static MACHINE_CONFIG_START( seeben ) +MACHINE_CONFIG_START(seeben_state::seeben) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, 1000000) MCFG_CPU_PROGRAM_MAP(seeben_map) @@ -97,6 +99,7 @@ public: m_maincpu(*this, "maincpu") { } + void splin(machine_config &config); protected: // devices @@ -125,7 +128,7 @@ DRIVER_INIT_MEMBER(splin_state,splin) { } -static MACHINE_CONFIG_START( splin ) +MACHINE_CONFIG_START(splin_state::splin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80186, 16000000) MCFG_CPU_PROGRAM_MAP(splin_map) diff --git a/src/mame/drivers/bingoc.cpp b/src/mame/drivers/bingoc.cpp index b60f2a5661d..7fee69375f5 100644 --- a/src/mame/drivers/bingoc.cpp +++ b/src/mame/drivers/bingoc.cpp @@ -60,6 +60,7 @@ public: required_device m_soundcpu; required_device m_upd7759; required_device m_soundlatch; + void bingoc(machine_config &config); }; @@ -167,7 +168,7 @@ static INPUT_PORTS_START( bingoc ) INPUT_PORTS_END -static MACHINE_CONFIG_START( bingoc ) +MACHINE_CONFIG_START(bingoc_state::bingoc) MCFG_CPU_ADD("maincpu", M68000,8000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/bingoman.cpp b/src/mame/drivers/bingoman.cpp index 11b5210af83..b7a71cf0f58 100644 --- a/src/mame/drivers/bingoman.cpp +++ b/src/mame/drivers/bingoman.cpp @@ -259,6 +259,7 @@ public: // screen updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_PALETTE_INIT(bingoman); + void bingoman(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -371,7 +372,7 @@ PALETTE_INIT_MEMBER(bingoman_state, bingoman) { } -static MACHINE_CONFIG_START( bingoman ) +MACHINE_CONFIG_START(bingoman_state::bingoman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H83002, XTAL_20MHz) /* TODO: correct CPU type */ diff --git a/src/mame/drivers/bingor.cpp b/src/mame/drivers/bingor.cpp index 7fc6e3665ba..f229082cb1c 100644 --- a/src/mame/drivers/bingor.cpp +++ b/src/mame/drivers/bingor.cpp @@ -541,6 +541,9 @@ public: DECLARE_WRITE16_MEMBER(vip2000_outputs_w); u8 m_toslave; u8 m_fromslave; + void bingor(machine_config &config); + void bingor2(machine_config &config); + void vip2000(machine_config &config); }; @@ -677,7 +680,7 @@ static GFXDECODE_START( bingor ) GFXDECODE_END -static MACHINE_CONFIG_START( bingor ) +MACHINE_CONFIG_START(bingor_state::bingor) MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(bingor_map) MCFG_CPU_IO_MAP(bingor_io) @@ -704,7 +707,7 @@ static MACHINE_CONFIG_START( bingor ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bingor2, bingor ) +MACHINE_CONFIG_DERIVED(bingor_state::bingor2, bingor) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bingor2_map) MACHINE_CONFIG_END @@ -761,7 +764,7 @@ static ADDRESS_MAP_START( slave_io, AS_IO, 8, bingor_state) AM_RANGE(0xc000, 0xcfff) AM_RAM ADDRESS_MAP_END -static MACHINE_CONFIG_START( vip2000 ) +MACHINE_CONFIG_START(bingor_state::vip2000) MCFG_CPU_ADD("maincpu", I80186, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP(vip2000_map) MCFG_CPU_IO_MAP(vip2000_io) diff --git a/src/mame/drivers/bingowav.cpp b/src/mame/drivers/bingowav.cpp index 4cd47e511ab..a841d3335d1 100644 --- a/src/mame/drivers/bingowav.cpp +++ b/src/mame/drivers/bingowav.cpp @@ -55,6 +55,7 @@ public: , m_maincpu(*this, "maincpu") { } + void bingowav(machine_config &config); protected: virtual void machine_start() override; @@ -103,7 +104,7 @@ static INPUT_PORTS_START( bingowav ) INPUT_PORTS_END -static MACHINE_CONFIG_START( bingowav ) +MACHINE_CONFIG_START(bingowav_state::bingowav) MCFG_CPU_ADD("maincpu", M68000, 12000000) // actually TMP63803F-16 MCFG_CPU_PROGRAM_MAP(bingowav_main_map) diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp index 3d8fdd96f70..06bf2ed241a 100644 --- a/src/mame/drivers/bionicc.cpp +++ b/src/mame/drivers/bionicc.cpp @@ -369,7 +369,7 @@ void bionicc_state::machine_reset() m_soundcommand = 0; } -static MACHINE_CONFIG_START( bionicc ) +MACHINE_CONFIG_START(bionicc_state::bionicc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz - verified in schematics */ diff --git a/src/mame/drivers/bishi.cpp b/src/mame/drivers/bishi.cpp index a6e2abffa0b..031ff312cd7 100644 --- a/src/mame/drivers/bishi.cpp +++ b/src/mame/drivers/bishi.cpp @@ -444,7 +444,7 @@ void bishi_state::machine_reset() m_cur_control2 = 0; } -static MACHINE_CONFIG_START( bishi ) +MACHINE_CONFIG_START(bishi_state::bishi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 12MHz (24MHz OSC / 2 ) */ @@ -484,7 +484,7 @@ static MACHINE_CONFIG_START( bishi ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dobouchn, bishi ) +MACHINE_CONFIG_DERIVED(bishi_state::dobouchn, bishi) // TODO: change accordingly (ASCII charset definitely not 8bpp, 5bpp perhaps?) MCFG_DEVICE_MODIFY("k056832") // MCFG_K056832_CB(bishi_state, dobouchn_tile_callback) diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp index b23c565fc58..e7ad9e72d8f 100644 --- a/src/mame/drivers/bitgraph.cpp +++ b/src/mame/drivers/bitgraph.cpp @@ -139,6 +139,9 @@ public: DECLARE_WRITE8_MEMBER(ppu_write); DECLARE_WRITE8_MEMBER(ppu_i8243_w); + void bg_motherboard(machine_config &config); + void bitgrpha(machine_config &config); + void bitgrphb(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -482,7 +485,7 @@ void bitgraph_state::machine_reset() } -static MACHINE_CONFIG_START( bg_motherboard ) +MACHINE_CONFIG_START(bitgraph_state::bg_motherboard) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(40) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ @@ -550,7 +553,7 @@ static MACHINE_CONFIG_START( bg_motherboard ) MACHINE_CONFIG_END #ifdef UNUSED_FUNCTION -static MACHINE_CONFIG_START( bg_ppu ) +MACHINE_CONFIG_START(bitgraph_state::bg_ppu) MCFG_CPU_ADD(PPU_TAG, I8035, XTAL_6_9MHz) MCFG_CPU_IO_MAP(ppu_io) // MCFG_MCS48_PORT_T0_IN_CB(READLINE(bitgraph_state, ppu_t0_r)) @@ -570,7 +573,7 @@ static MACHINE_CONFIG_START( bg_ppu ) MACHINE_CONFIG_END #endif -static MACHINE_CONFIG_START( bitgrpha ) +MACHINE_CONFIG_START(bitgraph_state::bitgrpha) MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_6_9MHz) MCFG_CPU_PROGRAM_MAP(bitgrapha_mem) @@ -593,7 +596,7 @@ static MACHINE_CONFIG_START( bitgrpha ) MCFG_RAM_DEFAULT_SIZE("128K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bitgrphb ) +MACHINE_CONFIG_START(bitgraph_state::bitgrphb) MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_6_9MHz) MCFG_CPU_PROGRAM_MAP(bitgraphb_mem) diff --git a/src/mame/drivers/bk.cpp b/src/mame/drivers/bk.cpp index 2898ab3f031..453ad84f7ef 100644 --- a/src/mame/drivers/bk.cpp +++ b/src/mame/drivers/bk.cpp @@ -162,7 +162,7 @@ static INPUT_PORTS_START( bk0010 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( bk0010 ) +MACHINE_CONFIG_START(bk_state::bk0010) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", T11, 3000000) MCFG_T11_INITIAL_MODE(0x36ff) /* initial mode word has DAL15,14,11,8 pulled low */ @@ -192,7 +192,7 @@ static MACHINE_CONFIG_START( bk0010 ) MCFG_SOFTWARE_LIST_ADD("cass_list","bk0010") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bk0010fd, bk0010 ) +MACHINE_CONFIG_DERIVED(bk_state::bk0010fd, bk0010) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bk0010fd_mem) diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp index b29f06c7e67..49d36630a9a 100644 --- a/src/mame/drivers/bking.cpp +++ b/src/mame/drivers/bking.cpp @@ -385,7 +385,7 @@ MACHINE_RESET_MEMBER(bking_state,bking3) m_addr_l = 0; } -static MACHINE_CONFIG_START( bking ) +MACHINE_CONFIG_START(bking_state::bking) /* basic machine hardware */ MCFG_CPU_ADD("main_cpu", Z80, XTAL_12MHz/4) /* 3 MHz */ @@ -439,7 +439,7 @@ static MACHINE_CONFIG_START( bking ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bking3, bking ) +MACHINE_CONFIG_DERIVED(bking_state::bking3, bking) /* basic machine hardware */ MCFG_CPU_MODIFY("main_cpu") diff --git a/src/mame/drivers/blackt96.cpp b/src/mame/drivers/blackt96.cpp index de4445d8206..bd45cdc0971 100644 --- a/src/mame/drivers/blackt96.cpp +++ b/src/mame/drivers/blackt96.cpp @@ -121,6 +121,7 @@ public: uint32_t screen_update_blackt96(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void tile_callback(int &tile, int& fx, int& fy, int& region); + void blackt96(machine_config &config); protected: // overrides virtual void machine_start() override; @@ -469,7 +470,7 @@ void blackt96_state::tile_callback(int &tile, int& fx, int& fy, int& region) } -static MACHINE_CONFIG_START( blackt96 ) +MACHINE_CONFIG_START(blackt96_state::blackt96) MCFG_CPU_ADD("maincpu", M68000, 18000000 /2) MCFG_CPU_PROGRAM_MAP(blackt96_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", blackt96_state, irq1_line_hold) diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp index 146b8f0bc15..0a5af96ec25 100644 --- a/src/mame/drivers/bladestl.cpp +++ b/src/mame/drivers/bladestl.cpp @@ -299,7 +299,7 @@ void bladestl_state::machine_reset() m_last_track[i] = 0; } -static MACHINE_CONFIG_START( bladestl ) +MACHINE_CONFIG_START(bladestl_state::bladestl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309E, XTAL_24MHz / 8) // divider not verified (from 007342 custom) diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp index 8254fd68ca0..f728d41dd5f 100644 --- a/src/mame/drivers/blitz68k.cpp +++ b/src/mame/drivers/blitz68k.cpp @@ -184,6 +184,15 @@ public: MC6845_ON_UPDATE_ADDR_CHANGED(crtc_addr); required_device m_maincpu; required_device m_palette; + void hermit(machine_config &config); + void bankrob(machine_config &config); + void cjffruit(machine_config &config); + void steaser(machine_config &config); + void deucesw2(machine_config &config); + void ilpag(machine_config &config); + void maxidbl(machine_config &config); + void dualgame(machine_config &config); + void bankroba(machine_config &config); }; /************************************************************************************************************* @@ -1674,7 +1683,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, blitz68k_state ) AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START( ilpag ) +MACHINE_CONFIG_START(blitz68k_state::ilpag) MCFG_CPU_ADD("maincpu", M68000, 11059200 ) // ? MCFG_CPU_PROGRAM_MAP(ilpag_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq4_line_hold) //3 & 6 used, mcu comms? @@ -1733,7 +1742,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(blitz68k_state::steaser_mcu_sim) } -static MACHINE_CONFIG_DERIVED( steaser, ilpag ) +MACHINE_CONFIG_DERIVED(blitz68k_state::steaser, ilpag) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(steaser_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq5_line_hold) //3, 4 & 6 used, mcu comms? @@ -1741,7 +1750,7 @@ static MACHINE_CONFIG_DERIVED( steaser, ilpag ) MCFG_TIMER_DRIVER_ADD_PERIODIC("coinsim", blitz68k_state, steaser_mcu_sim, attotime::from_hz(10000)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cjffruit ) +MACHINE_CONFIG_START(blitz68k_state::cjffruit) MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz/2) MCFG_CPU_PROGRAM_MAP(cjffruit_map) @@ -1769,7 +1778,7 @@ static MACHINE_CONFIG_START( cjffruit ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bankrob ) +MACHINE_CONFIG_START(blitz68k_state::bankrob) MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz) MCFG_CPU_PROGRAM_MAP(bankrob_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc @@ -1801,7 +1810,7 @@ static MACHINE_CONFIG_START( bankrob ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bankroba ) +MACHINE_CONFIG_START(blitz68k_state::bankroba) MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz ) MCFG_CPU_PROGRAM_MAP(bankroba_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq5_line_hold) // protection prevents correct irq frequency by crtc @@ -1831,7 +1840,7 @@ static MACHINE_CONFIG_START( bankroba ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( deucesw2 ) +MACHINE_CONFIG_START(blitz68k_state::deucesw2) MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz / 2) MCFG_CPU_PROGRAM_MAP(deucesw2_map) // irq 2 reads from MCUs @@ -1860,7 +1869,7 @@ static MACHINE_CONFIG_START( deucesw2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dualgame ) +MACHINE_CONFIG_START(blitz68k_state::dualgame) MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz ) MCFG_CPU_PROGRAM_MAP(dualgame_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq2_line_hold) // lev 2 = MCUs, lev 3 = vblank @@ -1891,7 +1900,7 @@ static MACHINE_CONFIG_START( dualgame ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hermit ) +MACHINE_CONFIG_START(blitz68k_state::hermit) MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz/2 ) MCFG_CPU_PROGRAM_MAP(hermit_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq1_line_hold) // protection prevents correct irq frequency by crtc @@ -1920,7 +1929,7 @@ static MACHINE_CONFIG_START( hermit ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( maxidbl ) +MACHINE_CONFIG_START(blitz68k_state::maxidbl) MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz) MCFG_CPU_PROGRAM_MAP(maxidbl_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp index 5e358627f87..6d3ca3fd352 100644 --- a/src/mame/drivers/blktiger.cpp +++ b/src/mame/drivers/blktiger.cpp @@ -295,7 +295,7 @@ void blktiger_state::machine_reset() m_i8751_latch = 0; } -static MACHINE_CONFIG_START( blktiger ) +MACHINE_CONFIG_START(blktiger_state::blktiger) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */ @@ -343,7 +343,7 @@ static MACHINE_CONFIG_START( blktiger ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( blktigerbl, blktiger ) +MACHINE_CONFIG_DERIVED(blktiger_state::blktigerbl, blktiger) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(blktigerbl_io_map) diff --git a/src/mame/drivers/blmbycar.cpp b/src/mame/drivers/blmbycar.cpp index 69a3028c46d..30eef2a2f09 100644 --- a/src/mame/drivers/blmbycar.cpp +++ b/src/mame/drivers/blmbycar.cpp @@ -343,7 +343,7 @@ MACHINE_RESET_MEMBER(blmbycar_state,blmbycar) } -static MACHINE_CONFIG_START( blmbycar ) +MACHINE_CONFIG_START(blmbycar_state::blmbycar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12MHz */ @@ -389,7 +389,7 @@ MACHINE_RESET_MEMBER(blmbycar_state,watrball) m_retvalue = 0; } -static MACHINE_CONFIG_DERIVED( watrball, blmbycar ) +MACHINE_CONFIG_DERIVED(blmbycar_state::watrball, blmbycar) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/blockade.cpp b/src/mame/drivers/blockade.cpp index 54631399199..3517fc36d07 100644 --- a/src/mame/drivers/blockade.cpp +++ b/src/mame/drivers/blockade.cpp @@ -53,6 +53,7 @@ public: DECLARE_WRITE8_MEMBER(env_on_w); DECLARE_WRITE8_MEMBER(env_off_w); + void blockade(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -461,7 +462,7 @@ void blockade_state::device_timer(emu_timer &timer, device_timer_id id, int para // MACHINE DEFINTIONS //************************************************************************** -static MACHINE_CONFIG_START( blockade ) +MACHINE_CONFIG_START(blockade_state::blockade) MCFG_CPU_ADD("maincpu", I8080A, XTAL_20_079MHz / 10) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_IO_MAP(main_io_map) diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp index 35428a4bef9..5b557b7d91a 100644 --- a/src/mame/drivers/blockhl.cpp +++ b/src/mame/drivers/blockhl.cpp @@ -58,6 +58,7 @@ public: DECLARE_WRITE8_MEMBER(banking_callback); + void blockhl(machine_config &config); protected: virtual void machine_start() override; @@ -270,7 +271,7 @@ INPUT_PORTS_END // MACHINE DEFINTIONS //************************************************************************** -static MACHINE_CONFIG_START( blockhl ) +MACHINE_CONFIG_START(blockhl_state::blockhl) // basic machine hardware MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/8) // Konami 052526 MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/blockout.cpp b/src/mame/drivers/blockout.cpp index e1e1a93f6d5..42c4602e125 100644 --- a/src/mame/drivers/blockout.cpp +++ b/src/mame/drivers/blockout.cpp @@ -286,7 +286,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(blockout_state::blockout_scanline) m_maincpu->set_input_line(5, ASSERT_LINE); } -static MACHINE_CONFIG_START( blockout ) +MACHINE_CONFIG_START(blockout_state::blockout) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MAIN_CLOCK) /* MRH - 8.76 makes gfx/adpcm samples sync better -- but 10 is correct speed*/ @@ -325,7 +325,7 @@ static MACHINE_CONFIG_START( blockout ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( agress, blockout ) +MACHINE_CONFIG_DERIVED(blockout_state::agress, blockout) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(agress_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bloodbro.cpp b/src/mame/drivers/bloodbro.cpp index 53f8e160e1b..7041bd2a855 100644 --- a/src/mame/drivers/bloodbro.cpp +++ b/src/mame/drivers/bloodbro.cpp @@ -517,7 +517,7 @@ WRITE16_MEMBER( bloodbro_state::weststry_layer_scroll_w ) /* Machine Drivers */ -static MACHINE_CONFIG_START( bloodbro ) +MACHINE_CONFIG_START(bloodbro_state::bloodbro) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(bloodbro_map) @@ -562,7 +562,7 @@ static MACHINE_CONFIG_START( bloodbro ) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( weststry, bloodbro ) +MACHINE_CONFIG_DERIVED(bloodbro_state::weststry, bloodbro) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(weststry_map) @@ -596,7 +596,7 @@ static MACHINE_CONFIG_DERIVED( weststry, bloodbro ) MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8(bloodbro_state, weststry_opl_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( skysmash, bloodbro ) +MACHINE_CONFIG_DERIVED(bloodbro_state::skysmash, bloodbro) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(skysmash_map) diff --git a/src/mame/drivers/blstroid.cpp b/src/mame/drivers/blstroid.cpp index 0b8fc6a550a..7f7554217a3 100644 --- a/src/mame/drivers/blstroid.cpp +++ b/src/mame/drivers/blstroid.cpp @@ -174,7 +174,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( blstroid ) +MACHINE_CONFIG_START(blstroid_state::blstroid) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp index 6d05e2b554a..89141b53fde 100644 --- a/src/mame/drivers/blueprnt.cpp +++ b/src/mame/drivers/blueprnt.cpp @@ -342,7 +342,7 @@ void blueprnt_state::machine_reset() } -static MACHINE_CONFIG_START( blueprnt ) +MACHINE_CONFIG_START(blueprnt_state::blueprnt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 7000000/2) // 3.5 MHz @@ -389,7 +389,7 @@ static MACHINE_CONFIG_START( blueprnt ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( grasspin, blueprnt ) +MACHINE_CONFIG_DERIVED(blueprnt_state::grasspin, blueprnt) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp index 4bb969867c7..30737bd3f75 100644 --- a/src/mame/drivers/bmcbowl.cpp +++ b/src/mame/drivers/bmcbowl.cpp @@ -146,6 +146,7 @@ public: virtual void video_start() override; uint32_t screen_update_bmcbowl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void init_stats(const uint8_t *table, int table_len, int address); + void bmcbowl(machine_config &config); }; @@ -450,7 +451,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, bmcbowl_state ) AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START( bmcbowl ) +MACHINE_CONFIG_START(bmcbowl_state::bmcbowl) MCFG_CPU_ADD("maincpu", M68000, XTAL_21_4772MHz / 2 ) MCFG_CPU_PROGRAM_MAP(bmcbowl_mem) MCFG_CPU_VBLANK_INT_DRIVER("screen", bmcbowl_state, irq2_line_hold) diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp index 41f89e0c2e9..514f671b284 100644 --- a/src/mame/drivers/bmcpokr.cpp +++ b/src/mame/drivers/bmcpokr.cpp @@ -105,6 +105,8 @@ public: save_item(NAME(m_pixpal)); machine().save().register_postload(save_prepost_delegate(FUNC(bmcpokr_state::pixbitmap_redraw), this)); } + void bmcpokr(machine_config &config); + void mjmaglmp(machine_config &config); }; /*************************************************************************** @@ -800,7 +802,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, bmcpokr_state ) AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START( bmcpokr ) +MACHINE_CONFIG_START(bmcpokr_state::bmcpokr) MCFG_CPU_ADD("maincpu", M68000, XTAL_42MHz / 4) // 68000 @10.50MHz (42/4) MCFG_CPU_PROGRAM_MAP(bmcpokr_mem) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bmcpokr_state, interrupt, "screen", 0, 1) @@ -833,7 +835,7 @@ static MACHINE_CONFIG_START( bmcpokr ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjmaglmp, bmcpokr ) +MACHINE_CONFIG_DERIVED(bmcpokr_state::mjmaglmp, bmcpokr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mjmaglmp_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bmjr.cpp b/src/mame/drivers/bmjr.cpp index 28a45ee85b1..015f539707b 100644 --- a/src/mame/drivers/bmjr.cpp +++ b/src/mame/drivers/bmjr.cpp @@ -47,6 +47,7 @@ public: DECLARE_DRIVER_INIT(bmjr); u32 screen_update_bmjr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void bmjr(machine_config &config); private: bool m_tape_switch; u8 m_xor_display; @@ -333,7 +334,7 @@ void bmjr_state::machine_reset() m_cass->change_state(CASSETTE_MOTOR_DISABLED,CASSETTE_MASK_MOTOR); } -static MACHINE_CONFIG_START( bmjr ) +MACHINE_CONFIG_START(bmjr_state::bmjr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6800, XTAL_4MHz/4) //unknown clock / divider MCFG_CPU_PROGRAM_MAP(bmjr_mem) diff --git a/src/mame/drivers/bml3.cpp b/src/mame/drivers/bml3.cpp index 60f48b3df09..028be77ad54 100644 --- a/src/mame/drivers/bml3.cpp +++ b/src/mame/drivers/bml3.cpp @@ -129,6 +129,10 @@ public: DECLARE_READ8_MEMBER(bml3_ym2203_r); DECLARE_WRITE8_MEMBER(bml3_ym2203_w); + void bml3mk2(machine_config &config); + void bml3mk5(machine_config &config); + void bml3(machine_config &config); + void bml3_common(machine_config &config); private: u8 m_hres_reg; u8 m_crtc_vreg[0x100]; @@ -957,7 +961,7 @@ static SLOT_INTERFACE_START(bml3_cards) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( bml3_common ) +MACHINE_CONFIG_START(bml3_state::bml3_common) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6809, CPU_CLOCK) MCFG_CPU_VBLANK_INT_DRIVER("screen", bml3_state, bml3_timer_firq) @@ -1028,7 +1032,7 @@ static MACHINE_CONFIG_START( bml3_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bml3, bml3_common ) +MACHINE_CONFIG_DERIVED(bml3_state::bml3, bml3_common) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(bml3_mem) @@ -1044,14 +1048,14 @@ static MACHINE_CONFIG_DERIVED( bml3, bml3_common ) #endif MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bml3mk2, bml3_common ) +MACHINE_CONFIG_DERIVED(bml3_state::bml3mk2, bml3_common) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(bml3mk2_mem) // TODO: anything to add here? MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bml3mk5, bml3_common ) +MACHINE_CONFIG_DERIVED(bml3_state::bml3mk5, bml3_common) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(bml3mk5_mem) diff --git a/src/mame/drivers/bnstars.cpp b/src/mame/drivers/bnstars.cpp index 1cdc8f7d913..acd896afa6a 100644 --- a/src/mame/drivers/bnstars.cpp +++ b/src/mame/drivers/bnstars.cpp @@ -161,6 +161,7 @@ public: uint32_t screen_update_bnstars_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_roz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority, int chip); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, uint32_t *sprram_top, size_t sprram_size); + void bnstars(machine_config &config); }; @@ -806,7 +807,7 @@ void bnstars_state::machine_reset() } -static MACHINE_CONFIG_START( bnstars ) +MACHINE_CONFIG_START(bnstars_state::bnstars) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V70, 20000000) // 20MHz diff --git a/src/mame/drivers/bntyhunt.cpp b/src/mame/drivers/bntyhunt.cpp index 02a266cff5d..08cd3d2eea1 100644 --- a/src/mame/drivers/bntyhunt.cpp +++ b/src/mame/drivers/bntyhunt.cpp @@ -22,6 +22,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void bntyhunt(machine_config &config); protected: // devices @@ -49,7 +50,7 @@ static INPUT_PORTS_START( bntyhunt ) INPUT_PORTS_END -static MACHINE_CONFIG_START( bntyhunt ) +MACHINE_CONFIG_START(bntyhunt_state::bntyhunt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM, 200000000) /* Probably a Pentium or higher .. ?? Mhz*/ MCFG_CPU_PROGRAM_MAP(bntyhunt_map) diff --git a/src/mame/drivers/bob85.cpp b/src/mame/drivers/bob85.cpp index c3447df2c36..24cc1cba8c3 100644 --- a/src/mame/drivers/bob85.cpp +++ b/src/mame/drivers/bob85.cpp @@ -48,6 +48,7 @@ public: uint8_t m_count_key; virtual void machine_reset() override; + void bob85(machine_config &config); protected: required_ioport m_line0; required_ioport m_line1; @@ -198,7 +199,7 @@ READ_LINE_MEMBER( bob85_state::sid_r ) return m_cass->input() > 0.0; } -static MACHINE_CONFIG_START( bob85 ) +MACHINE_CONFIG_START(bob85_state::bob85) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, XTAL_5MHz) MCFG_CPU_PROGRAM_MAP(bob85_mem) diff --git a/src/mame/drivers/bogeyman.cpp b/src/mame/drivers/bogeyman.cpp index b1db26a4231..a0791b2352f 100644 --- a/src/mame/drivers/bogeyman.cpp +++ b/src/mame/drivers/bogeyman.cpp @@ -228,7 +228,7 @@ WRITE8_MEMBER(bogeyman_state::colbank_w) } } -static MACHINE_CONFIG_START( bogeyman ) +MACHINE_CONFIG_START(bogeyman_state::bogeyman) // basic machine hardware MCFG_CPU_ADD("maincpu", M6502, 1500000) /* Verified */ diff --git a/src/mame/drivers/bombjack.cpp b/src/mame/drivers/bombjack.cpp index db11f6e322b..d6818419e4a 100644 --- a/src/mame/drivers/bombjack.cpp +++ b/src/mame/drivers/bombjack.cpp @@ -342,7 +342,7 @@ INTERRUPT_GEN_MEMBER(bombjack_state::vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( bombjack ) +MACHINE_CONFIG_START(bombjack_state::bombjack) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) /* Confirmed from PCB */ diff --git a/src/mame/drivers/boogwing.cpp b/src/mame/drivers/boogwing.cpp index de64ad315c5..6aa6059e59a 100644 --- a/src/mame/drivers/boogwing.cpp +++ b/src/mame/drivers/boogwing.cpp @@ -321,7 +321,7 @@ DECO16IC_BANK_CB_MEMBER(boogwing_state::bank_callback2) return offset; } -static MACHINE_CONFIG_START( boogwing ) +MACHINE_CONFIG_START(boogwing_state::boogwing) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14000000) /* DE102 */ diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp index e46d5f5de2f..4ef35fa2ee2 100644 --- a/src/mame/drivers/bottom9.cpp +++ b/src/mame/drivers/bottom9.cpp @@ -298,7 +298,7 @@ void bottom9_state::machine_reset() m_nmienable = 0; } -static MACHINE_CONFIG_START( bottom9 ) +MACHINE_CONFIG_START(bottom9_state::bottom9) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309E, XTAL_24MHz / 8) // 63C09E diff --git a/src/mame/drivers/bowltry.cpp b/src/mame/drivers/bowltry.cpp index de49b5f9211..8fbf5abd3f7 100644 --- a/src/mame/drivers/bowltry.cpp +++ b/src/mame/drivers/bowltry.cpp @@ -52,6 +52,7 @@ public: uint16_t m_hack[2]; #endif +void bowltry(machine_config &config); protected: required_device m_maincpu; public: @@ -94,7 +95,7 @@ uint32_t bowltry_state::screen_update_bowltry(screen_device &screen, bitmap_rgb3 -static MACHINE_CONFIG_START( bowltry ) +MACHINE_CONFIG_START(bowltry_state::bowltry) MCFG_CPU_ADD("maincpu", H83008, 16000000 ) MCFG_CPU_PROGRAM_MAP( bowltry_map ) // MCFG_CPU_VBLANK_INT_DRIVER("screen", bowltry_state, irq0_line_hold) // uses vector $64, IMIAB according to the manual (timer/compare B, internal to the CPU) diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp index d6caffc33ac..afd92c51d1d 100644 --- a/src/mame/drivers/boxer.cpp +++ b/src/mame/drivers/boxer.cpp @@ -73,6 +73,7 @@ public: TIMER_CALLBACK_MEMBER(periodic_callback); void draw(bitmap_ind16 &bitmap, const rectangle &cliprect); + void boxer(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -480,7 +481,7 @@ void boxer_state::machine_reset() } -static MACHINE_CONFIG_START( boxer ) +MACHINE_CONFIG_START(boxer_state::boxer) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) diff --git a/src/mame/drivers/bpmmicro.cpp b/src/mame/drivers/bpmmicro.cpp index 89170f689ae..2b81dd25610 100644 --- a/src/mame/drivers/bpmmicro.cpp +++ b/src/mame/drivers/bpmmicro.cpp @@ -184,6 +184,7 @@ public: DECLARE_WRITE16_MEMBER(unknown_8401a_w); DECLARE_WRITE16_MEMBER(eeprom_8401c_w); virtual void machine_start() override; + void bpmmicro(machine_config &config); private: required_device m_maincpu; required_device m_eeprom_u38; @@ -357,7 +358,7 @@ INPUT_PORTS_END Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( bpmmicro ) +MACHINE_CONFIG_START(bpmmicro_state::bpmmicro) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80286, XTAL_32MHz/4) /* divider is guessed, cpu is an AMD N80L286-16/S part */ MCFG_CPU_PROGRAM_MAP(i286_mem) diff --git a/src/mame/drivers/br8641.cpp b/src/mame/drivers/br8641.cpp index c65fdd7272d..6eb0070d0d4 100644 --- a/src/mame/drivers/br8641.cpp +++ b/src/mame/drivers/br8641.cpp @@ -48,6 +48,7 @@ public: DECLARE_WRITE8_MEMBER(port08_w); DECLARE_WRITE8_MEMBER(port09_w); + void brandt8641(machine_config &config); private: uint8_t m_port08; uint8_t m_port09; @@ -153,7 +154,7 @@ static const z80_daisy_config daisy_chain_intf[] = -static MACHINE_CONFIG_START( brandt8641 ) +MACHINE_CONFIG_START(brandt8641_state::brandt8641) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) // U4 ,4MHz crystal on board MCFG_CPU_PROGRAM_MAP(brandt8641_mem) diff --git a/src/mame/drivers/brkthru.cpp b/src/mame/drivers/brkthru.cpp index 9680a38e041..c9877da23f1 100644 --- a/src/mame/drivers/brkthru.cpp +++ b/src/mame/drivers/brkthru.cpp @@ -370,7 +370,7 @@ INTERRUPT_GEN_MEMBER(brkthru_state::vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( brkthru ) +MACHINE_CONFIG_START(brkthru_state::brkthru) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ @@ -411,7 +411,7 @@ static MACHINE_CONFIG_START( brkthru ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( darwin ) +MACHINE_CONFIG_START(brkthru_state::darwin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ diff --git a/src/mame/drivers/bsktball.cpp b/src/mame/drivers/bsktball.cpp index a563d6000c2..b02347416ed 100644 --- a/src/mame/drivers/bsktball.cpp +++ b/src/mame/drivers/bsktball.cpp @@ -238,7 +238,7 @@ void bsktball_state::machine_reset() } -static MACHINE_CONFIG_START( bsktball ) +MACHINE_CONFIG_START(bsktball_state::bsktball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,750000) diff --git a/src/mame/drivers/btime.cpp b/src/mame/drivers/btime.cpp index cd01b7dbb80..50ec4c01bc7 100644 --- a/src/mame/drivers/btime.cpp +++ b/src/mame/drivers/btime.cpp @@ -1267,7 +1267,7 @@ MACHINE_RESET_MEMBER(btime_state,mmonkey) m_protection_ret = 0; } -static MACHINE_CONFIG_START( btime ) +MACHINE_CONFIG_START(btime_state::btime) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", DECO_CPU7, HCLK2) /* seletable between H2/H4 via jumper */ @@ -1322,7 +1322,7 @@ static MACHINE_CONFIG_START( btime ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cookrace, btime ) +MACHINE_CONFIG_DERIVED(btime_state::cookrace, btime) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", DECO_C10707, HCLK2) @@ -1339,7 +1339,7 @@ static MACHINE_CONFIG_DERIVED( cookrace, btime ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lnc, btime ) +MACHINE_CONFIG_DERIVED(btime_state::lnc, btime) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", DECO_C10707, HCLK2) @@ -1359,7 +1359,7 @@ static MACHINE_CONFIG_DERIVED( lnc, btime ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wtennis, lnc ) +MACHINE_CONFIG_DERIVED(btime_state::wtennis, lnc) /* basic machine hardware */ @@ -1369,7 +1369,7 @@ static MACHINE_CONFIG_DERIVED( wtennis, lnc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mmonkey, wtennis ) +MACHINE_CONFIG_DERIVED(btime_state::mmonkey, wtennis) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1379,7 +1379,7 @@ static MACHINE_CONFIG_DERIVED( mmonkey, wtennis ) MCFG_MACHINE_RESET_OVERRIDE(btime_state,mmonkey) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bnj, btime ) +MACHINE_CONFIG_DERIVED(btime_state::bnj, btime) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", DECO_C10707, HCLK4) @@ -1397,7 +1397,7 @@ static MACHINE_CONFIG_DERIVED( bnj, btime ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sdtennis, bnj ) +MACHINE_CONFIG_DERIVED(btime_state::sdtennis, bnj) /* basic machine hardware */ MCFG_CPU_REPLACE("audiocpu", DECO_C10707, HCLK1/3/2) @@ -1405,7 +1405,7 @@ static MACHINE_CONFIG_DERIVED( sdtennis, bnj ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zoar, btime ) +MACHINE_CONFIG_DERIVED(btime_state::zoar, btime) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1433,7 +1433,7 @@ static MACHINE_CONFIG_DERIVED( zoar, btime ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( disco, btime ) +MACHINE_CONFIG_DERIVED(btime_state::disco, btime) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1459,7 +1459,7 @@ static MACHINE_CONFIG_DERIVED( disco, btime ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tisland, btime ) +MACHINE_CONFIG_DERIVED(btime_state::tisland, btime) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/btoads.cpp b/src/mame/drivers/btoads.cpp index 86d402c5c41..82b821f5e01 100644 --- a/src/mame/drivers/btoads.cpp +++ b/src/mame/drivers/btoads.cpp @@ -300,7 +300,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( btoads ) +MACHINE_CONFIG_START(btoads_state::btoads) MCFG_CPU_ADD("maincpu", TMS34020, CPU_CLOCK/2) MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/bublbobl.cpp b/src/mame/drivers/bublbobl.cpp index cf0fa1f06c9..283127fe849 100644 --- a/src/mame/drivers/bublbobl.cpp +++ b/src/mame/drivers/bublbobl.cpp @@ -833,7 +833,7 @@ MACHINE_RESET_MEMBER(bublbobl_state,tokio) tokio_videoctrl_w(m_maincpu->device_t::memory().space(AS_PROGRAM), 0, 0x00, 0xFF); // TODO: does /RESET clear this the same as above? probably yes, needs tracing... } -static MACHINE_CONFIG_START( tokio ) +MACHINE_CONFIG_START(bublbobl_state::tokio) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz @@ -887,7 +887,7 @@ static MACHINE_CONFIG_START( tokio ) MCFG_SOUND_ROUTE(3, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bublboblp, tokio ) +MACHINE_CONFIG_DERIVED(bublbobl_state::bublboblp, tokio) MCFG_DEVICE_REMOVE("bmcu") // no mcu, socket is empty // watchdog circuit is actually present on the prototype pcb, but is either @@ -901,7 +901,7 @@ static MACHINE_CONFIG_DERIVED( bublboblp, tokio ) MCFG_CPU_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tokiob, tokio ) +MACHINE_CONFIG_DERIVED(bublbobl_state::tokiob, tokio) MCFG_DEVICE_REMOVE("bmcu") // no mcu, but see below... MCFG_CPU_REPLACE("maincpu", Z80, MAIN_XTAL/4) // 6 MHz @@ -947,7 +947,7 @@ MACHINE_RESET_MEMBER(bublbobl_state,bublbobl) m_port4_out = 0; } -static MACHINE_CONFIG_START( bublbobl_nomcu ) +MACHINE_CONFIG_START(bublbobl_state::bublbobl_nomcu) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz @@ -1002,7 +1002,7 @@ static MACHINE_CONFIG_START( bublbobl_nomcu ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bublbobl, bublbobl_nomcu ) +MACHINE_CONFIG_DERIVED(bublbobl_state::bublbobl, bublbobl_nomcu) MCFG_CPU_ADD("mcu", M6801, XTAL_4MHz) // actually 6801U4 - xtal is 4MHz, divided by 4 internally MCFG_CPU_PROGRAM_MAP(mcu_map) @@ -1027,7 +1027,7 @@ MACHINE_RESET_MEMBER(bublbobl_state,boblbobl) m_ic43_b = 0; } -static MACHINE_CONFIG_DERIVED( boblbobl, bublbobl_nomcu ) +MACHINE_CONFIG_DERIVED(bublbobl_state::boblbobl, bublbobl_nomcu) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1061,7 +1061,7 @@ MACHINE_RESET_MEMBER(bub68705_state, bub68705) m_latch = 0; } -static MACHINE_CONFIG_DERIVED( bub68705, bublbobl_nomcu ) +MACHINE_CONFIG_DERIVED(bub68705_state::bub68705, bublbobl_nomcu) /* basic machine hardware */ MCFG_CPU_ADD("mcu", M68705P3, XTAL_4MHz) // xtal is 4MHz, divided by 4 internally diff --git a/src/mame/drivers/buggychl.cpp b/src/mame/drivers/buggychl.cpp index 3b08782fc39..aa582292c64 100644 --- a/src/mame/drivers/buggychl.cpp +++ b/src/mame/drivers/buggychl.cpp @@ -446,7 +446,7 @@ void buggychl_state::machine_reset() m_bg_scrollx = 0; } -static MACHINE_CONFIG_START( buggychl ) +MACHINE_CONFIG_START(buggychl_state::buggychl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_48MHz/8) /* 6 MHz according to schematics, though it can be jumpered for 4MHz as well */ diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp index 319da73a63b..2651c8c3baa 100644 --- a/src/mame/drivers/bullet.cpp +++ b/src/mame/drivers/bullet.cpp @@ -1099,7 +1099,7 @@ void bulletf_state::machine_reset() // MACHINE_CONFIG( bullet ) //------------------------------------------------- -static MACHINE_CONFIG_START( bullet ) +MACHINE_CONFIG_START(bullet_state::bullet) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) MCFG_CPU_PROGRAM_MAP(bullet_mem) @@ -1179,7 +1179,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( bulletf ) //------------------------------------------------- -static MACHINE_CONFIG_START( bulletf ) +MACHINE_CONFIG_START(bulletf_state::bulletf) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) MCFG_CPU_PROGRAM_MAP(bulletf_mem) diff --git a/src/mame/drivers/busicom.cpp b/src/mame/drivers/busicom.cpp index 9b094d5ea93..87b241cc11a 100644 --- a/src/mame/drivers/busicom.cpp +++ b/src/mame/drivers/busicom.cpp @@ -219,7 +219,7 @@ void busicom_state::machine_reset() //static const char layout_busicom [] = "busicom"; -static MACHINE_CONFIG_START( busicom ) +MACHINE_CONFIG_START(busicom_state::busicom) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I4004, 750000) MCFG_I4004_ROM_MAP(busicom_rom) diff --git a/src/mame/drivers/buster.cpp b/src/mame/drivers/buster.cpp index 04a181fa4b0..b48133dbe24 100644 --- a/src/mame/drivers/buster.cpp +++ b/src/mame/drivers/buster.cpp @@ -32,6 +32,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void buster(machine_config &config); }; @@ -315,7 +316,7 @@ static GFXDECODE_START( buster ) GFXDECODE_END -static MACHINE_CONFIG_START( buster ) +MACHINE_CONFIG_START(buster_state::buster) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,XTAL_3_579545MHz) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(mainmap) diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp index 744e85edfb6..80379fcc7cf 100644 --- a/src/mame/drivers/bw12.cpp +++ b/src/mame/drivers/bw12.cpp @@ -543,7 +543,7 @@ GFXDECODE_END /* Machine Driver */ -static MACHINE_CONFIG_START( common ) +MACHINE_CONFIG_START(bw12_state::common) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) MCFG_CPU_PROGRAM_MAP(bw12_mem) @@ -634,7 +634,7 @@ static MACHINE_CONFIG_START( common ) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bw12, common ) +MACHINE_CONFIG_DERIVED(bw12_state::bw12, common) /* floppy drives */ MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw12_floppies, "525dd", bw12_state::bw12_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":2", bw12_floppies, "525dd", bw12_state::bw12_floppy_formats) @@ -647,7 +647,7 @@ static MACHINE_CONFIG_DERIVED( bw12, common ) MCFG_RAM_DEFAULT_SIZE("64K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bw14, common ) +MACHINE_CONFIG_DERIVED(bw12_state::bw14, common) /* floppy drives */ MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw14_floppies, "525dd", bw12_state::bw14_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":2", bw14_floppies, "525dd", bw12_state::bw14_floppy_formats) diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp index ad25efd928d..a23911565b2 100644 --- a/src/mame/drivers/bw2.cpp +++ b/src/mame/drivers/bw2.cpp @@ -569,7 +569,7 @@ void bw2_state::machine_start() // MACHINE_CONFIG( bw2 ) //------------------------------------------------- -static MACHINE_CONFIG_START( bw2 ) +MACHINE_CONFIG_START(bw2_state::bw2) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) MCFG_CPU_PROGRAM_MAP(bw2_mem) diff --git a/src/mame/drivers/bwidow.cpp b/src/mame/drivers/bwidow.cpp index 31961b9c1b9..447f79c95ee 100644 --- a/src/mame/drivers/bwidow.cpp +++ b/src/mame/drivers/bwidow.cpp @@ -731,7 +731,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( bwidow ) +MACHINE_CONFIG_START(bwidow_state::bwidow) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8) @@ -756,14 +756,14 @@ static MACHINE_CONFIG_START( bwidow ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bwidowp, bwidow ) +MACHINE_CONFIG_DERIVED(bwidow_state::bwidowp, bwidow) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bwidowp_map) MCFG_WATCHDOG_ADD("watchdog") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gravitar, bwidow ) +MACHINE_CONFIG_DERIVED(bwidow_state::gravitar, bwidow) /* basic machine hardware */ @@ -776,7 +776,7 @@ static MACHINE_CONFIG_DERIVED( gravitar, bwidow ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lunarbat, gravitar ) +MACHINE_CONFIG_DERIVED(bwidow_state::lunarbat, gravitar) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -788,7 +788,7 @@ static MACHINE_CONFIG_DERIVED( lunarbat, gravitar ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spacduel, gravitar ) +MACHINE_CONFIG_DERIVED(bwidow_state::spacduel, gravitar) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/bwing.cpp b/src/mame/drivers/bwing.cpp index 270a84903f0..99cdf1abc28 100644 --- a/src/mame/drivers/bwing.cpp +++ b/src/mame/drivers/bwing.cpp @@ -358,7 +358,7 @@ void bwing_state::bwing_postload() } -static MACHINE_CONFIG_START( bwing ) +MACHINE_CONFIG_START(bwing_state::bwing) // basic machine hardware MCFG_CPU_ADD("maincpu", M6809, 2000000) diff --git a/src/mame/drivers/by17.cpp b/src/mame/drivers/by17.cpp index 34f7a89bce0..345ec4a1b61 100644 --- a/src/mame/drivers/by17.cpp +++ b/src/mame/drivers/by17.cpp @@ -79,6 +79,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(timer_z_pulse); TIMER_DEVICE_CALLBACK_MEMBER(u11_timer); TIMER_DEVICE_CALLBACK_MEMBER(timer_d_pulse); + void by17(machine_config &config); private: uint8_t m_u10a; uint8_t m_u10b; @@ -974,7 +975,7 @@ MACHINE_RESET_MEMBER( by17_state, by17 ) -static MACHINE_CONFIG_START( by17 ) +MACHINE_CONFIG_START(by17_state::by17) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 530000) // No xtal, just 2 chips forming a multivibrator oscillator around 530KHz MCFG_CPU_PROGRAM_MAP(by17_map) diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp index 61c582e9a6b..6fe7ff18d8e 100644 --- a/src/mame/drivers/by35.cpp +++ b/src/mame/drivers/by35.cpp @@ -138,6 +138,10 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(timer_d_pulse); TIMER_DEVICE_CALLBACK_MEMBER(timer_s); TIMER_DEVICE_CALLBACK_MEMBER(timer_as2888); + void by35(machine_config &config); + void nuovo(machine_config &config); + void as2888(machine_config &config); + void as2888_audio(machine_config &config); private: uint8_t m_u10a; uint8_t m_u10b; @@ -1075,7 +1079,7 @@ DISCRETE_SOUND_END -static MACHINE_CONFIG_START( by35 ) +MACHINE_CONFIG_START(by35_state::by35) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 530000) // No xtal, just 2 chips forming a multivibrator oscillator around 530KHz MCFG_CPU_PROGRAM_MAP(by35_map) @@ -1119,7 +1123,7 @@ static MACHINE_CONFIG_START( by35 ) MCFG_TIMER_DRIVER_ADD("timer_d_pulse", by35_state, timer_d_pulse) // 555 Active pulse length MACHINE_CONFIG_END -MACHINE_CONFIG_START( as2888_audio ) +MACHINE_CONFIG_START(by35_state::as2888_audio) MCFG_MACHINE_START_OVERRIDE( by35_state, as2888 ) @@ -1137,13 +1141,13 @@ MACHINE_CONFIG_START( as2888_audio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( as2888, by35 ) +MACHINE_CONFIG_DERIVED(by35_state::as2888, by35) MCFG_FRAGMENT_ADD( as2888_audio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nuovo, by35 ) +MACHINE_CONFIG_DERIVED(by35_state::nuovo, by35) MCFG_CPU_REPLACE("maincpu", M6802, 2000000) // ? MHz ? Large crystal next to CPU, schematics don't indicate speed. MCFG_CPU_PROGRAM_MAP(nuovo_map) diff --git a/src/mame/drivers/by6803.cpp b/src/mame/drivers/by6803.cpp index adb4786b9ad..6da81b2db9b 100644 --- a/src/mame/drivers/by6803.cpp +++ b/src/mame/drivers/by6803.cpp @@ -64,6 +64,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(activity_test); DECLARE_INPUT_CHANGED_MEMBER(self_test); TIMER_DEVICE_CALLBACK_MEMBER(pia0_timer); + void by6803(machine_config &config); private: uint8_t m_pia0_a; uint8_t m_pia0_b; @@ -370,7 +371,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( by6803_state::pia0_timer ) m_pia0->cb1_w(m_pia0_timer); } -static MACHINE_CONFIG_START( by6803 ) +MACHINE_CONFIG_START(by6803_state::by6803) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6803, XTAL_3_579545MHz) MCFG_CPU_PROGRAM_MAP(by6803_map) diff --git a/src/mame/drivers/by68701.cpp b/src/mame/drivers/by68701.cpp index 7b0442593ae..425bfd15651 100644 --- a/src/mame/drivers/by68701.cpp +++ b/src/mame/drivers/by68701.cpp @@ -12,6 +12,7 @@ public: m_maincpu(*this, "maincpu") { } + void by68701(machine_config &config); protected: // devices @@ -43,7 +44,7 @@ DRIVER_INIT_MEMBER(by68701_state,by68701) { } -static MACHINE_CONFIG_START( by68701 ) +MACHINE_CONFIG_START(by68701_state::by68701) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6803, 3579545/4) MCFG_CPU_PROGRAM_MAP(by68701_map) diff --git a/src/mame/drivers/byvid.cpp b/src/mame/drivers/byvid.cpp index 31a38ca364d..7cecc31a7d6 100644 --- a/src/mame/drivers/byvid.cpp +++ b/src/mame/drivers/byvid.cpp @@ -106,6 +106,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(u11_timer); DECLARE_WRITE8_MEMBER(granny_crtc_w); uint32_t screen_update_granny(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void babypac(machine_config &config); + void granny(machine_config &config); private: uint8_t m_mpu_to_vid; uint8_t m_vid_to_mpu; @@ -741,7 +743,7 @@ uint32_t by133_state::screen_update_granny(screen_device &screen, bitmap_rgb32 & return 0; } -static MACHINE_CONFIG_START( babypac ) +MACHINE_CONFIG_START(by133_state::babypac) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_3_579545MHz/4) // no xtal, just 2 chips MCFG_CPU_PROGRAM_MAP(main_map) @@ -805,7 +807,7 @@ static MACHINE_CONFIG_START( babypac ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "beee", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( granny, babypac ) +MACHINE_CONFIG_DERIVED(by133_state::granny, babypac) MCFG_DEVICE_REMOVE("videocpu") MCFG_CPU_ADD("videocpu", MC6809, XTAL_8MHz) // MC68B09P (XTAL value hard to read) MCFG_CPU_PROGRAM_MAP(granny_map) diff --git a/src/mame/drivers/bzone.cpp b/src/mame/drivers/bzone.cpp index 2923fdf4182..de95eb839d5 100644 --- a/src/mame/drivers/bzone.cpp +++ b/src/mame/drivers/bzone.cpp @@ -535,7 +535,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( bzone_base ) +MACHINE_CONFIG_START(bzone_state::bzone_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, BZONE_MASTER_CLOCK / 8) @@ -560,7 +560,7 @@ static MACHINE_CONFIG_START( bzone_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bzone, bzone_base ) +MACHINE_CONFIG_DERIVED(bzone_state::bzone, bzone_base) /* sound hardware */ MCFG_FRAGMENT_ADD(bzone_audio) @@ -569,7 +569,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( redbaron, bzone_base ) +MACHINE_CONFIG_DERIVED(bzone_state::redbaron, bzone_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/c10.cpp b/src/mame/drivers/c10.cpp index b0cf1d5b62f..8dcc94a5f39 100644 --- a/src/mame/drivers/c10.cpp +++ b/src/mame/drivers/c10.cpp @@ -39,6 +39,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_DRIVER_INIT(c10); + void c10(machine_config &config); private: required_device m_maincpu; required_shared_ptr m_p_videoram; @@ -153,7 +154,7 @@ static GFXDECODE_START( c10 ) GFXDECODE_END -static MACHINE_CONFIG_START( c10 ) +MACHINE_CONFIG_START(c10_state::c10) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(c10_mem) diff --git a/src/mame/drivers/c128.cpp b/src/mame/drivers/c128.cpp index 45405b5d6e9..893272415b8 100644 --- a/src/mame/drivers/c128.cpp +++ b/src/mame/drivers/c128.cpp @@ -238,6 +238,13 @@ public: int m_user_pa2; int m_user_pb; + void pal(machine_config &config); + void ntsc(machine_config &config); + void c128pal(machine_config &config); + void c128(machine_config &config); + void c128dcr(machine_config &config); + void c128dcrp(machine_config &config); + void c128d81(machine_config &config); }; @@ -1672,7 +1679,7 @@ void c128_state::machine_reset() // MACHINE_CONFIG( ntsc ) //------------------------------------------------- -static MACHINE_CONFIG_START( ntsc ) +MACHINE_CONFIG_START(c128_state::ntsc) // basic hardware MCFG_CPU_ADD(Z80A_TAG, Z80, XTAL_14_31818MHz*2/3.5/2) MCFG_CPU_PROGRAM_MAP(z80_mem) @@ -1807,7 +1814,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( c128 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( c128, ntsc ) +MACHINE_CONFIG_DERIVED(c128_state::c128, ntsc) MCFG_CBM_IEC_ADD("c1571") MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(c128_state, iec_srq_w)) MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(c128_state, iec_data_w)) @@ -1818,7 +1825,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( c128dcr ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( c128dcr, ntsc ) +MACHINE_CONFIG_DERIVED(c128_state::c128dcr, ntsc) MCFG_CBM_IEC_ADD("c1571") // TODO c1571cr MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(c128_state, iec_srq_w)) MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(c128_state, iec_data_w)) @@ -1829,7 +1836,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( c128d81 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( c128d81, ntsc ) +MACHINE_CONFIG_DERIVED(c128_state::c128d81, ntsc) MCFG_CBM_IEC_ADD(nullptr) MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(c128_state, iec_srq_w)) MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(c128_state, iec_data_w)) @@ -1843,7 +1850,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pal ) //------------------------------------------------- -static MACHINE_CONFIG_START( pal ) +MACHINE_CONFIG_START(c128_state::pal) // basic hardware MCFG_CPU_ADD(Z80A_TAG, Z80, XTAL_17_734472MHz*2/4.5/2) MCFG_CPU_PROGRAM_MAP(z80_mem) @@ -1978,7 +1985,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( c128pal ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( c128pal, pal ) +MACHINE_CONFIG_DERIVED(c128_state::c128pal, pal) MCFG_CBM_IEC_ADD("c1571") MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(c128_state, iec_srq_w)) MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(c128_state, iec_data_w)) @@ -1989,7 +1996,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( c128dcrp ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( c128dcrp, pal ) +MACHINE_CONFIG_DERIVED(c128_state::c128dcrp, pal) MCFG_CBM_IEC_ADD("c1571") // TODO c1571cr MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(c128_state, iec_srq_w)) MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(c128_state, iec_data_w)) diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp index 30b82b23c79..4da62d04cf9 100644 --- a/src/mame/drivers/c64.cpp +++ b/src/mame/drivers/c64.cpp @@ -173,6 +173,9 @@ public: int m_user_pa2; int m_user_pb; + void pal(machine_config &config); + void ntsc(machine_config &config); + void pet64(machine_config &config); }; @@ -185,6 +188,9 @@ public: DECLARE_READ8_MEMBER( cpu_r ); DECLARE_WRITE8_MEMBER( cpu_w ); + void ntsc_sx(machine_config &config); + void ntsc_dx(machine_config &config); + void pal_sx(machine_config &config); }; @@ -194,6 +200,8 @@ public: c64c_state(const machine_config &mconfig, device_type type, const char *tag) : c64_state(mconfig, type, tag) { } + void pal_c(machine_config &config); + void ntsc_c(machine_config &config); }; @@ -209,6 +217,7 @@ public: DECLARE_READ8_MEMBER( cia1_pa_r ); DECLARE_READ8_MEMBER( cia1_pb_r ); + void pal_gs(machine_config &config); }; @@ -1311,7 +1320,7 @@ void c64_state::machine_reset() // MACHINE_CONFIG( ntsc ) //------------------------------------------------- -static MACHINE_CONFIG_START( ntsc ) +MACHINE_CONFIG_START(c64_state::ntsc) // basic hardware MCFG_CPU_ADD(M6510_TAG, M6510, XTAL_14_31818MHz/14) MCFG_CPU_PROGRAM_MAP(c64_mem) @@ -1415,7 +1424,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet64 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet64, ntsc ) +MACHINE_CONFIG_DERIVED(c64_state::pet64, ntsc) // TODO monochrome green palette MACHINE_CONFIG_END @@ -1424,7 +1433,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( ntsc_sx ) //------------------------------------------------- -static MACHINE_CONFIG_START( ntsc_sx ) +MACHINE_CONFIG_START(sx64_state::ntsc_sx) MCFG_FRAGMENT_ADD(ntsc) // basic hardware @@ -1442,7 +1451,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( ntsc_dx ) //------------------------------------------------- -static MACHINE_CONFIG_START( ntsc_dx ) +MACHINE_CONFIG_START(sx64_state::ntsc_dx) MCFG_FRAGMENT_ADD(ntsc_sx) // devices @@ -1455,7 +1464,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( ntsc_c ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( ntsc_c, ntsc ) +MACHINE_CONFIG_DERIVED(c64c_state::ntsc_c, ntsc) MCFG_SOUND_REPLACE(MOS6581_TAG, MOS8580, XTAL_14_31818MHz/14) MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r)) MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r)) @@ -1467,7 +1476,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pal ) //------------------------------------------------- -static MACHINE_CONFIG_START( pal ) +MACHINE_CONFIG_START(c64_state::pal) // basic hardware MCFG_CPU_ADD(M6510_TAG, M6510, XTAL_17_734472MHz/18) MCFG_CPU_PROGRAM_MAP(c64_mem) @@ -1572,7 +1581,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pal_sx ) //------------------------------------------------- -static MACHINE_CONFIG_START( pal_sx ) +MACHINE_CONFIG_START(sx64_state::pal_sx) MCFG_FRAGMENT_ADD(pal) // basic hardware @@ -1590,7 +1599,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pal_c ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pal_c, pal ) +MACHINE_CONFIG_DERIVED(c64c_state::pal_c, pal) MCFG_SOUND_REPLACE(MOS6581_TAG, MOS8580, XTAL_17_734472MHz/18) MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r)) MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r)) @@ -1602,7 +1611,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pal_gs ) //------------------------------------------------- -static MACHINE_CONFIG_START( pal_gs ) +MACHINE_CONFIG_START(c64gs_state::pal_gs) // basic hardware MCFG_CPU_ADD(M6510_TAG, M6510, XTAL_17_734472MHz/18) MCFG_CPU_PROGRAM_MAP(c64_mem) diff --git a/src/mame/drivers/c64dtv.cpp b/src/mame/drivers/c64dtv.cpp index 11d2da70338..f544462441c 100644 --- a/src/mame/drivers/c64dtv.cpp +++ b/src/mame/drivers/c64dtv.cpp @@ -31,6 +31,7 @@ public: bitmap.fill(rgb_t::black(), cliprect); return 0; } + void c64dtv(machine_config &config); }; @@ -48,7 +49,7 @@ INPUT_PORTS_END // MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( c64dtv ) +MACHINE_CONFIG_START(c64dtv_state::c64dtv) // video hardware MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_UPDATE_DRIVER(c64dtv_state, screen_update) diff --git a/src/mame/drivers/c65.cpp b/src/mame/drivers/c65.cpp index e698b518da1..fe2fa3dcb17 100644 --- a/src/mame/drivers/c65.cpp +++ b/src/mame/drivers/c65.cpp @@ -98,6 +98,7 @@ public: DECLARE_DRIVER_INIT(c65pal); INTERRUPT_GEN_MEMBER(vic3_vblank_irq); + void c65(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -680,7 +681,7 @@ WRITE_LINE_MEMBER(c65_state::cia0_irq) // c65_irq(state || m_vicirq); } -static MACHINE_CONFIG_START( c65 ) +MACHINE_CONFIG_START(c65_state::c65) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M4510, MAIN_CLOCK) diff --git a/src/mame/drivers/c80.cpp b/src/mame/drivers/c80.cpp index 953b98852e0..3b66b0f06cc 100644 --- a/src/mame/drivers/c80.cpp +++ b/src/mame/drivers/c80.cpp @@ -251,7 +251,7 @@ void c80_state::machine_start() /* Machine Driver */ -static MACHINE_CONFIG_START( c80 ) +MACHINE_CONFIG_START(c80_state::c80) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, 2500000) /* U880D */ MCFG_CPU_PROGRAM_MAP(c80_mem) diff --git a/src/mame/drivers/c900.cpp b/src/mame/drivers/c900.cpp index e86e6660353..20b0de890f9 100644 --- a/src/mame/drivers/c900.cpp +++ b/src/mame/drivers/c900.cpp @@ -46,6 +46,7 @@ public: DECLARE_READ16_MEMBER(stat_r); void kbd_put(u8 data); + void c900(machine_config &config); private: uint8_t m_term_data; required_device m_maincpu; @@ -106,7 +107,7 @@ static GFXDECODE_START( c900 ) GFXDECODE_ENTRY( "chargen", 0x0000, c900_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( c900 ) +MACHINE_CONFIG_START(c900_state::c900) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z8001, XTAL_12MHz / 2) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp index 91d7dbdf8c0..7ed25c9fe93 100644 --- a/src/mame/drivers/cabal.cpp +++ b/src/mame/drivers/cabal.cpp @@ -489,7 +489,7 @@ static GFXDECODE_START( cabal ) GFXDECODE_END -static MACHINE_CONFIG_START( cabal ) +MACHINE_CONFIG_START(cabal_state::cabal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */ @@ -535,7 +535,7 @@ static MACHINE_CONFIG_START( cabal ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cabalt, cabal ) +MACHINE_CONFIG_DERIVED(cabal_state::cabalt, cabal) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(trackball_main_map) @@ -548,7 +548,7 @@ static MACHINE_CONFIG_DERIVED( cabalt, cabal ) MCFG_UPD4701_PORTY("IN3") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cabalbl2, cabal ) +MACHINE_CONFIG_DERIVED(cabal_state::cabalbl2, cabal) MCFG_DEVICE_REMOVE("sei80bu") MCFG_DEVICE_MODIFY("audiocpu") @@ -558,7 +558,7 @@ MACHINE_CONFIG_END /* the bootleg has different sound hardware (2 extra Z80s for ADPCM playback) */ -static MACHINE_CONFIG_START( cabalbl ) +MACHINE_CONFIG_START(cabal_state::cabalbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */ diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp index 9eaa8d392ef..9a181bfd66c 100644 --- a/src/mame/drivers/cabaret.cpp +++ b/src/mame/drivers/cabaret.cpp @@ -70,6 +70,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void cabaret(machine_config &config); }; @@ -352,7 +353,7 @@ INTERRUPT_GEN_MEMBER(cabaret_state::cabaret_interrupt) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( cabaret ) +MACHINE_CONFIG_START(cabaret_state::cabaret) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) MCFG_CPU_PROGRAM_MAP(cabaret_map) diff --git a/src/mame/drivers/calchase.cpp b/src/mame/drivers/calchase.cpp index dc49d6ec13a..c90a8af9d08 100644 --- a/src/mame/drivers/calchase.cpp +++ b/src/mame/drivers/calchase.cpp @@ -170,6 +170,8 @@ public: virtual void machine_start() override; virtual void machine_reset() override; void intel82439tx_init(); + void calchase(machine_config &config); + void hostinv(machine_config &config); }; // Intel 82439TX System Controller (MTXC) @@ -639,7 +641,7 @@ void calchase_state::machine_reset() membank("bios_ext")->set_base(memregion("bios")->base() + 0); } -static MACHINE_CONFIG_START( calchase ) +MACHINE_CONFIG_START(calchase_state::calchase) MCFG_CPU_ADD("maincpu", PENTIUM, 133000000) // Cyrix 686MX-PR200 CPU MCFG_CPU_PROGRAM_MAP(calchase_map) MCFG_CPU_IO_MAP(calchase_io) @@ -671,7 +673,7 @@ static MACHINE_CONFIG_START( calchase ) MCFG_SOUND_ROUTE_EX(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "rdac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hostinv ) +MACHINE_CONFIG_START(calchase_state::hostinv) MCFG_CPU_ADD("maincpu", PENTIUM, 133000000) // Cyrix 686MX-PR200 CPU MCFG_CPU_PROGRAM_MAP(calchase_map) MCFG_CPU_IO_MAP(calchase_io) diff --git a/src/mame/drivers/calcune.cpp b/src/mame/drivers/calcune.cpp index b78f34ac709..7e1ebf7a71b 100644 --- a/src/mame/drivers/calcune.cpp +++ b/src/mame/drivers/calcune.cpp @@ -54,6 +54,7 @@ public: DECLARE_WRITE16_MEMBER(cal_vdp_w); uint32_t screen_update_calcune(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void calcune(machine_config &config); private: int vdp_state; @@ -245,7 +246,7 @@ MACHINE_START_MEMBER(calcune_state,calcune) m_vdp2->stop_timers(); } -static MACHINE_CONFIG_START( calcune ) +MACHINE_CONFIG_START(calcune_state::calcune) MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_NTSC / 7) /* 7.67 MHz */ MCFG_CPU_PROGRAM_MAP(calcune_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(calcune_state,genesis_int_callback) diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp index 142048db837..6bb5163cebf 100644 --- a/src/mame/drivers/calomega.cpp +++ b/src/mame/drivers/calomega.cpp @@ -2567,7 +2567,7 @@ WRITE_LINE_MEMBER(calomega_state::write_acia_clock) * Machine Drivers * *************************************************/ -static MACHINE_CONFIG_START( sys903 ) +MACHINE_CONFIG_START(calomega_state::sys903) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */ MCFG_CPU_PROGRAM_MAP(sys903_map) @@ -2616,7 +2616,7 @@ static MACHINE_CONFIG_START( sys903 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( s903mod, sys903 ) +MACHINE_CONFIG_DERIVED(calomega_state::s903mod, sys903) /* basic machine hardware */ @@ -2633,7 +2633,7 @@ static MACHINE_CONFIG_DERIVED( s903mod, sys903 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys905, sys903 ) +MACHINE_CONFIG_DERIVED(calomega_state::sys905, sys903) /* basic machine hardware */ @@ -2657,7 +2657,7 @@ static MACHINE_CONFIG_DERIVED( sys905, sys903 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys906, sys903 ) +MACHINE_CONFIG_DERIVED(calomega_state::sys906, sys903) /* basic machine hardware */ diff --git a/src/mame/drivers/calorie.cpp b/src/mame/drivers/calorie.cpp index 74af78d759f..9b729b301db 100644 --- a/src/mame/drivers/calorie.cpp +++ b/src/mame/drivers/calorie.cpp @@ -126,6 +126,8 @@ public: required_device m_palette; required_device m_soundlatch; optional_shared_ptr m_decrypted_opcodes; + void caloriee(machine_config &config); + void calorie(machine_config &config); }; @@ -452,7 +454,7 @@ void calorie_state::machine_reset() } -static MACHINE_CONFIG_START( calorie ) +MACHINE_CONFIG_START(calorie_state::calorie) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz */ @@ -494,7 +496,7 @@ static MACHINE_CONFIG_START( calorie ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( caloriee, calorie ) +MACHINE_CONFIG_DERIVED(calorie_state::caloriee, calorie) MCFG_CPU_REPLACE("maincpu", SEGA_317_0004,4000000) /* 4 MHz */ MCFG_CPU_PROGRAM_MAP(calorie_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp index f0c76d77eab..32f1bbddd1e 100644 --- a/src/mame/drivers/camplynx.cpp +++ b/src/mame/drivers/camplynx.cpp @@ -167,6 +167,11 @@ public: MC6845_UPDATE_ROW(lynx48k_update_row); MC6845_UPDATE_ROW(lynx128k_update_row); required_device m_palette; + void lynx_common(machine_config &config); + void lynx_disk(machine_config &config); + void lynx128k(machine_config &config); + void lynx48k(machine_config &config); + void lynx96k(machine_config &config); private: uint8_t m_port58; uint8_t m_port80; @@ -789,7 +794,7 @@ static SLOT_INTERFACE_START( camplynx_floppies ) SLOT_INTERFACE( "525qd", FLOPPY_525_QD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( lynx_common ) +MACHINE_CONFIG_START(camplynx_state::lynx_common) MCFG_PALETTE_ADD_3BIT_RGB("palette") /* sound hardware */ @@ -801,7 +806,7 @@ static MACHINE_CONFIG_START( lynx_common ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.02) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( lynx_disk ) +MACHINE_CONFIG_START(camplynx_state::lynx_disk) MCFG_FD1793_ADD("fdc", XTAL_24MHz / 24) MCFG_FLOPPY_DRIVE_ADD("fdc:0", camplynx_floppies, "525qd", camplynx_state::camplynx_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) @@ -809,7 +814,7 @@ static MACHINE_CONFIG_START( lynx_disk ) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( lynx48k ) +MACHINE_CONFIG_START(camplynx_state::lynx48k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 6) @@ -841,7 +846,7 @@ static MACHINE_CONFIG_START( lynx48k ) MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lynx96k, lynx48k ) +MACHINE_CONFIG_DERIVED(camplynx_state::lynx96k, lynx48k) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(lynx96k_io) @@ -849,7 +854,7 @@ static MACHINE_CONFIG_DERIVED( lynx96k, lynx48k ) MCFG_FRAGMENT_ADD(lynx_disk) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( lynx128k ) +MACHINE_CONFIG_START(camplynx_state::lynx128k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 4) diff --git a/src/mame/drivers/candela.cpp b/src/mame/drivers/candela.cpp index 37822ffba6a..b182664a634 100644 --- a/src/mame/drivers/candela.cpp +++ b/src/mame/drivers/candela.cpp @@ -155,6 +155,7 @@ public: DECLARE_WRITE_LINE_MEMBER( syspia_cb2_w); DECLARE_WRITE_LINE_MEMBER( usrpia_cb2_w); DECLARE_WRITE_LINE_MEMBER (write_acia_clock); + void can09t(machine_config &config); protected: required_device m_syspia; required_device m_usrpia; @@ -509,6 +510,7 @@ public: DECLARE_WRITE8_MEMBER( pia1_B_w ); DECLARE_WRITE_LINE_MEMBER( pia1_cb2_w); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void can09(machine_config &config); protected: required_device m_pia1; required_device m_ram; @@ -660,7 +662,7 @@ DEVICE_INPUT_DEFAULTS_END #define CAN09T_BAUDGEN_CLOCK XTAL_1_8432MHz #define CAN09T_ACIA_CLOCK (CAN09T_BAUDGEN_CLOCK / 12) -static MACHINE_CONFIG_START( can09t ) +MACHINE_CONFIG_START(can09t_state::can09t) MCFG_CPU_ADD("maincpu", MC6809, XTAL_4_9152MHz) // IPL crystal MCFG_CPU_PROGRAM_MAP(can09t_map) @@ -704,7 +706,7 @@ MACHINE_CONFIG_END #define CAN09_X1_CLOCK XTAL_22_1184MHz /* UKI 22118.40 Khz */ #define CAN09_CPU_CLOCK (CAN09_X1_CLOCK / 16) /* ~1.38MHz Divider needs to be check but is the most likelly */ -static MACHINE_CONFIG_START( can09 ) +MACHINE_CONFIG_START(can09_state::can09) MCFG_CPU_ADD("maincpu", MC6809E, CAN09_CPU_CLOCK) // MC68A09EP MCFG_CPU_PROGRAM_MAP(can09_map) diff --git a/src/mame/drivers/canon_s80.cpp b/src/mame/drivers/canon_s80.cpp index 47c74c7aa6a..cf406de250e 100644 --- a/src/mame/drivers/canon_s80.cpp +++ b/src/mame/drivers/canon_s80.cpp @@ -28,6 +28,7 @@ public: { } DECLARE_DRIVER_INIT(canons80); + void canons80(machine_config &config); }; @@ -36,7 +37,7 @@ static ADDRESS_MAP_START(canons80_map, AS_PROGRAM, 8, canons80_state ) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END -static MACHINE_CONFIG_START( canons80 ) +MACHINE_CONFIG_START(canons80_state::canons80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6301, 5000000) /* hd63a01xop 5 MHz guessed: TODO: check on PCB */ MCFG_CPU_PROGRAM_MAP(canons80_map) diff --git a/src/mame/drivers/canyon.cpp b/src/mame/drivers/canyon.cpp index dbef9201d42..1394917aa0d 100644 --- a/src/mame/drivers/canyon.cpp +++ b/src/mame/drivers/canyon.cpp @@ -247,7 +247,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( canyon ) +MACHINE_CONFIG_START(canyon_state::canyon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz / 16) diff --git a/src/mame/drivers/capbowl.cpp b/src/mame/drivers/capbowl.cpp index 891d66e0fef..18729a62dc8 100644 --- a/src/mame/drivers/capbowl.cpp +++ b/src/mame/drivers/capbowl.cpp @@ -313,7 +313,7 @@ void capbowl_state::machine_reset() } -static MACHINE_CONFIG_START( capbowl ) +MACHINE_CONFIG_START(capbowl_state::capbowl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK / 4) // MC68B09EP @@ -363,7 +363,7 @@ static MACHINE_CONFIG_START( capbowl ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bowlrama, capbowl ) +MACHINE_CONFIG_DERIVED(capbowl_state::bowlrama, capbowl) /* basic machine hardware */ diff --git a/src/mame/drivers/capcom.cpp b/src/mame/drivers/capcom.cpp index 1baa5e309c8..cbaac156f1e 100644 --- a/src/mame/drivers/capcom.cpp +++ b/src/mame/drivers/capcom.cpp @@ -16,6 +16,7 @@ public: m_maincpu(*this, "maincpu") { } + void capcom(machine_config &config); protected: // devices @@ -43,7 +44,7 @@ DRIVER_INIT_MEMBER(capcom_state,capcom) { } -static MACHINE_CONFIG_START( capcom ) +MACHINE_CONFIG_START(capcom_state::capcom) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16670000) // M68306 MCFG_CPU_PROGRAM_MAP(capcom_map) diff --git a/src/mame/drivers/capr1.cpp b/src/mame/drivers/capr1.cpp index 170d65ad7aa..4b7b5aba454 100644 --- a/src/mame/drivers/capr1.cpp +++ b/src/mame/drivers/capr1.cpp @@ -50,6 +50,7 @@ public: DECLARE_WRITE8_MEMBER(output_w); required_device m_maincpu; + void cspin2(machine_config &config); }; WRITE8_MEMBER(capr1_state::output_w) @@ -195,7 +196,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( cspin2 ) +MACHINE_CONFIG_START(capr1_state::cspin2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) // clock frequency unknown diff --git a/src/mame/drivers/caprcyc.cpp b/src/mame/drivers/caprcyc.cpp index 4ced7c3d5fa..e2dbaa2e570 100644 --- a/src/mame/drivers/caprcyc.cpp +++ b/src/mame/drivers/caprcyc.cpp @@ -28,6 +28,7 @@ public: { } required_device m_maincpu; + void caprcyc(machine_config &config); }; @@ -60,7 +61,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( caprcyc ) +MACHINE_CONFIG_START(caprcyc_state::caprcyc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", VR4300BE, 100000000) // cpu configuration is unknown diff --git a/src/mame/drivers/cardline.cpp b/src/mame/drivers/cardline.cpp index 3c74d31b663..93ae64642ea 100644 --- a/src/mame/drivers/cardline.cpp +++ b/src/mame/drivers/cardline.cpp @@ -75,6 +75,7 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_screen; + void cardline(machine_config &config); }; void cardline_state::machine_start() @@ -313,7 +314,7 @@ PALETTE_INIT_MEMBER(cardline_state, cardline) } } -static MACHINE_CONFIG_START( cardline ) +MACHINE_CONFIG_START(cardline_state::cardline) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C32, MASTER_CLOCK) diff --git a/src/mame/drivers/carjmbre.cpp b/src/mame/drivers/carjmbre.cpp index b7f2629fe5e..d2eb759239e 100644 --- a/src/mame/drivers/carjmbre.cpp +++ b/src/mame/drivers/carjmbre.cpp @@ -82,6 +82,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); TILE_GET_INFO_MEMBER(get_tile_info); + void carjmbre(machine_config &config); protected: virtual void machine_start() override; virtual void video_start() override; @@ -345,7 +346,7 @@ static GFXDECODE_START( carjmbre ) GFXDECODE_END -static MACHINE_CONFIG_START( carjmbre ) +MACHINE_CONFIG_START(carjmbre_state::carjmbre) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) diff --git a/src/mame/drivers/carpolo.cpp b/src/mame/drivers/carpolo.cpp index 93967f1b272..ad87fe0c77e 100644 --- a/src/mame/drivers/carpolo.cpp +++ b/src/mame/drivers/carpolo.cpp @@ -231,7 +231,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( carpolo ) +MACHINE_CONFIG_START(carpolo_state::carpolo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz/12) /* 940.75 kHz */ diff --git a/src/mame/drivers/carrera.cpp b/src/mame/drivers/carrera.cpp index 4fae5e1dfae..bcb52512eed 100644 --- a/src/mame/drivers/carrera.cpp +++ b/src/mame/drivers/carrera.cpp @@ -73,6 +73,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void carrera(machine_config &config); }; @@ -308,7 +309,7 @@ PALETTE_INIT_MEMBER(carrera_state, carrera) } -static MACHINE_CONFIG_START( carrera ) +MACHINE_CONFIG_START(carrera_state::carrera) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 6) MCFG_CPU_PROGRAM_MAP(carrera_map) diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp index efd5ec2be4f..f452fb937c9 100644 --- a/src/mame/drivers/casloopy.cpp +++ b/src/mame/drivers/casloopy.cpp @@ -198,6 +198,7 @@ public: DECLARE_READ8_MEMBER(bitmap_r); DECLARE_WRITE8_MEMBER(bitmap_w); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(loopy_cart); + void casloopy(machine_config &config); }; @@ -502,7 +503,7 @@ DEVICE_IMAGE_LOAD_MEMBER( casloopy_state, loopy_cart ) return image_init_result::PASS; } -static MACHINE_CONFIG_START( casloopy ) +MACHINE_CONFIG_START(casloopy_state::casloopy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",SH2A,8000000) diff --git a/src/mame/drivers/castle.cpp b/src/mame/drivers/castle.cpp index d82c8c2cf9d..5169120e7f0 100644 --- a/src/mame/drivers/castle.cpp +++ b/src/mame/drivers/castle.cpp @@ -55,6 +55,8 @@ public: m_maincpu(*this, "maincpu") { } + void castle_V1rvE(machine_config &config); + void castle_V2rvA(machine_config &config); protected: // devices @@ -76,7 +78,7 @@ static INPUT_PORTS_START( castrev ) INPUT_PORTS_END -static MACHINE_CONFIG_START( castle_V1rvE ) +MACHINE_CONFIG_START(castle_state::castle_V1rvE) MCFG_CPU_ADD("maincpu", HD6303Y, 1000000) MCFG_CPU_PROGRAM_MAP(V1rvE_mastermap) @@ -91,7 +93,7 @@ static ADDRESS_MAP_START( V2rvA_map, AS_PROGRAM, 8, castle_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( castle_V2rvA ) +MACHINE_CONFIG_START(castle_state::castle_V2rvA) MCFG_CPU_ADD("maincpu", HD6303Y, 1000000) MCFG_CPU_PROGRAM_MAP(V2rvA_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/caswin.cpp b/src/mame/drivers/caswin.cpp index 10eff0cf4b5..282b40962b2 100644 --- a/src/mame/drivers/caswin.cpp +++ b/src/mame/drivers/caswin.cpp @@ -101,6 +101,7 @@ public: uint32_t screen_update_vvillage(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void vvillage(machine_config &config); }; @@ -321,7 +322,7 @@ PALETTE_INIT_MEMBER(caswin_state, caswin) } -static MACHINE_CONFIG_START( vvillage ) +MACHINE_CONFIG_START(caswin_state::vvillage) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(vvillage_mem) diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp index 42f61e413f1..e478912e844 100644 --- a/src/mame/drivers/cat.cpp +++ b/src/mame/drivers/cat.cpp @@ -352,6 +352,7 @@ public: TIMER_CALLBACK_MEMBER(counter_6ms_callback); IRQ_CALLBACK_MEMBER(cat_int_ack); + void cat(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -1047,7 +1048,7 @@ WRITE_LINE_MEMBER(cat_state::prn_ack_ff) // switch the flipflop state on the ris #endif } -static MACHINE_CONFIG_START( cat ) +MACHINE_CONFIG_START(cat_state::cat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000, XTAL_19_968MHz/4) diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp index 009374a97bc..376de01007a 100644 --- a/src/mame/drivers/cave.cpp +++ b/src/mame/drivers/cave.cpp @@ -2096,7 +2096,7 @@ MACHINE_RESET_MEMBER(cave_state,cave) Dangun Feveron ***************************************************************************/ -static MACHINE_CONFIG_START( dfeveron ) +MACHINE_CONFIG_START(cave_state::dfeveron) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -2137,7 +2137,7 @@ MACHINE_CONFIG_END ***************************************************************************/ -static MACHINE_CONFIG_START( ddonpach ) +MACHINE_CONFIG_START(cave_state::ddonpach) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -2177,7 +2177,7 @@ MACHINE_CONFIG_END Donpachi ***************************************************************************/ -static MACHINE_CONFIG_START( donpachi ) +MACHINE_CONFIG_START(cave_state::donpachi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -2224,7 +2224,7 @@ MACHINE_CONFIG_END Esprade ***************************************************************************/ -static MACHINE_CONFIG_START( esprade ) +MACHINE_CONFIG_START(cave_state::esprade) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -2264,7 +2264,7 @@ MACHINE_CONFIG_END Gaia Crusaders ***************************************************************************/ -static MACHINE_CONFIG_START( gaia ) +MACHINE_CONFIG_START(cave_state::gaia) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -2305,7 +2305,7 @@ MACHINE_CONFIG_END Guwange ***************************************************************************/ -static MACHINE_CONFIG_START( guwange ) +MACHINE_CONFIG_START(cave_state::guwange) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -2344,7 +2344,7 @@ MACHINE_CONFIG_END Hotdog Storm ***************************************************************************/ -static MACHINE_CONFIG_START( hotdogst ) +MACHINE_CONFIG_START(cave_state::hotdogst) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) @@ -2397,7 +2397,7 @@ MACHINE_CONFIG_END Koro Koro Quest ***************************************************************************/ -static MACHINE_CONFIG_START( korokoro ) +MACHINE_CONFIG_START(cave_state::korokoro) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -2432,7 +2432,7 @@ static MACHINE_CONFIG_START( korokoro ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( crusherm, korokoro ) +MACHINE_CONFIG_DERIVED(cave_state::crusherm, korokoro) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(crusherm_map) MACHINE_CONFIG_END @@ -2442,7 +2442,7 @@ MACHINE_CONFIG_END Mazinger Z ***************************************************************************/ -static MACHINE_CONFIG_START( mazinger ) +MACHINE_CONFIG_START(cave_state::mazinger) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -2498,7 +2498,7 @@ MACHINE_CONFIG_END Metamoqester ***************************************************************************/ -static MACHINE_CONFIG_START( metmqstr ) +MACHINE_CONFIG_START(cave_state::metmqstr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2) @@ -2555,7 +2555,7 @@ MACHINE_CONFIG_END Pac-Slot ***************************************************************************/ -static MACHINE_CONFIG_START( pacslot ) +MACHINE_CONFIG_START(cave_state::pacslot) MCFG_NVRAM_ADD_0FILL("nvram") @@ -2602,7 +2602,7 @@ static MACHINE_CONFIG_START( pacslot ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( paceight, pacslot ) +MACHINE_CONFIG_DERIVED(cave_state::paceight, pacslot) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(paceight_map) MACHINE_CONFIG_END @@ -2615,7 +2615,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( cave_state::timer_lev2_cb ) m_maincpu->set_input_line(M68K_IRQ_2, HOLD_LINE); // ppsatan: read touch screens } -static MACHINE_CONFIG_START( ppsatan ) +MACHINE_CONFIG_START(cave_state::ppsatan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -2678,7 +2678,7 @@ MACHINE_CONFIG_END /* X1 = 12 MHz, X2 = 28 MHz, X3 = 16 MHz. OKI: / 165 mode A ; / 132 mode B */ -static MACHINE_CONFIG_START( pwrinst2 ) +MACHINE_CONFIG_START(cave_state::pwrinst2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16 MHz */ @@ -2749,7 +2749,7 @@ MACHINE_RESET_MEMBER(cave_state,sailormn) MACHINE_RESET_CALL_MEMBER(cave); } -static MACHINE_CONFIG_START( sailormn ) +MACHINE_CONFIG_START(cave_state::sailormn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -2810,7 +2810,7 @@ MACHINE_CONFIG_END Tekken Card World ***************************************************************************/ -static MACHINE_CONFIG_START( tekkencw ) +MACHINE_CONFIG_START(cave_state::tekkencw) MCFG_NVRAM_ADD_0FILL("nvram") @@ -2854,7 +2854,7 @@ static MACHINE_CONFIG_START( tekkencw ) // oki2 chip spot and rom socket are both unpopulated MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tekkenbs, tekkencw ) +MACHINE_CONFIG_DERIVED(cave_state::tekkenbs, tekkencw) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tekkenbs_map) MACHINE_CONFIG_END @@ -2864,7 +2864,7 @@ MACHINE_CONFIG_END Tobikose! Jumpman ***************************************************************************/ -static MACHINE_CONFIG_START( tjumpman ) +MACHINE_CONFIG_START(cave_state::tjumpman) MCFG_NVRAM_ADD_0FILL("nvram") @@ -2913,7 +2913,7 @@ MACHINE_CONFIG_END Uo Poko ***************************************************************************/ -static MACHINE_CONFIG_START( uopoko ) +MACHINE_CONFIG_START(cave_state::uopoko) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) diff --git a/src/mame/drivers/cavepc.cpp b/src/mame/drivers/cavepc.cpp index 4a44bf5a132..ea29ff736da 100644 --- a/src/mame/drivers/cavepc.cpp +++ b/src/mame/drivers/cavepc.cpp @@ -70,6 +70,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_cavepc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void cavepc(machine_config &config); }; void cavepc_state::video_start() @@ -106,7 +107,7 @@ void cavepc_state::machine_reset() membank("bank1")->set_base(memregion("bios")->base() + 0x30000); } -static MACHINE_CONFIG_START( cavepc ) +MACHINE_CONFIG_START(cavepc_state::cavepc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM3, 200000000) /* AMD Athlon 64 X2 5050e Brisbane 2.60GHz, 1024KB L2 Cache ! */ MCFG_CPU_PROGRAM_MAP(cavepc_map) diff --git a/src/mame/drivers/cb2001.cpp b/src/mame/drivers/cb2001.cpp index 0c0afba925a..370f36f5ead 100644 --- a/src/mame/drivers/cb2001.cpp +++ b/src/mame/drivers/cb2001.cpp @@ -84,6 +84,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void cb2001(machine_config &config); }; @@ -814,7 +815,7 @@ PALETTE_INIT_MEMBER(cb2001_state, cb2001) } } -static MACHINE_CONFIG_START( cb2001 ) +MACHINE_CONFIG_START(cb2001_state::cb2001) MCFG_CPU_ADD("maincpu", V35, 20000000) // CPU91A-011-0016JK004; encrypted cpu like nec v25/35 used in some irem game MCFG_V25_CONFIG(cb2001_decryption_table) MCFG_CPU_PROGRAM_MAP(cb2001_map) diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp index fe294667f9e..bad1a3dc32f 100644 --- a/src/mame/drivers/cball.cpp +++ b/src/mame/drivers/cball.cpp @@ -55,6 +55,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void cball(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -259,7 +260,7 @@ static GFXDECODE_START( cball ) GFXDECODE_END -static MACHINE_CONFIG_START( cball ) +MACHINE_CONFIG_START(cball_state::cball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 16) /* ? */ diff --git a/src/mame/drivers/cbasebal.cpp b/src/mame/drivers/cbasebal.cpp index 48f51cc5793..b5134557812 100644 --- a/src/mame/drivers/cbasebal.cpp +++ b/src/mame/drivers/cbasebal.cpp @@ -258,7 +258,7 @@ void cbasebal_state::machine_reset() m_scroll_y[1] = 0; } -static MACHINE_CONFIG_START( cbasebal ) +MACHINE_CONFIG_START(cbasebal_state::cbasebal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 6000000) /* ??? */ diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp index 6a36af382a8..539cb653163 100644 --- a/src/mame/drivers/cbm2.cpp +++ b/src/mame/drivers/cbm2.cpp @@ -221,6 +221,16 @@ public: // timers emu_timer *m_todclk_timer; + void _128k(machine_config &config); + void _256k(machine_config &config); + void cbm2lp_ntsc(machine_config &config); + void cbm2lp_pal(machine_config &config); + void cbm2hp_ntsc(machine_config &config); + void cbm2hp_pal(machine_config &config); + void cbm620(machine_config &config); + void b128(machine_config &config); + void b256(machine_config &config); + void cbm610(machine_config &config); }; @@ -235,6 +245,12 @@ public: int *casseg1, int *casseg2, int *casseg3, int *casseg4, int *rasseg1, int *rasseg2, int *rasseg3, int *rasseg4) override; DECLARE_READ8_MEMBER( tpi2_pc_r ); + void b256hp(machine_config &config); + void b128hp(machine_config &config); + void cbm710(machine_config &config); + void cbm730(machine_config &config); + void cbm720(machine_config &config); + void bx256hp(machine_config &config); }; @@ -300,6 +316,8 @@ public: // interrupt state int m_vic_irq; + void p500_pal(machine_config &config); + void p500_ntsc(machine_config &config); }; @@ -2258,7 +2276,7 @@ MACHINE_RESET_MEMBER( p500_state, p500 ) // MACHINE_CONFIG( 128k ) //------------------------------------------------- -static MACHINE_CONFIG_START( 128k ) +MACHINE_CONFIG_START(cbm2_state::_128k) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("128K") MCFG_RAM_EXTRA_OPTIONS("256K") @@ -2269,7 +2287,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( 256k ) //------------------------------------------------- -static MACHINE_CONFIG_START( 256k ) +MACHINE_CONFIG_START(cbm2_state::_256k) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("256K") MACHINE_CONFIG_END @@ -2279,7 +2297,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( p500_ntsc ) //------------------------------------------------- -static MACHINE_CONFIG_START( p500_ntsc ) +MACHINE_CONFIG_START(p500_state::p500_ntsc) MCFG_MACHINE_START_OVERRIDE(p500_state, p500_ntsc) MCFG_MACHINE_RESET_OVERRIDE(p500_state, p500) @@ -2381,7 +2399,7 @@ static MACHINE_CONFIG_START( p500_ntsc ) MCFG_QUICKLOAD_ADD("quickload", p500_state, p500, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) // internal ram - MCFG_FRAGMENT_ADD(128k) + MCFG_FRAGMENT_ADD(_128k) // software list MCFG_SOFTWARE_LIST_ADD("cart_list", "cbm2_cart") @@ -2395,7 +2413,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( p500_pal ) //------------------------------------------------- -static MACHINE_CONFIG_START( p500_pal ) +MACHINE_CONFIG_START(p500_state::p500_pal) MCFG_MACHINE_START_OVERRIDE(p500_state, p500_pal) MCFG_MACHINE_RESET_OVERRIDE(p500_state, p500) @@ -2494,7 +2512,7 @@ static MACHINE_CONFIG_START( p500_pal ) MCFG_QUICKLOAD_ADD("quickload", p500_state, p500, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) // internal ram - MCFG_FRAGMENT_ADD(128k) + MCFG_FRAGMENT_ADD(_128k) // software list MCFG_SOFTWARE_LIST_ADD("cart_list", "cbm2_cart") @@ -2508,7 +2526,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm2lp_ntsc ) //------------------------------------------------- -static MACHINE_CONFIG_START( cbm2lp_ntsc ) +MACHINE_CONFIG_START(cbm2_state::cbm2lp_ntsc) MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2_ntsc) MCFG_MACHINE_RESET_OVERRIDE(cbm2_state, cbm2) @@ -2617,8 +2635,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( b128 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( b128, cbm2lp_ntsc ) - MCFG_FRAGMENT_ADD(128k) +MACHINE_CONFIG_DERIVED(cbm2_state::b128, cbm2lp_ntsc) + MCFG_FRAGMENT_ADD(_128k) MACHINE_CONFIG_END @@ -2626,8 +2644,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( b256 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( b256, cbm2lp_ntsc ) - MCFG_FRAGMENT_ADD(256k) +MACHINE_CONFIG_DERIVED(cbm2_state::b256, cbm2lp_ntsc) + MCFG_FRAGMENT_ADD(_256k) MACHINE_CONFIG_END @@ -2635,7 +2653,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm2lp_pal ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm2lp_pal, cbm2lp_ntsc ) +MACHINE_CONFIG_DERIVED(cbm2_state::cbm2lp_pal, cbm2lp_ntsc) MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2_pal) MCFG_DEVICE_MODIFY(MOS6526_TAG) @@ -2647,8 +2665,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm610 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm610, cbm2lp_pal ) - MCFG_FRAGMENT_ADD(128k) +MACHINE_CONFIG_DERIVED(cbm2_state::cbm610, cbm2lp_pal) + MCFG_FRAGMENT_ADD(_128k) MACHINE_CONFIG_END @@ -2656,8 +2674,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm620 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm620, cbm2lp_pal ) - MCFG_FRAGMENT_ADD(256k) +MACHINE_CONFIG_DERIVED(cbm2_state::cbm620, cbm2lp_pal) + MCFG_FRAGMENT_ADD(_256k) MACHINE_CONFIG_END @@ -2665,7 +2683,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm2hp_ntsc ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm2hp_ntsc, cbm2lp_ntsc ) +MACHINE_CONFIG_DERIVED(cbm2_state::cbm2hp_ntsc, cbm2lp_ntsc) MCFG_DEVICE_MODIFY(MOS6525_2_TAG) MCFG_TPI6525_IN_PC_CB(READ8(cbm2hp_state, tpi2_pc_r)) MACHINE_CONFIG_END @@ -2675,8 +2693,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( b128hp ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( b128hp, cbm2hp_ntsc ) - MCFG_FRAGMENT_ADD(128k) +MACHINE_CONFIG_DERIVED(cbm2hp_state::b128hp, cbm2hp_ntsc) + MCFG_FRAGMENT_ADD(_128k) MACHINE_CONFIG_END @@ -2684,8 +2702,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( b256hp ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( b256hp, cbm2hp_ntsc ) - MCFG_FRAGMENT_ADD(256k) +MACHINE_CONFIG_DERIVED(cbm2hp_state::b256hp, cbm2hp_ntsc) + MCFG_FRAGMENT_ADD(_256k) MACHINE_CONFIG_END @@ -2693,7 +2711,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( bx256hp ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( bx256hp, b256hp ) +MACHINE_CONFIG_DERIVED(cbm2hp_state::bx256hp, b256hp) MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2x_ntsc) MCFG_CPU_ADD(EXT_I8088_TAG, I8088, XTAL_12MHz) @@ -2725,7 +2743,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm2hp_pal ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm2hp_pal, cbm2hp_ntsc ) +MACHINE_CONFIG_DERIVED(cbm2_state::cbm2hp_pal, cbm2hp_ntsc) MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2_pal) // devices @@ -2741,8 +2759,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm710 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm710, cbm2hp_pal ) - MCFG_FRAGMENT_ADD(128k) +MACHINE_CONFIG_DERIVED(cbm2hp_state::cbm710, cbm2hp_pal) + MCFG_FRAGMENT_ADD(_128k) MACHINE_CONFIG_END @@ -2750,8 +2768,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm720 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm720, cbm2hp_pal ) - MCFG_FRAGMENT_ADD(256k) +MACHINE_CONFIG_DERIVED(cbm2hp_state::cbm720, cbm2hp_pal) + MCFG_FRAGMENT_ADD(_256k) MACHINE_CONFIG_END @@ -2759,7 +2777,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm730 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm730, cbm720 ) +MACHINE_CONFIG_DERIVED(cbm2hp_state::cbm730, cbm720) MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2x_pal) MCFG_CPU_ADD(EXT_I8088_TAG, I8088, XTAL_12MHz) diff --git a/src/mame/drivers/cbuster.cpp b/src/mame/drivers/cbuster.cpp index 205622d22e1..1926a3fe005 100644 --- a/src/mame/drivers/cbuster.cpp +++ b/src/mame/drivers/cbuster.cpp @@ -305,7 +305,7 @@ void cbuster_state::machine_reset() m_pri = 0; } -static MACHINE_CONFIG_START( twocrude ) +MACHINE_CONFIG_START(cbuster_state::twocrude) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* Custom chip 59 @ 12MHz Verified */ diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp index 562f7f0cb9d..65280358d53 100644 --- a/src/mame/drivers/cc40.cpp +++ b/src/mame/drivers/cc40.cpp @@ -147,6 +147,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(sysram_size_changed); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cc40_cartridge); HD44780_PIXEL_UPDATE(cc40_pixel_update); + void cc40(machine_config &config); }; @@ -574,7 +575,7 @@ void cc40_state::machine_start() machine().save().register_postload(save_prepost_delegate(FUNC(cc40_state::postload), this)); } -static MACHINE_CONFIG_START( cc40 ) +MACHINE_CONFIG_START(cc40_state::cc40) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS70C20, XTAL_5MHz / 2) diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp index 8a69828290a..4bfe409d44e 100644 --- a/src/mame/drivers/ccastles.cpp +++ b/src/mame/drivers/ccastles.cpp @@ -453,7 +453,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( ccastles ) +MACHINE_CONFIG_START(ccastles_state::ccastles) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) diff --git a/src/mame/drivers/cchance.cpp b/src/mame/drivers/cchance.cpp index ab1a2fc32c1..dfd3d5c2318 100644 --- a/src/mame/drivers/cchance.cpp +++ b/src/mame/drivers/cchance.cpp @@ -57,6 +57,7 @@ public: DECLARE_WRITE8_MEMBER(output_0_w); DECLARE_READ8_MEMBER(input_1_r); DECLARE_WRITE8_MEMBER(output_1_w); + void cchance(machine_config &config); }; @@ -209,7 +210,7 @@ void cchance_state::machine_reset() m_bell_io = 0; } -static MACHINE_CONFIG_START( cchance ) +MACHINE_CONFIG_START(cchance_state::cchance) MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/cchasm.cpp b/src/mame/drivers/cchasm.cpp index 47283484000..2633cb952f0 100644 --- a/src/mame/drivers/cchasm.cpp +++ b/src/mame/drivers/cchasm.cpp @@ -144,7 +144,7 @@ static const z80_daisy_config daisy_chain[] = * *************************************/ -static MACHINE_CONFIG_START( cchasm ) +MACHINE_CONFIG_START(cchasm_state::cchasm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, CCHASM_68K_CLOCK) /* 8 MHz (from schematics) */ diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp index 38d4c13bf83..49b8f8b216b 100644 --- a/src/mame/drivers/cclimber.cpp +++ b/src/mame/drivers/cclimber.cpp @@ -1093,7 +1093,7 @@ INTERRUPT_GEN_MEMBER(cclimber_state::bagmanf_vblank_irq) device.execute().set_input_line(0, HOLD_LINE); } -static MACHINE_CONFIG_START( root ) +MACHINE_CONFIG_START(cclimber_state::root) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */ @@ -1123,7 +1123,7 @@ static MACHINE_CONFIG_START( root ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cclimber, root ) +MACHINE_CONFIG_DERIVED(cclimber_state::cclimber, root) MCFG_DEVICE_MODIFY("mainlatch") // 7J on CCG-1 MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("cclimber_audio", cclimber_audio_device, sample_trigger_w)) @@ -1133,18 +1133,18 @@ static MACHINE_CONFIG_DERIVED( cclimber, root ) MCFG_CCLIMBER_AUDIO_ADD("cclimber_audio") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cclimberx, cclimber ) +MACHINE_CONFIG_DERIVED(cclimber_state::cclimberx, cclimber) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ckongb, cclimber ) +MACHINE_CONFIG_DERIVED(cclimber_state::ckongb, cclimber) MCFG_DEVICE_MODIFY("mainlatch") MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cclimber_state, nmi_mask_w)) //used by Crazy Kong Bootleg with alt levels and speed up MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cannonb, cclimber ) +MACHINE_CONFIG_DERIVED(cclimber_state::cannonb, cclimber) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1159,7 +1159,7 @@ static MACHINE_CONFIG_DERIVED( cannonb, cclimber ) MCFG_GFXDECODE_MODIFY("gfxdecode", cannonb) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bagmanf, cclimber ) +MACHINE_CONFIG_DERIVED(cclimber_state::bagmanf, cclimber) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1168,7 +1168,7 @@ static MACHINE_CONFIG_DERIVED( bagmanf, cclimber ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( yamato, root ) +MACHINE_CONFIG_DERIVED(cclimber_state::yamato, root) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", SEGA_315_5018, MASTER_CLOCK/3/2) /* 3.072 MHz */ @@ -1200,7 +1200,7 @@ static MACHINE_CONFIG_DERIVED( yamato, root ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( toprollr, cclimber ) +MACHINE_CONFIG_DERIVED(cclimber_state::toprollr, cclimber) MCFG_CPU_REPLACE("maincpu", SEGA_315_5018, MASTER_CLOCK/3/2) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(toprollr_map) @@ -1227,7 +1227,7 @@ static MACHINE_CONFIG_DERIVED( toprollr, cclimber ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( swimmer ) +MACHINE_CONFIG_START(cclimber_state::swimmer) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */ @@ -1273,7 +1273,7 @@ static MACHINE_CONFIG_START( swimmer ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( guzzler, swimmer ) +MACHINE_CONFIG_DERIVED(cclimber_state::guzzler, swimmer) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(guzzler_map) diff --git a/src/mame/drivers/ccs2810.cpp b/src/mame/drivers/ccs2810.cpp index c7120a266e8..55f6e4c61aa 100644 --- a/src/mame/drivers/ccs2810.cpp +++ b/src/mame/drivers/ccs2810.cpp @@ -103,6 +103,8 @@ public: DECLARE_WRITE8_MEMBER(port34_w); DECLARE_WRITE8_MEMBER(port40_w); + void ccs2810(machine_config &config); + void ccs2422(machine_config &config); private: required_device m_maincpu; required_device m_ram; @@ -894,7 +896,7 @@ SLOT_INTERFACE_END //SLOT_INTERFACE( "525dd", FLOPPY_525_DD ) -static MACHINE_CONFIG_START( ccs2810 ) +MACHINE_CONFIG_START(ccs_state::ccs2810) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(ccs2810_mem) @@ -918,7 +920,7 @@ static MACHINE_CONFIG_START( ccs2810 ) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ins8250", ins8250_device, cts_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ccs2422 ) +MACHINE_CONFIG_START(ccs_state::ccs2422) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(ccs2810_mem) diff --git a/src/mame/drivers/ccs300.cpp b/src/mame/drivers/ccs300.cpp index dfc6c1bc953..538d20cbf5b 100644 --- a/src/mame/drivers/ccs300.cpp +++ b/src/mame/drivers/ccs300.cpp @@ -40,6 +40,7 @@ public: DECLARE_MACHINE_RESET(ccs300); DECLARE_WRITE8_MEMBER(port40_w); + void ccs300(machine_config &config); private: required_device m_maincpu; }; @@ -110,7 +111,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( ccs300 ) +MACHINE_CONFIG_START(ccs300_state::ccs300) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(ccs300_mem) diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp index 86aaffb4fba..87fd7e1a23c 100644 --- a/src/mame/drivers/cd2650.cpp +++ b/src/mame/drivers/cd2650.cpp @@ -80,6 +80,7 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER(cd2650); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void cd2650(machine_config &config); private: uint8_t m_term_data; virtual void machine_reset() override; @@ -278,7 +279,7 @@ QUICKLOAD_LOAD_MEMBER( cd2650_state, cd2650 ) return result; } -static MACHINE_CONFIG_START( cd2650 ) +MACHINE_CONFIG_START(cd2650_state::cd2650) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, XTAL_14_192640MHz / 12) // 1.182720MHz according to RE schematic MCFG_CPU_PROGRAM_MAP(cd2650_mem) diff --git a/src/mame/drivers/cdc721.cpp b/src/mame/drivers/cdc721.cpp index 2bf98041385..7c9035fc8a7 100644 --- a/src/mame/drivers/cdc721.cpp +++ b/src/mame/drivers/cdc721.cpp @@ -30,6 +30,7 @@ public: DECLARE_PALETTE_INIT(cdc721); // DECLARE_WRITE8_MEMBER(port70_w) { membank("bankr0")->set_entry(BIT(data, 3)); } +void cdc721(machine_config &config); private: u8 m_flashcnt; virtual void machine_reset() override; @@ -140,7 +141,7 @@ uint32_t cdc721_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap return 0; } -static MACHINE_CONFIG_START( cdc721 ) +MACHINE_CONFIG_START(cdc721_state::cdc721) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp index d7083bbb429..b1e766d1c26 100644 --- a/src/mame/drivers/cdi.cpp +++ b/src/mame/drivers/cdi.cpp @@ -770,7 +770,7 @@ WRITE8_MEMBER( cdi_state::slave_io_w ) *************************/ // CD-i Mono-I system base -static MACHINE_CONFIG_START( cdimono1_base ) +MACHINE_CONFIG_START(cdi_state::cdimono1_base) MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A/2) MCFG_CPU_PROGRAM_MAP(cdimono1_mem) @@ -816,7 +816,7 @@ static MACHINE_CONFIG_START( cdimono1_base ) MACHINE_CONFIG_END // CD-i model 220 (Mono-II, NTSC) -static MACHINE_CONFIG_START( cdimono2 ) +MACHINE_CONFIG_START(cdi_state::cdimono2) MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A/2) MCFG_CPU_PROGRAM_MAP(cdimono2_mem) @@ -870,7 +870,7 @@ static MACHINE_CONFIG_START( cdimono2 ) MCFG_MK48T08_ADD( "mk48t08" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cdi910 ) +MACHINE_CONFIG_START(cdi_state::cdi910) MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A/2) MCFG_CPU_PROGRAM_MAP(cdi910_mem) @@ -925,7 +925,7 @@ static MACHINE_CONFIG_START( cdi910 ) MACHINE_CONFIG_END // CD-i Mono-I, with CD-ROM image device (MESS) and Software List (MESS) -static MACHINE_CONFIG_DERIVED( cdimono1, cdimono1_base ) +MACHINE_CONFIG_DERIVED(cdi_state::cdimono1, cdimono1_base) MCFG_MACHINE_RESET_OVERRIDE(cdi_state, cdimono1) MCFG_CDROM_ADD( "cdrom" ) @@ -934,7 +934,7 @@ static MACHINE_CONFIG_DERIVED( cdimono1, cdimono1_base ) MCFG_SOFTWARE_LIST_FILTER("cd_list","!DVC") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quizard, cdimono1_base ) +MACHINE_CONFIG_DERIVED(cdi_state::quizard, cdimono1_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(cdimono1_mem) MCFG_CPU_VBLANK_INT_DRIVER("screen", cdi_state, mcu_frame) @@ -951,7 +951,7 @@ static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8, cdi_state ) AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READ(quizard_mcu_p1_r) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( quizard1, quizard ) +MACHINE_CONFIG_DERIVED(cdi_state::quizard1, quizard) MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard1 ) MCFG_CPU_ADD("mcu", I8751, 8000000) @@ -960,15 +960,15 @@ static MACHINE_CONFIG_DERIVED( quizard1, quizard ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quizard2, quizard ) +MACHINE_CONFIG_DERIVED(cdi_state::quizard2, quizard) MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quizard3, quizard ) +MACHINE_CONFIG_DERIVED(cdi_state::quizard3, quizard) MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quizard4, quizard ) +MACHINE_CONFIG_DERIVED(cdi_state::quizard4, quizard) MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard4 ) MCFG_CPU_ADD("mcu", I8751, 8000000) diff --git a/src/mame/drivers/cedar_magnet.cpp b/src/mame/drivers/cedar_magnet.cpp index a9d44f52dd2..88aa2bc115d 100644 --- a/src/mame/drivers/cedar_magnet.cpp +++ b/src/mame/drivers/cedar_magnet.cpp @@ -227,6 +227,7 @@ public: DECLARE_DRIVER_INIT(mag_time); DECLARE_DRIVER_INIT(mag_xain); DECLARE_DRIVER_INIT(mag_exzi); + void cedar_magnet(machine_config &config); }; /*********************** @@ -754,7 +755,7 @@ INTERRUPT_GEN_MEMBER(cedar_magnet_state::irq) m_cedsprite->irq_hold(); } -static MACHINE_CONFIG_START( cedar_magnet ) +MACHINE_CONFIG_START(cedar_magnet_state::cedar_magnet) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */ diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp index 1ce6af9731c..47826c33760 100644 --- a/src/mame/drivers/centiped.cpp +++ b/src/mame/drivers/centiped.cpp @@ -1693,7 +1693,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( centiped_base ) +MACHINE_CONFIG_START(centiped_state::centiped_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 12096000/8) /* 1.512 MHz (slows down to 0.75MHz while accessing playfield RAM) */ @@ -1730,7 +1730,7 @@ static MACHINE_CONFIG_START( centiped_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( centiped, centiped_base ) +MACHINE_CONFIG_DERIVED(centiped_state::centiped, centiped_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(centiped_map) @@ -1747,7 +1747,7 @@ static MACHINE_CONFIG_DERIVED( centiped, centiped_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( caterplr, centiped_base ) +MACHINE_CONFIG_DERIVED(centiped_state::caterplr, centiped_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1765,7 +1765,7 @@ static MACHINE_CONFIG_DERIVED( caterplr, centiped_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( centipdb, centiped_base ) +MACHINE_CONFIG_DERIVED(centiped_state::centipdb, centiped_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1783,7 +1783,7 @@ static MACHINE_CONFIG_DERIVED( centipdb, centiped_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( magworm, centiped_base ) +MACHINE_CONFIG_DERIVED(centiped_state::magworm, centiped_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1802,7 +1802,7 @@ static MACHINE_CONFIG_DERIVED( magworm, centiped_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( milliped, centiped_base ) +MACHINE_CONFIG_DERIVED(centiped_state::milliped, centiped_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1835,7 +1835,7 @@ static MACHINE_CONFIG_DERIVED( milliped, centiped_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( multiped, milliped ) +MACHINE_CONFIG_DERIVED(centiped_state::multiped, milliped) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1846,7 +1846,7 @@ static MACHINE_CONFIG_DERIVED( multiped, milliped ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( warlords, centiped_base ) +MACHINE_CONFIG_DERIVED(centiped_state::warlords, centiped_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1879,7 +1879,7 @@ static MACHINE_CONFIG_DERIVED( warlords, centiped_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mazeinv, milliped ) +MACHINE_CONFIG_DERIVED(centiped_state::mazeinv, milliped) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1893,7 +1893,7 @@ static MACHINE_CONFIG_DERIVED( mazeinv, milliped ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bullsdrt ) +MACHINE_CONFIG_START(centiped_state::bullsdrt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 12096000/8) diff --git a/src/mame/drivers/cesclass.cpp b/src/mame/drivers/cesclass.cpp index 7cb395f0a4d..d8481fae7ae 100644 --- a/src/mame/drivers/cesclass.cpp +++ b/src/mame/drivers/cesclass.cpp @@ -49,6 +49,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_PALETTE_INIT(cesclassic); + void cesclassic(machine_config &config); protected: // devices @@ -247,7 +248,7 @@ PALETTE_INIT_MEMBER(cesclassic_state, cesclassic) palette.set_pen_color(i, pal2bit(i), 0, 0); } -static MACHINE_CONFIG_START( cesclassic ) +MACHINE_CONFIG_START(cesclassic_state::cesclassic) MCFG_CPU_ADD("maincpu", M68000, 24000000/2 ) MCFG_CPU_PROGRAM_MAP(cesclassic_map) diff --git a/src/mame/drivers/cfx9850.cpp b/src/mame/drivers/cfx9850.cpp index f94172d285b..6d044ad4250 100644 --- a/src/mame/drivers/cfx9850.cpp +++ b/src/mame/drivers/cfx9850.cpp @@ -55,6 +55,7 @@ public: DECLARE_PALETTE_INIT(cfx9850); u32 screen_update_cfx9850(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void cfx9850(machine_config &config); protected: required_ioport_array<12> m_ko_port; required_device m_maincpu; @@ -279,7 +280,7 @@ u32 cfx9850_state::screen_update_cfx9850(screen_device &screen, bitmap_ind16 &bi } -static MACHINE_CONFIG_START(cfx9850) +MACHINE_CONFIG_START(cfx9850_state::cfx9850) MCFG_CPU_ADD("maincpu", HCD62121, 4300000) /* X1 - 4.3 MHz */ MCFG_CPU_PROGRAM_MAP(cfx9850) MCFG_HCD62121_KOL_CB(WRITE8(cfx9850_state, kol_w)) diff --git a/src/mame/drivers/cgc7900.cpp b/src/mame/drivers/cgc7900.cpp index a34921eddef..110e90e4798 100644 --- a/src/mame/drivers/cgc7900.cpp +++ b/src/mame/drivers/cgc7900.cpp @@ -476,7 +476,7 @@ void cgc7900_state::machine_reset() MACHINE_DRIVER( cgc7900 ) -------------------------------------------------*/ -static MACHINE_CONFIG_START( cgc7900 ) +MACHINE_CONFIG_START(cgc7900_state::cgc7900) /* basic machine hardware */ MCFG_CPU_ADD(M68000_TAG, M68000, XTAL_28_48MHz/4) MCFG_CPU_PROGRAM_MAP(cgc7900_mem) diff --git a/src/mame/drivers/cgenie.cpp b/src/mame/drivers/cgenie.cpp index b4ebf9798fa..07af26fab26 100644 --- a/src/mame/drivers/cgenie.cpp +++ b/src/mame/drivers/cgenie.cpp @@ -72,6 +72,7 @@ public: DECLARE_WRITE_LINE_MEMBER(rs232_rx_w); DECLARE_WRITE_LINE_MEMBER(rs232_dcd_w); + void cgenie(machine_config &config); protected: virtual void machine_start() override; @@ -433,7 +434,7 @@ const rgb_t cgenie_state::m_palette_nz[] = // MACHINE DEFINTIONS //************************************************************************** -static MACHINE_CONFIG_START( cgenie ) +MACHINE_CONFIG_START(cgenie_state::cgenie) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, XTAL_17_73447MHz / 8) // 2.2168 MHz MCFG_CPU_PROGRAM_MAP(cgenie_mem) diff --git a/src/mame/drivers/chaknpop.cpp b/src/mame/drivers/chaknpop.cpp index 7fe284c834d..2cf00902511 100644 --- a/src/mame/drivers/chaknpop.cpp +++ b/src/mame/drivers/chaknpop.cpp @@ -361,7 +361,7 @@ void chaknpop_state::machine_reset() m_flip_y = 0; } -static MACHINE_CONFIG_START( chaknpop ) +MACHINE_CONFIG_START(chaknpop_state::chaknpop) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz / 6) // Verified on PCB diff --git a/src/mame/drivers/cham24.cpp b/src/mame/drivers/cham24.cpp index a6e938c3de2..0559326ea82 100644 --- a/src/mame/drivers/cham24.cpp +++ b/src/mame/drivers/cham24.cpp @@ -95,6 +95,7 @@ public: uint32_t screen_update_cham24(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void cham24_set_mirroring( int mirroring ); void ppu_irq(int *ppu_regs); + void cham24(machine_config &config); }; @@ -309,7 +310,7 @@ static GFXDECODE_START( cham24 ) /* none, the ppu generates one */ GFXDECODE_END -static MACHINE_CONFIG_START( cham24 ) +MACHINE_CONFIG_START(cham24_state::cham24) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK) MCFG_CPU_PROGRAM_MAP(cham24_map) diff --git a/src/mame/drivers/champbas.cpp b/src/mame/drivers/champbas.cpp index 3e40112eb40..7ee6d373150 100644 --- a/src/mame/drivers/champbas.cpp +++ b/src/mame/drivers/champbas.cpp @@ -509,7 +509,7 @@ INTERRUPT_GEN_MEMBER(champbas_state::vblank_irq) } -static MACHINE_CONFIG_START( talbot ) +MACHINE_CONFIG_START(champbas_state::talbot) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) @@ -556,7 +556,7 @@ static MACHINE_CONFIG_START( talbot ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( champbas ) +MACHINE_CONFIG_START(champbas_state::champbas) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) @@ -606,7 +606,7 @@ static MACHINE_CONFIG_START( champbas ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( champbasj, champbas ) +MACHINE_CONFIG_DERIVED(champbas_state::champbasj, champbas) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -621,21 +621,21 @@ static MACHINE_CONFIG_DERIVED( champbasj, champbas ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( champbasja, champbas ) +MACHINE_CONFIG_DERIVED(champbas_state::champbasja, champbas) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(champbasja_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( champbasjb, champbas ) +MACHINE_CONFIG_DERIVED(champbas_state::champbasjb, champbas) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(champbasjb_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( champbb2, champbasj ) +MACHINE_CONFIG_DERIVED(champbas_state::champbb2, champbasj) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -643,7 +643,7 @@ static MACHINE_CONFIG_DERIVED( champbb2, champbasj ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tbasebal, champbas ) +MACHINE_CONFIG_DERIVED(champbas_state::tbasebal, champbas) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -654,7 +654,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( exctsccr ) +MACHINE_CONFIG_START(champbas_state::exctsccr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6 ) @@ -725,7 +725,7 @@ static MACHINE_CONFIG_START( exctsccr ) MACHINE_CONFIG_END /* Bootleg running on a modified Champion Baseball board */ -static MACHINE_CONFIG_START( exctsccrb ) +MACHINE_CONFIG_START(champbas_state::exctsccrb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) diff --git a/src/mame/drivers/champbwl.cpp b/src/mame/drivers/champbwl.cpp index 94c8e54429f..0188f8ad526 100644 --- a/src/mame/drivers/champbwl.cpp +++ b/src/mame/drivers/champbwl.cpp @@ -198,6 +198,8 @@ public: uint32_t screen_update_doraemon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_champbwl); DECLARE_WRITE_LINE_MEMBER(screen_vblank_doraemon); + void champbwl(machine_config &config); + void doraemon(machine_config &config); }; PALETTE_INIT_MEMBER(champbwl_state,champbwl) @@ -481,7 +483,7 @@ WRITE_LINE_MEMBER(champbwl_state::screen_vblank_champbwl) } -static MACHINE_CONFIG_START( champbwl ) +MACHINE_CONFIG_START(champbwl_state::champbwl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 16000000/4) /* 4MHz */ @@ -546,7 +548,7 @@ MACHINE_START_MEMBER(champbwl_state,doraemon) membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x4000); } -static MACHINE_CONFIG_START( doraemon ) +MACHINE_CONFIG_START(champbwl_state::doraemon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_14_31818MHz/4) diff --git a/src/mame/drivers/chanbara.cpp b/src/mame/drivers/chanbara.cpp index 7a7536f75de..3682db94da4 100644 --- a/src/mame/drivers/chanbara.cpp +++ b/src/mame/drivers/chanbara.cpp @@ -104,6 +104,7 @@ public: DECLARE_PALETTE_INIT(chanbara); uint32_t screen_update_chanbara(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void chanbara(machine_config &config); }; @@ -385,7 +386,7 @@ void chanbara_state::machine_reset() m_scrollhi = 0; } -static MACHINE_CONFIG_START( chanbara ) +MACHINE_CONFIG_START(chanbara_state::chanbara) MCFG_CPU_ADD("maincpu", M6809, XTAL_12MHz/8) MCFG_CPU_PROGRAM_MAP(chanbara_map) diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp index 6da824a83b1..645133e0e77 100644 --- a/src/mame/drivers/chance32.cpp +++ b/src/mame/drivers/chance32.cpp @@ -69,6 +69,7 @@ public: uint32_t screen_update_chance32(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void chance32(machine_config &config); }; @@ -444,7 +445,7 @@ void chance32_state::machine_reset() } -static MACHINE_CONFIG_START( chance32 ) +MACHINE_CONFIG_START(chance32_state::chance32) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/2) diff --git a/src/mame/drivers/changela.cpp b/src/mame/drivers/changela.cpp index 6ea7203b6ce..d15a8431c58 100644 --- a/src/mame/drivers/changela.cpp +++ b/src/mame/drivers/changela.cpp @@ -415,7 +415,7 @@ void changela_state::machine_reset() m_dir_31 = 0; } -static MACHINE_CONFIG_START( changela ) +MACHINE_CONFIG_START(changela_state::changela) MCFG_CPU_ADD("maincpu", Z80,5000000) MCFG_CPU_PROGRAM_MAP(changela_map) diff --git a/src/mame/drivers/channelf.cpp b/src/mame/drivers/channelf.cpp index b7c35635bce..e6450caeae0 100644 --- a/src/mame/drivers/channelf.cpp +++ b/src/mame/drivers/channelf.cpp @@ -199,7 +199,7 @@ static SLOT_INTERFACE_START(cf_cart) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( channelf_cart ) +MACHINE_CONFIG_START(channelf_state::channelf_cart) /* cartridge */ MCFG_CHANNELF_CARTRIDGE_ADD("cartslot", cf_cart, nullptr) @@ -207,7 +207,7 @@ static MACHINE_CONFIG_START( channelf_cart ) MCFG_SOFTWARE_LIST_ADD("cart_list","channelf") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( channelf ) +MACHINE_CONFIG_START(channelf_state::channelf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", F8, 3579545/2) /* Colorburst/2 */ MCFG_CPU_PROGRAM_MAP(channelf_map) @@ -234,7 +234,7 @@ static MACHINE_CONFIG_START( channelf ) MCFG_FRAGMENT_ADD( channelf_cart ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sabavdpl ) +MACHINE_CONFIG_START(channelf_state::sabavdpl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", F8, MASTER_CLOCK_PAL) /* PAL speed */ MCFG_CPU_PROGRAM_MAP(channelf_map) @@ -262,7 +262,7 @@ static MACHINE_CONFIG_START( sabavdpl ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( channlf2 ) +MACHINE_CONFIG_START(channelf_state::channlf2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", F8, 3579545/2) /* Colorburst / 2 */ MCFG_CPU_PROGRAM_MAP(channelf_map) @@ -290,7 +290,7 @@ static MACHINE_CONFIG_START( channlf2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sabavpl2 ) +MACHINE_CONFIG_START(channelf_state::sabavpl2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", F8, MASTER_CLOCK_PAL) /* PAL speed */ MCFG_CPU_PROGRAM_MAP(channelf_map) diff --git a/src/mame/drivers/chaos.cpp b/src/mame/drivers/chaos.cpp index 72a19e5558f..6813fbe64c9 100644 --- a/src/mame/drivers/chaos.cpp +++ b/src/mame/drivers/chaos.cpp @@ -51,6 +51,7 @@ public: DECLARE_READ8_MEMBER(port90_r); DECLARE_READ8_MEMBER(port91_r); void kbd_put(u8 data); + void chaos(machine_config &config); private: uint8_t m_term_data; virtual void machine_reset() override; @@ -141,7 +142,7 @@ void chaos_state::machine_reset() memcpy(m_p_ram+0x7000, ROM+0x3000, 0x1000); } -static MACHINE_CONFIG_START( chaos ) +MACHINE_CONFIG_START(chaos_state::chaos) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, XTAL_1MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/cheekyms.cpp b/src/mame/drivers/cheekyms.cpp index cefe0b8e02e..db61352b75a 100644 --- a/src/mame/drivers/cheekyms.cpp +++ b/src/mame/drivers/cheekyms.cpp @@ -119,7 +119,7 @@ INTERRUPT_GEN_MEMBER(cheekyms_state::vblank_irq) } -static MACHINE_CONFIG_START( cheekyms ) +MACHINE_CONFIG_START(cheekyms_state::cheekyms) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,5000000/2) /* 2.5 MHz */ diff --git a/src/mame/drivers/chessmst.cpp b/src/mame/drivers/chessmst.cpp index 6dddf2ce6e6..5c84b7e1069 100644 --- a/src/mame/drivers/chessmst.cpp +++ b/src/mame/drivers/chessmst.cpp @@ -65,6 +65,9 @@ public: DECLARE_INPUT_CHANGED_MEMBER(view_monitor_button); DECLARE_WRITE_LINE_MEMBER( timer_555_w ); + void chessmst(machine_config &config); + void chessmsta(machine_config &config); + void chessmstdm(machine_config &config); private: void update_display(); }; @@ -353,7 +356,7 @@ static const z80_daisy_config chessmstdm_daisy_chain[] = { nullptr } }; -static MACHINE_CONFIG_START( chessmst ) +MACHINE_CONFIG_START(chessmst_state::chessmst) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_9_8304MHz/4) // U880 Z80 clone @@ -378,7 +381,7 @@ static MACHINE_CONFIG_START( chessmst ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( chessmsta ) +MACHINE_CONFIG_START(chessmst_state::chessmsta) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/4) // U880 Z80 clone @@ -403,7 +406,7 @@ static MACHINE_CONFIG_START( chessmsta ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( chessmstdm ) +MACHINE_CONFIG_START(chessmst_state::chessmstdm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) // U880 Z80 clone diff --git a/src/mame/drivers/chesstrv.cpp b/src/mame/drivers/chesstrv.cpp index 29bfdcab7e6..26e8fe42307 100644 --- a/src/mame/drivers/chesstrv.cpp +++ b/src/mame/drivers/chesstrv.cpp @@ -40,6 +40,8 @@ public: uint8_t m_matrix; //TIMER_DEVICE_CALLBACK_MEMBER(borisdpl_timer_interrupt); required_device m_maincpu; + void chesstrv(machine_config &config); + void borisdpl(machine_config &config); }; WRITE8_MEMBER( chesstrv_state::ram_addr_w ) @@ -214,7 +216,7 @@ void chesstrv_state::machine_start() save_item(NAME(m_matrix)); } -static MACHINE_CONFIG_START( chesstrv ) +MACHINE_CONFIG_START(chesstrv_state::chesstrv) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", F8, 3000000 ) // Fairchild 3870 MCFG_CPU_PROGRAM_MAP( chesstrv_mem ) @@ -224,7 +226,7 @@ static MACHINE_CONFIG_START( chesstrv ) MCFG_DEFAULT_LAYOUT( layout_chesstrv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( borisdpl ) +MACHINE_CONFIG_START(chesstrv_state::borisdpl) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", F8, 30000000 ) // Motorola SC80265P MCFG_CPU_PROGRAM_MAP( chesstrv_mem ) diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp index f5c9db7c603..67a742a27dc 100644 --- a/src/mame/drivers/chexx.cpp +++ b/src/mame/drivers/chexx.cpp @@ -79,6 +79,8 @@ public: // driver_device overrides virtual void machine_start() override; virtual void machine_reset() override; + void faceoffh(machine_config &config); + void chexx83(machine_config &config); }; @@ -313,7 +315,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(chexx_state::update) #endif } -static MACHINE_CONFIG_START( chexx83 ) +MACHINE_CONFIG_START(chexx_state::chexx83) // basic machine hardware MCFG_CPU_ADD("maincpu", M6502, MAIN_CLOCK/2) @@ -343,7 +345,7 @@ static MACHINE_CONFIG_START( chexx83 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( faceoffh, chexx83 ) +MACHINE_CONFIG_DERIVED(chexx_state::faceoffh, chexx83) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(faceoffh_map) diff --git a/src/mame/drivers/chicago.cpp b/src/mame/drivers/chicago.cpp index fca5cae62f2..003c7899b0b 100644 --- a/src/mame/drivers/chicago.cpp +++ b/src/mame/drivers/chicago.cpp @@ -53,6 +53,7 @@ public: required_device m_maincpu; required_device m_video; + void chicago(machine_config &config); protected: // driver_device overrides @@ -93,7 +94,7 @@ void chicago_state::video_start() { } -static MACHINE_CONFIG_START( chicago ) +MACHINE_CONFIG_START(chicago_state::chicago) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp index 43c37b64238..e1a34c35533 100644 --- a/src/mame/drivers/chihiro.cpp +++ b/src/mame/drivers/chihiro.cpp @@ -589,6 +589,10 @@ public: uint8_t *dimm_board_memory; uint32_t dimm_board_memory_size; + static void an2131qc_configuration(device_t *device); + static void an2131sc_configuration(device_t *device); + void chihirogd(machine_config &config); + void chihiro_base(machine_config &config); private: void jamtable_disasm(address_space &space, uint32_t address, uint32_t size); void jamtable_disasm_command(int ref, const std::vector ¶ms); @@ -1829,15 +1833,17 @@ SLOT_INTERFACE_START(usb_baseboard) SLOT_INTERFACE("xbox_controller", OHCI_GAME_CONTROLLER) SLOT_INTERFACE_END -static MACHINE_CONFIG_START(an2131qc_configuration) +void chihiro_state::an2131qc_configuration(device_t *device) +{ MCFG_OHCI_HLEAN2131QC_REGION(":others", 0) -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_START(an2131sc_configuration) +void chihiro_state::an2131sc_configuration(device_t *device) +{ MCFG_OHCI_HLEAN2131SC_REGION(":others", 0x2080) -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_DERIVED(chihiro_base, xbox_base) +MACHINE_CONFIG_DERIVED(chihiro_state::chihiro_base, xbox_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(chihiro_map) MCFG_CPU_IO_MAP(chihiro_map_io) @@ -1859,7 +1865,7 @@ static MACHINE_CONFIG_DERIVED(chihiro_base, xbox_base) MCFG_SEGA_837_13551_DEVICE_ADD("837_13551", "jvs_master", ":TILT", ":P1", ":P2", ":A0", ":A1", ":A2", ":A3", ":A4", ":A5", ":A6", ":A7", ":OUTPUT") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(chihirogd, chihiro_base) +MACHINE_CONFIG_DERIVED(chihiro_state::chihirogd, chihiro_base) MCFG_NAOMI_GDROM_BOARD_ADD("rom_board", ":gdrom", "^pic", nullptr, NOOP) MCFG_DEVICE_ADD("network", SEGA_NETWORK_BOARD, 0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp index 03d5ee93858..b1d8540b603 100644 --- a/src/mame/drivers/chinagat.cpp +++ b/src/mame/drivers/chinagat.cpp @@ -111,6 +111,9 @@ public: DECLARE_READ_LINE_MEMBER(saiyugoub1_m5205_irq_r); DECLARE_WRITE_LINE_MEMBER(saiyugoub1_m5205_irq_w); optional_device m_adpcm; + void saiyugoub2(machine_config &config); + void saiyugoub1(machine_config &config); + void chinagat(machine_config &config); }; @@ -542,7 +545,7 @@ MACHINE_RESET_MEMBER(chinagat_state,chinagat) } -static MACHINE_CONFIG_START( chinagat ) +MACHINE_CONFIG_START(chinagat_state::chinagat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK / 2) /* 1.5 MHz (12MHz oscillator / 4 internally) */ @@ -587,7 +590,7 @@ static MACHINE_CONFIG_START( chinagat ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( saiyugoub1 ) +MACHINE_CONFIG_START(chinagat_state::saiyugoub1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CLOCK / 8) /* 68B09EP 1.5 MHz (12MHz oscillator) */ @@ -643,7 +646,7 @@ static MACHINE_CONFIG_START( saiyugoub1 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( saiyugoub2 ) +MACHINE_CONFIG_START(chinagat_state::saiyugoub2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CLOCK / 8) /* 1.5 MHz (12MHz oscillator) */ diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp index a7570fc479c..72cbfaa810e 100644 --- a/src/mame/drivers/chinsan.cpp +++ b/src/mame/drivers/chinsan.cpp @@ -66,6 +66,8 @@ public: DECLARE_WRITE8_MEMBER(ctrl_w); DECLARE_DRIVER_INIT(chinsan); + void chinsan(machine_config &config); + void mayumi(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -495,7 +497,7 @@ DRIVER_INIT_MEMBER( chinsan_state, chinsan ) //************************************************************************** // C1-00114-B -static MACHINE_CONFIG_START( chinsan ) +MACHINE_CONFIG_START(chinsan_state::chinsan) MCFG_CPU_ADD("maincpu", MC8123, XTAL_10MHz/2) // 317-5012 MCFG_CPU_PROGRAM_MAP(chinsan_map) MCFG_CPU_IO_MAP(chinsan_io_map) @@ -538,7 +540,7 @@ static MACHINE_CONFIG_START( chinsan ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mayumi, chinsan ) +MACHINE_CONFIG_DERIVED(chinsan_state::mayumi, chinsan) // standard Z80 instead of MC-8123 MCFG_DEVICE_REMOVE("maincpu") MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/2) diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp index d9e529e7136..101cb114ff8 100644 --- a/src/mame/drivers/chqflag.cpp +++ b/src/mame/drivers/chqflag.cpp @@ -325,7 +325,7 @@ WRITE_LINE_MEMBER(chqflag_state::background_brt_w) } } -static MACHINE_CONFIG_START( chqflag ) +MACHINE_CONFIG_START(chqflag_state::chqflag) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 (verified on pcb) */ diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp index 6934ba074fd..b4cb173d742 100644 --- a/src/mame/drivers/chsuper.cpp +++ b/src/mame/drivers/chsuper.cpp @@ -55,6 +55,7 @@ public: required_device m_palette; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void chsuper(machine_config &config); protected: // driver_device overrides //virtual void machine_start(); @@ -351,7 +352,7 @@ ADDRESS_MAP_END * Machine Drivers * ***************************/ -static MACHINE_CONFIG_START( chsuper ) +MACHINE_CONFIG_START(chsuper_state::chsuper) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 4) /* HD64180RP8, 8 MHz? */ diff --git a/src/mame/drivers/cidelsa.cpp b/src/mame/drivers/cidelsa.cpp index 7c696cf59b9..d41c0579f13 100644 --- a/src/mame/drivers/cidelsa.cpp +++ b/src/mame/drivers/cidelsa.cpp @@ -389,7 +389,7 @@ void cidelsa_state::machine_reset() /* Machine Drivers */ -static MACHINE_CONFIG_START( destryer ) +MACHINE_CONFIG_START(cidelsa_state::destryer) /* basic system hardware */ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, DESTRYER_CHR1) MCFG_CPU_PROGRAM_MAP(destryer_map) @@ -404,7 +404,7 @@ static MACHINE_CONFIG_START( destryer ) MCFG_FRAGMENT_ADD(destryer_video) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( destryera ) +MACHINE_CONFIG_START(cidelsa_state::destryera) /* basic system hardware */ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, DESTRYER_CHR1) MCFG_CPU_PROGRAM_MAP(destryera_map) @@ -419,7 +419,7 @@ static MACHINE_CONFIG_START( destryera ) MCFG_FRAGMENT_ADD(destryer_video) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( altair ) +MACHINE_CONFIG_START(cidelsa_state::altair) /* basic system hardware */ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, ALTAIR_CHR1) MCFG_CPU_PROGRAM_MAP(altair_map) @@ -448,7 +448,7 @@ static MACHINE_CONFIG_START( altair ) MCFG_FRAGMENT_ADD(altair_video) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( draco ) +MACHINE_CONFIG_START(draco_state::draco) /* basic system hardware */ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, DRACO_CHR1) MCFG_CPU_PROGRAM_MAP(draco_map) diff --git a/src/mame/drivers/cinemat.cpp b/src/mame/drivers/cinemat.cpp index 364e38b3533..59a1175bc43 100644 --- a/src/mame/drivers/cinemat.cpp +++ b/src/mame/drivers/cinemat.cpp @@ -962,11 +962,11 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( cinemat_nojmi_4k ) +MACHINE_CONFIG_START(cinemat_state::cinemat_nojmi_4k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", CCPU, MASTER_CLOCK/4) - MCFG_CCPU_VECTOR_FUNC(ccpu_cpu_device::vector_delegate(FUNC(cinemat_state::cinemat_vector_callback),(cinemat_state*)owner)) + MCFG_CCPU_VECTOR_FUNC(ccpu_cpu_device::vector_delegate(FUNC(cinemat_state::cinemat_vector_callback), this)) MCFG_CCPU_EXTERNAL_FUNC(READ8(cinemat_state,joystick_read)) MCFG_CPU_PROGRAM_MAP(program_map_4k) MCFG_CPU_DATA_MAP(data_map) @@ -987,32 +987,32 @@ static MACHINE_CONFIG_START( cinemat_nojmi_4k ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cinemat_jmi_4k, cinemat_nojmi_4k ) +MACHINE_CONFIG_DERIVED(cinemat_state::cinemat_jmi_4k, cinemat_nojmi_4k) MCFG_CPU_MODIFY("maincpu") - MCFG_CCPU_VECTOR_FUNC(ccpu_cpu_device::vector_delegate(FUNC(cinemat_state::cinemat_vector_callback),(cinemat_state*)owner)) + MCFG_CCPU_VECTOR_FUNC(ccpu_cpu_device::vector_delegate(FUNC(cinemat_state::cinemat_vector_callback), this)) MCFG_CCPU_EXTERNAL_FUNC(DEVREAD8("maincpu",ccpu_cpu_device,read_jmi)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cinemat_nojmi_8k, cinemat_nojmi_4k ) +MACHINE_CONFIG_DERIVED(cinemat_state::cinemat_nojmi_8k, cinemat_nojmi_4k) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(program_map_8k) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cinemat_jmi_8k, cinemat_jmi_4k ) +MACHINE_CONFIG_DERIVED(cinemat_state::cinemat_jmi_8k, cinemat_jmi_4k) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(program_map_8k) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cinemat_jmi_16k, cinemat_jmi_4k ) +MACHINE_CONFIG_DERIVED(cinemat_state::cinemat_jmi_16k, cinemat_jmi_4k) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(program_map_16k) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cinemat_jmi_32k, cinemat_jmi_4k ) +MACHINE_CONFIG_DERIVED(cinemat_state::cinemat_jmi_32k, cinemat_jmi_4k) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(program_map_32k) MACHINE_CONFIG_END @@ -1026,35 +1026,35 @@ MACHINE_CONFIG_END * *************************************/ -static MACHINE_CONFIG_DERIVED( spacewar, cinemat_nojmi_4k ) +MACHINE_CONFIG_DERIVED(cinemat_state::spacewar, cinemat_nojmi_4k) MCFG_FRAGMENT_ADD(spacewar_sound) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(cinemat_state, screen_update_spacewar) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( barrier, cinemat_jmi_4k ) +MACHINE_CONFIG_DERIVED(cinemat_state::barrier, cinemat_jmi_4k) MCFG_FRAGMENT_ADD(barrier_sound) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( speedfrk, cinemat_nojmi_8k ) +MACHINE_CONFIG_DERIVED(cinemat_state::speedfrk, cinemat_nojmi_8k) MCFG_FRAGMENT_ADD(speedfrk_sound) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( starhawk, cinemat_jmi_4k ) +MACHINE_CONFIG_DERIVED(cinemat_state::starhawk, cinemat_jmi_4k) MCFG_FRAGMENT_ADD(starhawk_sound) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sundance, cinemat_jmi_8k ) +MACHINE_CONFIG_DERIVED(cinemat_state::sundance, cinemat_jmi_8k) MCFG_FRAGMENT_ADD(sundance_sound) MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_16level) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tailg, cinemat_nojmi_8k ) +MACHINE_CONFIG_DERIVED(cinemat_state::tailg, cinemat_nojmi_8k) MCFG_FRAGMENT_ADD(tailg_sound) MCFG_DEVICE_MODIFY("outlatch") @@ -1062,33 +1062,33 @@ static MACHINE_CONFIG_DERIVED( tailg, cinemat_nojmi_8k ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( warrior, cinemat_jmi_8k ) +MACHINE_CONFIG_DERIVED(cinemat_state::warrior, cinemat_jmi_8k) MCFG_FRAGMENT_ADD(warrior_sound) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( armora, cinemat_jmi_16k ) +MACHINE_CONFIG_DERIVED(cinemat_state::armora, cinemat_jmi_16k) MCFG_FRAGMENT_ADD(armora_sound) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ripoff, cinemat_jmi_8k ) +MACHINE_CONFIG_DERIVED(cinemat_state::ripoff, cinemat_jmi_8k) MCFG_FRAGMENT_ADD(ripoff_sound) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( starcas, cinemat_jmi_8k ) +MACHINE_CONFIG_DERIVED(cinemat_state::starcas, cinemat_jmi_8k) MCFG_FRAGMENT_ADD(starcas_sound) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( solarq, cinemat_jmi_16k ) +MACHINE_CONFIG_DERIVED(cinemat_state::solarq, cinemat_jmi_16k) MCFG_FRAGMENT_ADD(solarq_sound) MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_64level) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( boxingb, cinemat_jmi_32k ) +MACHINE_CONFIG_DERIVED(cinemat_state::boxingb, cinemat_jmi_32k) MCFG_FRAGMENT_ADD(boxingb_sound) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 1024, 0, 788) @@ -1099,27 +1099,27 @@ static MACHINE_CONFIG_DERIVED( boxingb, cinemat_jmi_32k ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wotw, cinemat_jmi_16k ) +MACHINE_CONFIG_DERIVED(cinemat_state::wotw, cinemat_jmi_16k) 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 ) +MACHINE_CONFIG_DERIVED(cinemat_state::wotwc, cinemat_jmi_16k) MCFG_FRAGMENT_ADD(wotw_sound) MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_color) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( demon, cinemat_jmi_16k ) +MACHINE_CONFIG_DERIVED(cinemat_state::demon, cinemat_jmi_16k) 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 ) +MACHINE_CONFIG_DERIVED(cinemat_state::qb3, cinemat_jmi_32k) MCFG_FRAGMENT_ADD(qb3_sound) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_DATA_MAP(data_map_qb3) diff --git a/src/mame/drivers/circus.cpp b/src/mame/drivers/circus.cpp index 10f3399e1ec..50c86a1a617 100644 --- a/src/mame/drivers/circus.cpp +++ b/src/mame/drivers/circus.cpp @@ -282,7 +282,7 @@ void circus_state::machine_reset() } -static MACHINE_CONFIG_START( circus ) +MACHINE_CONFIG_START(circus_state::circus) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */ @@ -317,7 +317,7 @@ static MACHINE_CONFIG_START( circus ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( robotbwl ) +MACHINE_CONFIG_START(circus_state::robotbwl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */ @@ -359,7 +359,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(circus_state::crash_scanline) m_maincpu->set_input_line(0, ASSERT_LINE); } -static MACHINE_CONFIG_START( crash ) +MACHINE_CONFIG_START(circus_state::crash) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */ @@ -393,7 +393,7 @@ static MACHINE_CONFIG_START( crash ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ripcord ) +MACHINE_CONFIG_START(circus_state::ripcord) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */ diff --git a/src/mame/drivers/circusc.cpp b/src/mame/drivers/circusc.cpp index d5e1d708811..4a5dd0f480c 100644 --- a/src/mame/drivers/circusc.cpp +++ b/src/mame/drivers/circusc.cpp @@ -341,7 +341,7 @@ INTERRUPT_GEN_MEMBER(circusc_state::vblank_irq) device.execute().set_input_line(M6809_IRQ_LINE, ASSERT_LINE); } -static MACHINE_CONFIG_START( circusc ) +MACHINE_CONFIG_START(circusc_state::circusc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI1, 2048000) /* 2 MHz? */ diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp index 392a8c397e7..67383cefe5d 100644 --- a/src/mame/drivers/cischeat.cpp +++ b/src/mame/drivers/cischeat.cpp @@ -1909,7 +1909,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::bigrun_scanline) -static MACHINE_CONFIG_START( bigrun ) +MACHINE_CONFIG_START(cischeat_state::bigrun) /* basic machine hardware */ MCFG_CPU_ADD("cpu1", M68000, 10000000) @@ -1969,7 +1969,7 @@ static MACHINE_CONFIG_START( bigrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cischeat, bigrun ) +MACHINE_CONFIG_DERIVED(cischeat_state::cischeat, bigrun) /* basic machine hardware */ MCFG_CPU_MODIFY("cpu1") @@ -2006,7 +2006,7 @@ static MACHINE_CONFIG_DERIVED( cischeat, bigrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( f1gpstar, bigrun ) +MACHINE_CONFIG_DERIVED(cischeat_state::f1gpstar, bigrun) /* basic machine hardware */ MCFG_CPU_MODIFY("cpu1") @@ -2042,7 +2042,7 @@ static MACHINE_CONFIG_DERIVED( f1gpstar, bigrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( f1gpstr2, f1gpstar ) +MACHINE_CONFIG_DERIVED(cischeat_state::f1gpstr2, f1gpstar) /* basic machine hardware */ @@ -2059,7 +2059,7 @@ static MACHINE_CONFIG_DERIVED( f1gpstr2, f1gpstar ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wildplt, f1gpstr2 ) +MACHINE_CONFIG_DERIVED(cischeat_state::wildplt, f1gpstr2) MCFG_CPU_MODIFY("cpu1") MCFG_CPU_PROGRAM_MAP(wildplt_map) MACHINE_CONFIG_END @@ -2087,7 +2087,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::scudhamm_scanline) m_maincpu->set_input_line(2, HOLD_LINE); } -static MACHINE_CONFIG_START( scudhamm ) +MACHINE_CONFIG_START(cischeat_state::scudhamm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000, 12000000) @@ -2142,7 +2142,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::armchamp2_scanline) m_maincpu->set_input_line(4, HOLD_LINE); } -static MACHINE_CONFIG_DERIVED( armchmp2, scudhamm ) +MACHINE_CONFIG_DERIVED(cischeat_state::armchmp2, scudhamm) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2174,7 +2174,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::captflag_scanline) m_maincpu->set_input_line(3, HOLD_LINE); } -static MACHINE_CONFIG_START( captflag ) +MACHINE_CONFIG_START(cischeat_state::captflag) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000, XTAL_24MHz / 2) // TMP68000P-12 diff --git a/src/mame/drivers/cit220.cpp b/src/mame/drivers/cit220.cpp index d66004fd350..11db323e73a 100644 --- a/src/mame/drivers/cit220.cpp +++ b/src/mame/drivers/cit220.cpp @@ -30,6 +30,7 @@ public: DECLARE_WRITE_LINE_MEMBER(sod_w); SCN2674_DRAW_CHARACTER_MEMBER(draw_character); + void cit220p(machine_config &config); private: required_device m_maincpu; required_device m_screen; @@ -72,7 +73,7 @@ static INPUT_PORTS_START( cit220p ) INPUT_PORTS_END -static MACHINE_CONFIG_START( cit220p ) +MACHINE_CONFIG_START(cit220_state::cit220p) MCFG_CPU_ADD("maincpu", I8085A, 6000000) MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/citycon.cpp b/src/mame/drivers/citycon.cpp index c82564645b6..08470f685a2 100644 --- a/src/mame/drivers/citycon.cpp +++ b/src/mame/drivers/citycon.cpp @@ -186,7 +186,7 @@ void citycon_state::machine_reset() } -static MACHINE_CONFIG_START( citycon ) +MACHINE_CONFIG_START(citycon_state::citycon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_8MHz) // HD68B09P diff --git a/src/mame/drivers/ckz80.cpp b/src/mame/drivers/ckz80.cpp index e47218899f7..22ef28b4daa 100644 --- a/src/mame/drivers/ckz80.cpp +++ b/src/mame/drivers/ckz80.cpp @@ -94,6 +94,7 @@ public: DECLARE_READ8_MEMBER(master_trampoline_r); DECLARE_WRITE8_MEMBER(master_trampoline_w); + void master(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -426,7 +427,7 @@ INPUT_PORTS_END Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( master ) +MACHINE_CONFIG_START(ckz80_state::master) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) diff --git a/src/mame/drivers/clayshoo.cpp b/src/mame/drivers/clayshoo.cpp index 5f09b1921ae..0e897121209 100644 --- a/src/mame/drivers/clayshoo.cpp +++ b/src/mame/drivers/clayshoo.cpp @@ -49,6 +49,7 @@ public: uint8_t difficulty_input_port_r( int bit ); void create_analog_timers( ); required_device m_maincpu; + void clayshoo(machine_config &config); }; @@ -310,7 +311,7 @@ void clayshoo_state::machine_reset() m_analog_port_val = 0; } -static MACHINE_CONFIG_START( clayshoo ) +MACHINE_CONFIG_START(clayshoo_state::clayshoo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,5068000/4) /* 5.068/4 Mhz (divider is a guess) */ diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp index 207da3b035e..682f4cfdb53 100644 --- a/src/mame/drivers/clcd.cpp +++ b/src/mame/drivers/clcd.cpp @@ -551,6 +551,7 @@ public: void nvram_init(nvram_device &nvram, void *data, size_t size); + void clcd(machine_config &config); private: required_device m_maincpu; required_device m_acia; @@ -734,7 +735,7 @@ static INPUT_PORTS_START( clcd ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // clears screen and goes into infinite loop INPUT_PORTS_END -static MACHINE_CONFIG_START(clcd) +MACHINE_CONFIG_START(clcd_state::clcd) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65C02, 2000000) MCFG_CPU_PROGRAM_MAP(clcd_mem) diff --git a/src/mame/drivers/cliffhgr.cpp b/src/mame/drivers/cliffhgr.cpp index c61458986f5..28c4544bb5e 100644 --- a/src/mame/drivers/cliffhgr.cpp +++ b/src/mame/drivers/cliffhgr.cpp @@ -124,6 +124,7 @@ public: required_device m_maincpu; required_device m_discrete; required_device m_screen; + void cliffhgr(machine_config &config); }; @@ -674,7 +675,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( cliffhgr ) +MACHINE_CONFIG_START(cliffhgr_state::cliffhgr) MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4MHz */ MCFG_CPU_PROGRAM_MAP(mainmem) diff --git a/src/mame/drivers/cloak.cpp b/src/mame/drivers/cloak.cpp index 71ead7ea5dc..dcf8528f039 100644 --- a/src/mame/drivers/cloak.cpp +++ b/src/mame/drivers/cloak.cpp @@ -321,7 +321,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( cloak ) +MACHINE_CONFIG_START(cloak_state::cloak) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */ diff --git a/src/mame/drivers/cloud9.cpp b/src/mame/drivers/cloud9.cpp index b0dff16b242..34634cd354a 100644 --- a/src/mame/drivers/cloud9.cpp +++ b/src/mame/drivers/cloud9.cpp @@ -415,7 +415,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( cloud9 ) +MACHINE_CONFIG_START(cloud9_state::cloud9) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) diff --git a/src/mame/drivers/clowndwn.cpp b/src/mame/drivers/clowndwn.cpp index 391a8059da2..b783f331bf8 100644 --- a/src/mame/drivers/clowndwn.cpp +++ b/src/mame/drivers/clowndwn.cpp @@ -27,6 +27,7 @@ public: virtual void machine_reset() override; required_device m_maincpu; + void clowndwn(machine_config &config); }; static ADDRESS_MAP_START(clowndwn_map, AS_PROGRAM, 8, clowndwn_state) @@ -53,7 +54,7 @@ void clowndwn_state::machine_reset() } -static MACHINE_CONFIG_START( clowndwn ) +MACHINE_CONFIG_START(clowndwn_state::clowndwn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6802, 8000000) // unknown type and clock diff --git a/src/mame/drivers/clpoker.cpp b/src/mame/drivers/clpoker.cpp index 2a9410d4f58..faba6636d69 100644 --- a/src/mame/drivers/clpoker.cpp +++ b/src/mame/drivers/clpoker.cpp @@ -57,6 +57,7 @@ public: u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void clpoker(machine_config &config); protected: virtual void video_start() override; @@ -246,7 +247,7 @@ static GFXDECODE_START( clpoker ) GFXDECODE_END -static MACHINE_CONFIG_START( clpoker ) +MACHINE_CONFIG_START(clpoker_state::clpoker) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 3) // Z0840004PSC, divider not verified MCFG_CPU_PROGRAM_MAP(prg_map) diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp index 6dda2467f64..f6527b6376b 100644 --- a/src/mame/drivers/clshroad.cpp +++ b/src/mame/drivers/clshroad.cpp @@ -270,7 +270,7 @@ INTERRUPT_GEN_MEMBER(clshroad_state::sound_timer_irq) device.execute().set_input_line(0, HOLD_LINE); } -static MACHINE_CONFIG_START( firebatl ) +MACHINE_CONFIG_START(clshroad_state::firebatl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK) /* ? */ @@ -310,7 +310,7 @@ static MACHINE_CONFIG_START( firebatl ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( clshroad ) +MACHINE_CONFIG_START(clshroad_state::clshroad) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK) /* ? real speed unknown. 3MHz is too low and causes problems */ diff --git a/src/mame/drivers/cm1800.cpp b/src/mame/drivers/cm1800.cpp index b4d294bccdd..92048709bf3 100644 --- a/src/mame/drivers/cm1800.cpp +++ b/src/mame/drivers/cm1800.cpp @@ -52,6 +52,7 @@ public: DECLARE_READ8_MEMBER(port01_r); DECLARE_WRITE8_MEMBER(port00_w); + void cm1800(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -107,7 +108,7 @@ void cm1800_state::machine_reset() m_uart->set_input_pin(AY31015_CS, 0); } -static MACHINE_CONFIG_START( cm1800 ) +MACHINE_CONFIG_START(cm1800_state::cm1800) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_2MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp index d31db94ca49..6ea086ccb41 100644 --- a/src/mame/drivers/cmi.cpp +++ b/src/mame/drivers/cmi.cpp @@ -310,7 +310,7 @@ cmi01a_device::cmi01a_device(const machine_config &mconfig, const char *tag, dev { } -MACHINE_CONFIG_MEMBER( cmi01a_device::device_add_mconfig ) +MACHINE_CONFIG_START(cmi01a_device::device_add_mconfig) MCFG_DEVICE_ADD("cmi01a_pia_0", PIA6821, 0) // pia_cmi01a_1_config MCFG_PIA_READCB1_HANDLER(READLINE(cmi01a_device, tri_r)) MCFG_PIA_WRITEPA_HANDLER(WRITE8(cmi01a_device, ws_dir_w)) @@ -557,6 +557,7 @@ public: DECLARE_WRITE_LINE_MEMBER( cmi07_irq ); DECLARE_WRITE_LINE_MEMBER( mkbd_acia_clock ); + void cmi2x(machine_config &config); protected: required_device m_maincpu1; @@ -2742,7 +2743,7 @@ static SLOT_INTERFACE_START( cmi2x_floppies ) SLOT_INTERFACE( "8dssd", FLOPPY_8_DSSD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( cmi2x ) +MACHINE_CONFIG_START(cmi_state::cmi2x) MCFG_CPU_ADD("maincpu1", MC6809E, Q209_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(maincpu1_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cmi_state, cmi_iix_vblank) diff --git a/src/mame/drivers/cmmb.cpp b/src/mame/drivers/cmmb.cpp index e5a4b32074c..24c9df6d7d3 100644 --- a/src/mame/drivers/cmmb.cpp +++ b/src/mame/drivers/cmmb.cpp @@ -85,6 +85,7 @@ public: virtual void video_start() override; uint32_t screen_update_cmmb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); + void cmmb(machine_config &config); }; @@ -381,7 +382,7 @@ void cmmb_state::machine_reset() } -static MACHINE_CONFIG_START( cmmb ) +MACHINE_CONFIG_START(cmmb_state::cmmb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65SC02, MAIN_CLOCK/5) // Unknown clock, but chip rated for 14MHz diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp index 2a5b9608726..2dae128fa05 100644 --- a/src/mame/drivers/cninja.cpp +++ b/src/mame/drivers/cninja.cpp @@ -810,7 +810,7 @@ DECOSPR_PRIORITY_CB_MEMBER(cninja_state::pri_callback) } -static MACHINE_CONFIG_START( cninja ) +MACHINE_CONFIG_START(cninja_state::cninja) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) @@ -898,7 +898,7 @@ static MACHINE_CONFIG_START( cninja ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( stoneage ) +MACHINE_CONFIG_START(cninja_state::stoneage) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) @@ -980,7 +980,7 @@ static MACHINE_CONFIG_START( stoneage ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cninjabl2, stoneage ) +MACHINE_CONFIG_DERIVED(cninja_state::cninjabl2, stoneage) MCFG_CPU_MODIFY("audiocpu") MCFG_CPU_PROGRAM_MAP(cninjabl2_s_map) @@ -997,7 +997,7 @@ static MACHINE_CONFIG_DERIVED( cninjabl2, stoneage ) MCFG_DEVICE_ADDRESS_MAP(0, cninjabl2_oki_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cninjabl ) +MACHINE_CONFIG_START(cninja_state::cninjabl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) @@ -1069,7 +1069,7 @@ static MACHINE_CONFIG_START( cninjabl ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( edrandy ) +MACHINE_CONFIG_START(cninja_state::edrandy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) @@ -1156,7 +1156,7 @@ static MACHINE_CONFIG_START( edrandy ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( robocop2 ) +MACHINE_CONFIG_START(cninja_state::robocop2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2) @@ -1251,7 +1251,7 @@ static MACHINE_CONFIG_START( robocop2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mutantf ) +MACHINE_CONFIG_START(cninja_state::mutantf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14000000) diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp index 66341a8ae02..21d2a3e8e21 100644 --- a/src/mame/drivers/cntsteer.cpp +++ b/src/mame/drivers/cntsteer.cpp @@ -120,6 +120,8 @@ public: void zerotrgt_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void cntsteer_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void zerotrgt_rearrange_gfx( int romsize, int romarea ); + void cntsteer(machine_config &config); + void zerotrgt(machine_config &config); }; @@ -904,7 +906,7 @@ MACHINE_RESET_MEMBER(cntsteer_state,cntsteer) MACHINE_RESET_CALL_MEMBER(zerotrgt); } -static MACHINE_CONFIG_START( cntsteer ) +MACHINE_CONFIG_START(cntsteer_state::cntsteer) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ? */ @@ -958,7 +960,7 @@ static MACHINE_CONFIG_START( cntsteer ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( zerotrgt ) +MACHINE_CONFIG_START(cntsteer_state::zerotrgt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ? */ diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp index fa5c76229c2..66879aba733 100644 --- a/src/mame/drivers/cobra.cpp +++ b/src/mame/drivers/cobra.cpp @@ -842,6 +842,7 @@ public: INTERRUPT_GEN_MEMBER(cobra_vblank); void cobra_video_exit(); int decode_debug_state_value(int v); + void cobra(machine_config &config); }; void cobra_renderer::render_color_scan(int32_t scanline, const extent_t &extent, const cobra_polydata &extradata, int threadid) @@ -3318,7 +3319,7 @@ void cobra_state::machine_reset() dmadac_set_frequency(&m_dmadac[1], 1, 44100); } -static MACHINE_CONFIG_START( cobra ) +MACHINE_CONFIG_START(cobra_state::cobra) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC603, 100000000) /* 603EV, 100? MHz */ diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp index 1837eef2d1d..a0363845812 100644 --- a/src/mame/drivers/coco12.cpp +++ b/src/mame/drivers/coco12.cpp @@ -377,7 +377,7 @@ SLOT_INTERFACE_END // MACHINE_CONFIG_START( coco_sound ) //------------------------------------------------- -MACHINE_CONFIG_START( coco_sound ) +MACHINE_CONFIG_START(coco_state::coco_sound) MCFG_SPEAKER_STANDARD_MONO("speaker") // 6-bit D/A: R10-15 = 10K, 20K, 40.2K, 80.6K, 162K, 324K (according to parts list); output also controls joysticks @@ -403,7 +403,7 @@ static ADDRESS_MAP_START(coco_floating_map, AS_PROGRAM, 8, coco_state) ADDRESS_MAP_END -MACHINE_CONFIG_START( coco_floating ) +MACHINE_CONFIG_START(coco_state::coco_floating) MCFG_DEVICE_ADD(FLOATING_TAG, ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(coco_floating_map) MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_BIG) @@ -428,7 +428,7 @@ DEVICE_INPUT_DEFAULTS_END // MACHINE_CONFIG //------------------------------------------------- -static MACHINE_CONFIG_START( coco ) +MACHINE_CONFIG_START(coco12_state::coco) MCFG_DEVICE_MODIFY(":") MCFG_DEVICE_CLOCK(XTAL_14_31818MHz / 16) @@ -500,7 +500,7 @@ static MACHINE_CONFIG_START( coco ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("dragon_cart_list", "dragon_cart") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cocoe, coco ) +MACHINE_CONFIG_DERIVED(coco12_state::cocoe, coco) MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG) MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "fdc") MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w)) @@ -510,7 +510,7 @@ static MACHINE_CONFIG_DERIVED( cocoe, coco ) MCFG_COCO_VHD_ADD(VHD1_TAG) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( coco2, coco ) +MACHINE_CONFIG_DERIVED(coco12_state::coco2, coco) MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG) MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "fdcv11") MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w)) @@ -520,7 +520,7 @@ static MACHINE_CONFIG_DERIVED( coco2, coco ) MCFG_COCO_VHD_ADD(VHD1_TAG) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( coco2b, coco2 ) +MACHINE_CONFIG_DERIVED(coco12_state::coco2b, coco2) MCFG_DEVICE_REMOVE(VDG_TAG) MCFG_DEVICE_ADD(VDG_TAG, MC6847T1_NTSC, XTAL_14_31818MHz / 4) MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(coco12_state, horizontal_sync)) @@ -528,7 +528,7 @@ static MACHINE_CONFIG_DERIVED( coco2b, coco2 ) MCFG_MC6847_INPUT_CALLBACK(DEVREAD8(SAM_TAG, sam6883_device, display_read)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cp400, coco ) +MACHINE_CONFIG_DERIVED(coco12_state::cp400, coco) MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG) MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "cp450_fdc") MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w)) @@ -536,7 +536,7 @@ static MACHINE_CONFIG_DERIVED( cp400, coco ) MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( t4426, coco2 ) +MACHINE_CONFIG_DERIVED(coco12_state::t4426, coco2) MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG) MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, t4426_cart, "t4426") MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w)) @@ -545,7 +545,7 @@ static MACHINE_CONFIG_DERIVED( t4426, coco2 ) MCFG_SLOT_FIXED(true) // This cart is fixed so no way to change it MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cd6809, coco ) +MACHINE_CONFIG_DERIVED(coco12_state::cd6809, coco) MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG) MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "cd6809_fdc") MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w)) diff --git a/src/mame/drivers/coco3.cpp b/src/mame/drivers/coco3.cpp index 20ed17f78db..914cc7f73ec 100644 --- a/src/mame/drivers/coco3.cpp +++ b/src/mame/drivers/coco3.cpp @@ -241,7 +241,7 @@ DEVICE_INPUT_DEFAULTS_END // MACHINE CONFIGURATION //************************************************************************** -static MACHINE_CONFIG_START( coco3 ) +MACHINE_CONFIG_START(coco3_state::coco3) MCFG_DEVICE_MODIFY(":") MCFG_DEVICE_CLOCK(XTAL_28_63636MHz / 32) @@ -336,7 +336,7 @@ static MACHINE_CONFIG_START( coco3 ) MCFG_SOFTWARE_LIST_FILTER("flop_list","COCO3") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( coco3p, coco3 ) +MACHINE_CONFIG_DERIVED(coco3_state::coco3p, coco3) MCFG_DEVICE_MODIFY(":") MCFG_DEVICE_CLOCK(XTAL_28_475MHz / 32) @@ -352,12 +352,12 @@ static MACHINE_CONFIG_DERIVED( coco3p, coco3 ) MCFG_GIME_FLOATING_BUS_CALLBACK(READ8(coco_state, floating_bus_read)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( coco3h, coco3 ) +MACHINE_CONFIG_DERIVED(coco3_state::coco3h, coco3) MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1)) MCFG_CPU_PROGRAM_MAP(coco3_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( coco3dw1, coco3 ) +MACHINE_CONFIG_DERIVED(coco3_state::coco3dw1, coco3) MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG) MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "cc3hdb1") MACHINE_CONFIG_END diff --git a/src/mame/drivers/cocoloco.cpp b/src/mame/drivers/cocoloco.cpp index e92e4258d4b..4f04a44bda4 100644 --- a/src/mame/drivers/cocoloco.cpp +++ b/src/mame/drivers/cocoloco.cpp @@ -232,6 +232,7 @@ public: DECLARE_PALETTE_INIT(cocoloco); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void cocoloco(machine_config &config); }; /*********************************** @@ -519,7 +520,7 @@ INPUT_PORTS_END * Machine Drivers * ***********************************/ -static MACHINE_CONFIG_START( cocoloco ) +MACHINE_CONFIG_START(cocoloco_state::cocoloco) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */ diff --git a/src/mame/drivers/codata.cpp b/src/mame/drivers/codata.cpp index 6c38d90d554..d719c9f07c4 100644 --- a/src/mame/drivers/codata.cpp +++ b/src/mame/drivers/codata.cpp @@ -26,6 +26,7 @@ public: , m_maincpu(*this, "maincpu") { } + void codata(machine_config &config); private: virtual void machine_reset() override; required_shared_ptr m_p_base; @@ -59,7 +60,7 @@ void codata_state::machine_reset() m_maincpu->reset(); } -static MACHINE_CONFIG_START( codata ) +MACHINE_CONFIG_START(codata_state::codata) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000, XTAL_16MHz / 2) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/coinmstr.cpp b/src/mame/drivers/coinmstr.cpp index 8f1d297392f..4cdf8c9ad0d 100644 --- a/src/mame/drivers/coinmstr.cpp +++ b/src/mame/drivers/coinmstr.cpp @@ -175,6 +175,12 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void coinmstr(machine_config &config); + void pokeroul(machine_config &config); + void supnudg2(machine_config &config); + void jpcoin(machine_config &config); + void quizmstr(machine_config &config); + void trailblz(machine_config &config); }; @@ -1234,7 +1240,7 @@ uint32_t coinmstr_state::screen_update_coinmstr(screen_device &screen, bitmap_in } -static MACHINE_CONFIG_START( coinmstr ) +MACHINE_CONFIG_START(coinmstr_state::coinmstr) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) // 7 MHz. MCFG_CPU_PROGRAM_MAP(coinmstr_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", coinmstr_state, irq0_line_hold) @@ -1275,27 +1281,27 @@ static MACHINE_CONFIG_START( coinmstr ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quizmstr, coinmstr ) +MACHINE_CONFIG_DERIVED(coinmstr_state::quizmstr, coinmstr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(quizmstr_io_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( trailblz, coinmstr ) +MACHINE_CONFIG_DERIVED(coinmstr_state::trailblz, coinmstr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(trailblz_io_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( supnudg2, coinmstr ) +MACHINE_CONFIG_DERIVED(coinmstr_state::supnudg2, coinmstr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(supnudg2_io_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pokeroul, coinmstr ) +MACHINE_CONFIG_DERIVED(coinmstr_state::pokeroul, coinmstr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(pokeroul_io_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jpcoin, coinmstr ) +MACHINE_CONFIG_DERIVED(coinmstr_state::jpcoin, coinmstr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(jpcoin_map) MCFG_CPU_IO_MAP(jpcoin_io_map) diff --git a/src/mame/drivers/coinmvga.cpp b/src/mame/drivers/coinmvga.cpp index 48d8f8b6dc4..e53e6265e3d 100644 --- a/src/mame/drivers/coinmvga.cpp +++ b/src/mame/drivers/coinmvga.cpp @@ -253,6 +253,7 @@ public: required_device m_palette; required_device m_palette2; + void coinmvga(machine_config &config); }; @@ -626,7 +627,7 @@ static ADDRESS_MAP_START( ramdac2_map, 0, 8, coinmvga_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( coinmvga ) +MACHINE_CONFIG_START(coinmvga_state::coinmvga) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H83007, CPU_CLOCK) /* xtal */ diff --git a/src/mame/drivers/coleco.cpp b/src/mame/drivers/coleco.cpp index b8d6a573c98..fde2822cff2 100644 --- a/src/mame/drivers/coleco.cpp +++ b/src/mame/drivers/coleco.cpp @@ -371,7 +371,7 @@ void coleco_state::machine_reset() /* Machine Drivers */ -static MACHINE_CONFIG_START( coleco ) +MACHINE_CONFIG_START(coleco_state::coleco) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_7_15909MHz/2) // 3.579545 MHz @@ -399,7 +399,7 @@ static MACHINE_CONFIG_START( coleco ) MCFG_TIMER_DRIVER_ADD_PERIODIC("paddle_timer", coleco_state, paddle_update_callback, attotime::from_msec(20)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( colecop, coleco ) +MACHINE_CONFIG_DERIVED(coleco_state::colecop, coleco) /* video hardware */ MCFG_DEVICE_REMOVE("tms9928a") @@ -412,14 +412,14 @@ static MACHINE_CONFIG_DERIVED( colecop, coleco ) MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( czz50, coleco ) +MACHINE_CONFIG_DERIVED(coleco_state::czz50, coleco) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") // note: cpu speed unverified, assume it's the same as ColecoVision MCFG_CPU_PROGRAM_MAP(czz50_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dina, czz50 ) +MACHINE_CONFIG_DERIVED(coleco_state::dina, czz50) /* video hardware */ MCFG_DEVICE_REMOVE("tms9928a") diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp index e586dd7a857..0bec5b30269 100644 --- a/src/mame/drivers/combatsc.cpp +++ b/src/mame/drivers/combatsc.cpp @@ -692,7 +692,7 @@ void combatsc_state::machine_reset() } /* combat school (original) */ -static MACHINE_CONFIG_START( combatsc ) +MACHINE_CONFIG_START(combatsc_state::combatsc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */ @@ -746,7 +746,7 @@ MACHINE_CONFIG_END /* combat school (bootleg on different hardware) */ -static MACHINE_CONFIG_START( combatscb ) +MACHINE_CONFIG_START(combatsc_state::combatscb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */ diff --git a/src/mame/drivers/comebaby.cpp b/src/mame/drivers/comebaby.cpp index c706fdb4e93..9c308fb1e67 100644 --- a/src/mame/drivers/comebaby.cpp +++ b/src/mame/drivers/comebaby.cpp @@ -195,6 +195,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void comebaby(machine_config &config); protected: // devices @@ -222,7 +223,7 @@ static INPUT_PORTS_START( comebaby ) INPUT_PORTS_END -static MACHINE_CONFIG_START( comebaby ) +MACHINE_CONFIG_START(comebaby_state::comebaby) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM, 2000000000) /* Probably a Pentium .. ?? Mhz*/ MCFG_CPU_PROGRAM_MAP(comebaby_map) diff --git a/src/mame/drivers/commando.cpp b/src/mame/drivers/commando.cpp index be2fffa983a..198461bf762 100644 --- a/src/mame/drivers/commando.cpp +++ b/src/mame/drivers/commando.cpp @@ -248,7 +248,7 @@ void commando_state::machine_reset() } -static MACHINE_CONFIG_START( commando ) +MACHINE_CONFIG_START(commando_state::commando) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, PHI_MAIN) // ??? diff --git a/src/mame/drivers/compc.cpp b/src/mame/drivers/compc.cpp index 6fd116e282d..4f46d5b63ee 100644 --- a/src/mame/drivers/compc.cpp +++ b/src/mame/drivers/compc.cpp @@ -32,6 +32,8 @@ public: DECLARE_WRITE8_MEMBER(pio_w); DECLARE_READ8_MEMBER(pio_r); + void compc(machine_config &config); + void pc10iii(machine_config &config); private: u8 m_portb, m_dips; }; @@ -184,7 +186,7 @@ static ADDRESS_MAP_START(compciii_io, AS_IO, 8, compc_state) AM_RANGE(0x0000, 0x00ff) AM_DEVICE("mb", pc_noppi_mb_device, map) ADDRESS_MAP_END -static MACHINE_CONFIG_START(compc) +MACHINE_CONFIG_START(compc_state::compc) MCFG_CPU_ADD("maincpu", I8088, 4772720*2) MCFG_CPU_PROGRAM_MAP(compc_map) MCFG_CPU_IO_MAP(compc_io) @@ -216,7 +218,7 @@ static MACHINE_CONFIG_START(compc) MCFG_SOFTWARE_LIST_ADD("disk_list", "ibm5150") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(pc10iii, compc) +MACHINE_CONFIG_DERIVED(compc_state::pc10iii, compc) MCFG_DEVICE_MODIFY("maincpu") MCFG_CPU_IO_MAP(compciii_io) MACHINE_CONFIG_END diff --git a/src/mame/drivers/compgolf.cpp b/src/mame/drivers/compgolf.cpp index 981ff425cda..3facae1a0e8 100644 --- a/src/mame/drivers/compgolf.cpp +++ b/src/mame/drivers/compgolf.cpp @@ -221,7 +221,7 @@ void compgolf_state::machine_reset() m_scrolly_hi = 0; } -static MACHINE_CONFIG_START( compgolf ) +MACHINE_CONFIG_START(compgolf_state::compgolf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) diff --git a/src/mame/drivers/compis.cpp b/src/mame/drivers/compis.cpp index 856c611a8ef..cecd77c3a35 100644 --- a/src/mame/drivers/compis.cpp +++ b/src/mame/drivers/compis.cpp @@ -156,6 +156,8 @@ public: DECLARE_WRITE_LINE_MEMBER(write_centronics_select); int m_tmr0; + void compis(machine_config &config); + void compis2(machine_config &config); }; @@ -743,7 +745,7 @@ void compis_state::machine_reset() // MACHINE_CONFIG( compis ) //------------------------------------------------- -static MACHINE_CONFIG_START( compis ) +MACHINE_CONFIG_START(compis_state::compis) // basic machine hardware MCFG_CPU_ADD(I80186_TAG, I80186, XTAL_15_36MHz) MCFG_CPU_PROGRAM_MAP(compis_mem) @@ -837,7 +839,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( compis2 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( compis2, compis ) +MACHINE_CONFIG_DERIVED(compis_state::compis2, compis) // basic machine hardware MCFG_CPU_MODIFY(I80186_TAG) MCFG_CPU_PROGRAM_MAP(compis2_mem) diff --git a/src/mame/drivers/compucolor.cpp b/src/mame/drivers/compucolor.cpp index a2e603abe85..85953236626 100644 --- a/src/mame/drivers/compucolor.cpp +++ b/src/mame/drivers/compucolor.cpp @@ -78,6 +78,7 @@ public: IRQ_CALLBACK_MEMBER( int_ack ); uint8_t m_xo; + void compucolor2(machine_config &config); }; static ADDRESS_MAP_START( compucolor2_mem, AS_PROGRAM, 8, compucolor2_state ) @@ -389,7 +390,7 @@ void compucolor2_state::machine_reset() m_rs232->write_dtr(1); } -static MACHINE_CONFIG_START( compucolor2 ) +MACHINE_CONFIG_START(compucolor2_state::compucolor2) // basic machine hardware MCFG_CPU_ADD(I8080_TAG, I8080, XTAL_17_9712MHz/9) MCFG_CPU_PROGRAM_MAP(compucolor2_mem) diff --git a/src/mame/drivers/comquest.cpp b/src/mame/drivers/comquest.cpp index 88144e85a49..5be79af688d 100644 --- a/src/mame/drivers/comquest.cpp +++ b/src/mame/drivers/comquest.cpp @@ -212,7 +212,7 @@ void comquest_state::machine_reset() } -static MACHINE_CONFIG_START( comquest ) +MACHINE_CONFIG_START(comquest_state::comquest) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6805, 4000000) /* 4000000? */ /*MCFG_CPU_ADD("maincpu", HD63705, 4000000) instruction set looks like m6805/m6808 */ diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp index 5ebeeadefcc..bb20cef75e5 100644 --- a/src/mame/drivers/comx35.cpp +++ b/src/mame/drivers/comx35.cpp @@ -593,7 +593,7 @@ void comx35_state::machine_reset() // MACHINE_CONFIG( pal ) //------------------------------------------------- -static MACHINE_CONFIG_START( pal ) +MACHINE_CONFIG_START(comx35_state::pal) // basic system hardware MCFG_CPU_ADD(CDP1802_TAG, CDP1802, cdp1869_device::CPU_CLK_PAL) MCFG_CPU_PROGRAM_MAP(comx35_mem) @@ -643,7 +643,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( ntsc ) //------------------------------------------------- -static MACHINE_CONFIG_START( ntsc ) +MACHINE_CONFIG_START(comx35_state::ntsc) // basic system hardware MCFG_CPU_ADD(CDP1802_TAG, CDP1802, cdp1869_device::CPU_CLK_NTSC) MCFG_CPU_PROGRAM_MAP(comx35_mem) diff --git a/src/mame/drivers/concept.cpp b/src/mame/drivers/concept.cpp index fe6f6005c76..a561da9e49d 100644 --- a/src/mame/drivers/concept.cpp +++ b/src/mame/drivers/concept.cpp @@ -208,7 +208,7 @@ SLOT_INTERFACE_END -static MACHINE_CONFIG_START( concept ) +MACHINE_CONFIG_START(concept_state::concept) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8182000) /* 16.364 MHz / 2 */ MCFG_CPU_PROGRAM_MAP(concept_memmap) diff --git a/src/mame/drivers/contra.cpp b/src/mame/drivers/contra.cpp index 2a69440ed93..cc79c63d13e 100644 --- a/src/mame/drivers/contra.cpp +++ b/src/mame/drivers/contra.cpp @@ -194,7 +194,7 @@ void contra_state::machine_start() membank("bank1")->configure_entries(0, 16, &ROM[0x10000], 0x2000); } -static MACHINE_CONFIG_START( contra ) +MACHINE_CONFIG_START(contra_state::contra) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309E, XTAL_24MHz / 8) /* 3000000? (HD63C09EP) */ diff --git a/src/mame/drivers/controlid.cpp b/src/mame/drivers/controlid.cpp index 79bb60ea6e0..7fdc9e85c04 100644 --- a/src/mame/drivers/controlid.cpp +++ b/src/mame/drivers/controlid.cpp @@ -44,6 +44,7 @@ public: DECLARE_PALETTE_INIT( controlidx628 ); required_device m_lcdc; + void controlidx628(machine_config &config); private: uint8_t p0_data; uint8_t p1_data; @@ -102,7 +103,7 @@ PALETTE_INIT_MEMBER(controlidx628_state, controlidx628) * Machine Driver * *************************/ -static MACHINE_CONFIG_START( controlidx628 ) +MACHINE_CONFIG_START(controlidx628_state::controlidx628) // basic machine hardware MCFG_CPU_ADD("maincpu", I80C32, XTAL_11_0592MHz) /* Actually the board has an Atmel AT89S52 mcu. */ MCFG_CPU_PROGRAM_MAP(prog_map) diff --git a/src/mame/drivers/coolpool.cpp b/src/mame/drivers/coolpool.cpp index d022a0ca7ec..82d9ff8aabb 100644 --- a/src/mame/drivers/coolpool.cpp +++ b/src/mame/drivers/coolpool.cpp @@ -778,7 +778,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( amerdart ) +MACHINE_CONFIG_START(coolpool_state::amerdart) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz) @@ -815,7 +815,7 @@ static MACHINE_CONFIG_START( amerdart ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( coolpool ) +MACHINE_CONFIG_START(coolpool_state::coolpool) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz) @@ -854,7 +854,7 @@ static MACHINE_CONFIG_START( coolpool ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( 9ballsht, coolpool ) +MACHINE_CONFIG_DERIVED(coolpool_state::_9ballsht, coolpool) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(nballsht_map) @@ -1181,11 +1181,11 @@ DRIVER_INIT_MEMBER(coolpool_state,9ballsht) * *************************************/ -GAME( 1989, amerdart, 0, amerdart, amerdart, coolpool_state, amerdart, ROT0, "Ameri", "AmeriDarts (set 1)", MACHINE_SUPPORTS_SAVE ) -GAME( 1989, amerdart2, amerdart, amerdart, amerdart, coolpool_state, amerdart, ROT0, "Ameri", "AmeriDarts (set 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1989, amerdart3, amerdart, amerdart, amerdart, coolpool_state, amerdart, ROT0, "Ameri", "AmeriDarts (set 3)", MACHINE_SUPPORTS_SAVE ) -GAME( 1992, coolpool, 0, coolpool, coolpool, coolpool_state, coolpool, ROT0, "Catalina", "Cool Pool", 0 ) -GAME( 1993, 9ballsht, 0, 9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout (set 1)", 0 ) -GAME( 1993, 9ballsht2, 9ballsht, 9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout (set 2)", 0 ) -GAME( 1993, 9ballsht3, 9ballsht, 9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout (set 3)", 0 ) -GAME( 1993, 9ballshtc, 9ballsht, 9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout Championship", 0 ) +GAME( 1989, amerdart, 0, amerdart, amerdart, coolpool_state, amerdart, ROT0, "Ameri", "AmeriDarts (set 1)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, amerdart2, amerdart, amerdart, amerdart, coolpool_state, amerdart, ROT0, "Ameri", "AmeriDarts (set 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, amerdart3, amerdart, amerdart, amerdart, coolpool_state, amerdart, ROT0, "Ameri", "AmeriDarts (set 3)", MACHINE_SUPPORTS_SAVE ) +GAME( 1992, coolpool, 0, coolpool, coolpool, coolpool_state, coolpool, ROT0, "Catalina", "Cool Pool", 0 ) +GAME( 1993, 9ballsht, 0, _9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout (set 1)", 0 ) +GAME( 1993, 9ballsht2, 9ballsht, _9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout (set 2)", 0 ) +GAME( 1993, 9ballsht3, 9ballsht, _9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout (set 3)", 0 ) +GAME( 1993, 9ballshtc, 9ballsht, _9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout Championship", 0 ) diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp index a7e2a1c3c24..9ec0f730b73 100644 --- a/src/mame/drivers/coolridr.cpp +++ b/src/mame/drivers/coolridr.cpp @@ -537,6 +537,8 @@ public: }; objcachemanager decode[2]; + void aquastge(machine_config &config); + void coolridr(machine_config &config); }; #define PRINT_BLIT_STUFF \ @@ -3687,7 +3689,7 @@ WRITE_LINE_MEMBER(coolridr_state::scsp2_to_sh1_irq) #define MAIN_CLOCK XTAL_28_63636MHz -static MACHINE_CONFIG_START( coolridr ) +MACHINE_CONFIG_START(coolridr_state::coolridr) MCFG_CPU_ADD("maincpu", SH2, MAIN_CLOCK) // 28 mhz MCFG_CPU_PROGRAM_MAP(system_h1_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", coolridr_state, system_h1_main, "screen", 0, 1) @@ -3734,7 +3736,7 @@ static MACHINE_CONFIG_START( coolridr ) MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aquastge, coolridr ) +MACHINE_CONFIG_DERIVED(coolridr_state::aquastge, coolridr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(aquastge_h1_map) diff --git a/src/mame/drivers/cop01.cpp b/src/mame/drivers/cop01.cpp index 007534d18f4..90f4d546e82 100644 --- a/src/mame/drivers/cop01.cpp +++ b/src/mame/drivers/cop01.cpp @@ -509,7 +509,7 @@ void cop01_state::machine_reset() } -static MACHINE_CONFIG_START( cop01 ) +MACHINE_CONFIG_START(cop01_state::cop01) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAINCPU_CLOCK/2) /* unknown clock / divider */ @@ -551,7 +551,7 @@ static MACHINE_CONFIG_START( cop01 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mightguy ) +MACHINE_CONFIG_START(cop01_state::mightguy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAINCPU_CLOCK/2) /* unknown divider */ diff --git a/src/mame/drivers/cops.cpp b/src/mame/drivers/cops.cpp index 7a2af7b71e0..7f5e3d21105 100644 --- a/src/mame/drivers/cops.cpp +++ b/src/mame/drivers/cops.cpp @@ -68,6 +68,8 @@ public: // screen updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void revlatns(machine_config &config); + void cops(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -912,7 +914,7 @@ DRIVER_INIT_MEMBER(cops_state,cops) membank("sysbank1")->set_entry(2); } -static MACHINE_CONFIG_START( cops ) +MACHINE_CONFIG_START(cops_state::cops) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MAIN_CLOCK/2) @@ -948,7 +950,7 @@ static MACHINE_CONFIG_START( cops ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( revlatns ) +MACHINE_CONFIG_START(cops_state::revlatns) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MAIN_CLOCK/2) diff --git a/src/mame/drivers/copsnrob.cpp b/src/mame/drivers/copsnrob.cpp index fb9be71f90f..e872a102f4a 100644 --- a/src/mame/drivers/copsnrob.cpp +++ b/src/mame/drivers/copsnrob.cpp @@ -246,7 +246,7 @@ void copsnrob_state::machine_reset() } -static MACHINE_CONFIG_START( copsnrob ) +MACHINE_CONFIG_START(copsnrob_state::copsnrob) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,14318180/16) /* 894886.25 kHz */ diff --git a/src/mame/drivers/corona.cpp b/src/mame/drivers/corona.cpp index 8ea7f8695ad..b53eda26a64 100644 --- a/src/mame/drivers/corona.cpp +++ b/src/mame/drivers/corona.cpp @@ -360,6 +360,11 @@ public: required_device m_soundcpu; required_device m_screen; required_device m_soundlatch; + void winner81(machine_config &config); + void winner82(machine_config &config); + void rcirulet(machine_config &config); + void luckyrlt(machine_config &config); + void re800(machine_config &config); }; @@ -1343,7 +1348,7 @@ INPUT_PORTS_END * Machine Drivers * *******************************************/ -static MACHINE_CONFIG_START( winner81 ) +MACHINE_CONFIG_START(corona_state::winner81) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, WC81_MAIN_XTAL/8) /* measured */ MCFG_CPU_PROGRAM_MAP(winner81_map) @@ -1378,7 +1383,7 @@ static MACHINE_CONFIG_START( winner81 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( winner82 ) +MACHINE_CONFIG_START(corona_state::winner82) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, WC82_MAIN_XTAL/8) /* measured */ MCFG_CPU_PROGRAM_MAP(winner82_map) @@ -1412,7 +1417,7 @@ static MACHINE_CONFIG_START( winner82 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( re800 ) +MACHINE_CONFIG_START(corona_state::re800) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */ MCFG_CPU_PROGRAM_MAP(re800_map) @@ -1447,7 +1452,7 @@ static MACHINE_CONFIG_START( re800 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rcirulet ) +MACHINE_CONFIG_START(corona_state::rcirulet) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */ MCFG_CPU_PROGRAM_MAP(re800_map) @@ -1481,7 +1486,7 @@ static MACHINE_CONFIG_START( rcirulet ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( luckyrlt ) +MACHINE_CONFIG_START(corona_state::luckyrlt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */ MCFG_CPU_PROGRAM_MAP(luckyrlt_map) diff --git a/src/mame/drivers/cortex.cpp b/src/mame/drivers/cortex.cpp index ea8a8d05378..8e74b1068c7 100644 --- a/src/mame/drivers/cortex.cpp +++ b/src/mame/drivers/cortex.cpp @@ -72,6 +72,7 @@ public: DECLARE_READ8_MEMBER(keyboard_r); DECLARE_DRIVER_INIT(init); + void cortex(machine_config &config); private: bool m_kbd_ack; bool m_vdp_int; @@ -174,7 +175,7 @@ DRIVER_INIT_MEMBER( cortex_state, init ) membank("bankw0")->configure_entry(0, &main[0x00000]); } -static MACHINE_CONFIG_START( cortex ) +MACHINE_CONFIG_START(cortex_state::cortex) /* basic machine hardware */ /* TMS9995 CPU @ 12.0 MHz */ // Standard variant, no overflow int diff --git a/src/mame/drivers/cosmic.cpp b/src/mame/drivers/cosmic.cpp index 8301e79c3ef..ccf157caeba 100644 --- a/src/mame/drivers/cosmic.cpp +++ b/src/mame/drivers/cosmic.cpp @@ -1000,7 +1000,7 @@ MACHINE_RESET_MEMBER(cosmic_state,cosmicg) m_maincpu->set_input_line(INT_9980A_RESET, CLEAR_LINE); } -static MACHINE_CONFIG_START( cosmic ) +MACHINE_CONFIG_START(cosmic_state::cosmic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,Z80_MASTER_CLOCK/6) /* 1.8026 MHz */ @@ -1028,7 +1028,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cosmic_state::panic_scanline) } -static MACHINE_CONFIG_DERIVED( panic, cosmic ) +MACHINE_CONFIG_DERIVED(cosmic_state::panic, cosmic) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1058,7 +1058,7 @@ static MACHINE_CONFIG_DERIVED( panic, cosmic ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cosmica, cosmic ) +MACHINE_CONFIG_DERIVED(cosmic_state::cosmica, cosmic) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1082,7 +1082,7 @@ static MACHINE_CONFIG_DERIVED( cosmica, cosmic ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cosmicg ) +MACHINE_CONFIG_START(cosmic_state::cosmicg) /* basic machine hardware */ MCFG_TMS99xx_ADD("maincpu", TMS9980A, COSMICG_MASTER_CLOCK/8, cosmicg_map, cosmicg_io_map) @@ -1120,7 +1120,7 @@ static MACHINE_CONFIG_START( cosmicg ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( magspot, cosmic ) +MACHINE_CONFIG_DERIVED(cosmic_state::magspot, cosmic) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", Z80, Z80_MASTER_CLOCK/4) /* 2.704 MHz, verified via schematics */ @@ -1144,7 +1144,7 @@ static MACHINE_CONFIG_DERIVED( magspot, cosmic ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( devzone, magspot ) +MACHINE_CONFIG_DERIVED(cosmic_state::devzone, magspot) /* basic machine hardware */ @@ -1154,7 +1154,7 @@ static MACHINE_CONFIG_DERIVED( devzone, magspot ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nomnlnd, cosmic ) +MACHINE_CONFIG_DERIVED(cosmic_state::nomnlnd, cosmic) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp index 416c7f16624..dd5229cb909 100644 --- a/src/mame/drivers/cosmicos.cpp +++ b/src/mame/drivers/cosmicos.cpp @@ -499,7 +499,7 @@ QUICKLOAD_LOAD_MEMBER( cosmicos_state, cosmicos ) /* Machine Driver */ -static MACHINE_CONFIG_START( cosmicos ) +MACHINE_CONFIG_START(cosmicos_state::cosmicos) /* basic machine hardware */ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz) MCFG_CPU_PROGRAM_MAP(cosmicos_mem) diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp index 939ccc0e358..5c3bf15de02 100644 --- a/src/mame/drivers/cp1.cpp +++ b/src/mame/drivers/cp1.cpp @@ -53,6 +53,7 @@ public: DECLARE_WRITE8_MEMBER(i8155_portb_w); DECLARE_WRITE8_MEMBER(i8155_portc_w); + void cp1(machine_config &config); private: uint8_t m_7seg; uint8_t m_port2; @@ -251,7 +252,7 @@ QUICKLOAD_LOAD_MEMBER( cp1_state, quickload ) return image_init_result::PASS; } -static MACHINE_CONFIG_START( cp1 ) +MACHINE_CONFIG_START(cp1_state::cp1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8049, XTAL_6MHz) MCFG_CPU_IO_MAP(cp1_io) diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp index 4d152a988df..4be6caf51c7 100644 --- a/src/mame/drivers/cps1.cpp +++ b/src/mame/drivers/cps1.cpp @@ -3336,7 +3336,7 @@ MACHINE_START_MEMBER(cps_state,qsound) membank("bank1")->configure_entries(0, 6, memregion("audiocpu")->base() + 0x10000, 0x4000); } -static MACHINE_CONFIG_START( cps1_10MHz ) +MACHINE_CONFIG_START(cps_state::cps1_10MHz) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz ) /* verified on pcb */ @@ -3377,7 +3377,7 @@ static MACHINE_CONFIG_START( cps1_10MHz ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( forgottn, cps1_10MHz ) +MACHINE_CONFIG_DERIVED(cps_state::forgottn, cps1_10MHz) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(forgottn_map) @@ -3386,20 +3386,20 @@ static MACHINE_CONFIG_DERIVED( forgottn, cps1_10MHz ) MCFG_UPD4701_PORTY("DIAL1") MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( cps1_12MHz, cps1_10MHz ) +MACHINE_CONFIG_DERIVED(cps_state::cps1_12MHz, cps1_10MHz) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK( XTAL_12MHz ) /* verified on pcb */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pang3, cps1_12MHz ) +MACHINE_CONFIG_DERIVED(cps_state::pang3, cps1_12MHz) /* basic machine hardware */ MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ganbare, cps1_10MHz ) +MACHINE_CONFIG_DERIVED(cps_state::ganbare, cps1_10MHz) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3408,7 +3408,7 @@ static MACHINE_CONFIG_DERIVED( ganbare, cps1_10MHz ) MCFG_M48T35_ADD("m48t35") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( qsound, cps1_12MHz ) +MACHINE_CONFIG_DERIVED(cps_state::qsound, cps1_12MHz) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", M68000, XTAL_12MHz ) /* verified on pcb */ @@ -3439,18 +3439,18 @@ static MACHINE_CONFIG_DERIVED( qsound, cps1_12MHz ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wofhfh, cps1_12MHz ) +MACHINE_CONFIG_DERIVED(cps_state::wofhfh, cps1_12MHz) /* basic machine hardware */ MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sf2m3, cps1_12MHz) +MACHINE_CONFIG_DERIVED(cps_state::sf2m3, cps1_12MHz) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sf2m3_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sf2m10, cps1_12MHz) +MACHINE_CONFIG_DERIVED(cps_state::sf2m10, cps1_12MHz) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sf2m10_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp index a95896fc305..1cee00646d2 100644 --- a/src/mame/drivers/cps2.cpp +++ b/src/mame/drivers/cps2.cpp @@ -1301,7 +1301,7 @@ MACHINE_START_MEMBER(cps_state,cps2) } -static MACHINE_CONFIG_START( cps2 ) +MACHINE_CONFIG_START(cps_state::cps2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -1339,13 +1339,13 @@ static MACHINE_CONFIG_START( cps2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dead_cps2, cps2 ) +MACHINE_CONFIG_DERIVED(cps_state::dead_cps2, cps2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(dead_cps2_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gigaman2, cps2 ) +MACHINE_CONFIG_DERIVED(cps_state::gigaman2, cps2) MCFG_DEVICE_REMOVE("audiocpu") // gigaman2 has an AT89C4051 (8051) MCU as an audio cpu, no qsound. diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp index e96091e6a8a..d027b00af48 100644 --- a/src/mame/drivers/cps3.cpp +++ b/src/mame/drivers/cps3.cpp @@ -2456,21 +2456,21 @@ SH2_DMA_KLUDGE_CB(cps3_state::dma_callback) } -static MACHINE_CONFIG_START( simm1_64mbit ) +MACHINE_CONFIG_START(cps3_state::simm1_64mbit) 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_START( simm2_64mbit ) +MACHINE_CONFIG_START(cps3_state::simm2_64mbit) 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_START( simm3_128mbit ) +MACHINE_CONFIG_START(cps3_state::simm3_128mbit) MCFG_FUJITSU_29F016A_ADD("simm3.0") MCFG_FUJITSU_29F016A_ADD("simm3.1") MCFG_FUJITSU_29F016A_ADD("simm3.2") @@ -2481,7 +2481,7 @@ static MACHINE_CONFIG_START( simm3_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm3.7") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( simm4_128mbit ) +MACHINE_CONFIG_START(cps3_state::simm4_128mbit) MCFG_FUJITSU_29F016A_ADD("simm4.0") MCFG_FUJITSU_29F016A_ADD("simm4.1") MCFG_FUJITSU_29F016A_ADD("simm4.2") @@ -2492,7 +2492,7 @@ static MACHINE_CONFIG_START( simm4_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm4.7") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( simm5_128mbit ) +MACHINE_CONFIG_START(cps3_state::simm5_128mbit) MCFG_FUJITSU_29F016A_ADD("simm5.0") MCFG_FUJITSU_29F016A_ADD("simm5.1") MCFG_FUJITSU_29F016A_ADD("simm5.2") @@ -2503,12 +2503,12 @@ static MACHINE_CONFIG_START( simm5_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm5.7") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( simm5_32mbit ) +MACHINE_CONFIG_START(cps3_state::simm5_32mbit) MCFG_FUJITSU_29F016A_ADD("simm5.0") MCFG_FUJITSU_29F016A_ADD("simm5.1") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( simm6_128mbit ) +MACHINE_CONFIG_START(cps3_state::simm6_128mbit) MCFG_FUJITSU_29F016A_ADD("simm6.0") MCFG_FUJITSU_29F016A_ADD("simm6.1") MCFG_FUJITSU_29F016A_ADD("simm6.2") @@ -2519,7 +2519,7 @@ static MACHINE_CONFIG_START( simm6_128mbit ) MCFG_FUJITSU_29F016A_ADD("simm6.7") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cps3 ) +MACHINE_CONFIG_START(cps3_state::cps3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH2, 6250000*4) // external clock is 6.25 Mhz, it sets the internal multiplier to 4x (this should probably be handled in the core..) MCFG_CPU_PROGRAM_MAP(cps3_map) @@ -2564,21 +2564,21 @@ MACHINE_CONFIG_END /* individual configs for each machine, depending on the SIMMs installed */ -MACHINE_CONFIG_DERIVED( redearth, cps3 ) +MACHINE_CONFIG_DERIVED(cps3_state::redearth, cps3) 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( sfiii, cps3 ) +MACHINE_CONFIG_DERIVED(cps3_state::sfiii, cps3) 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 ) +MACHINE_CONFIG_DERIVED(cps3_state::sfiii2, cps3) MCFG_FRAGMENT_ADD(simm1_64mbit) MCFG_FRAGMENT_ADD(simm2_64mbit) MCFG_FRAGMENT_ADD(simm3_128mbit) @@ -2586,7 +2586,7 @@ MACHINE_CONFIG_DERIVED( sfiii2, cps3 ) MCFG_FRAGMENT_ADD(simm5_128mbit) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( jojo, cps3 ) +MACHINE_CONFIG_DERIVED(cps3_state::jojo, cps3) MCFG_FRAGMENT_ADD(simm1_64mbit) MCFG_FRAGMENT_ADD(simm2_64mbit) MCFG_FRAGMENT_ADD(simm3_128mbit) @@ -2594,7 +2594,7 @@ MACHINE_CONFIG_DERIVED( jojo, cps3 ) MCFG_FRAGMENT_ADD(simm5_32mbit) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( sfiii3, cps3 ) +MACHINE_CONFIG_DERIVED(cps3_state::sfiii3, cps3) MCFG_FRAGMENT_ADD(simm1_64mbit) MCFG_FRAGMENT_ADD(simm2_64mbit) MCFG_FRAGMENT_ADD(simm3_128mbit) @@ -2603,7 +2603,7 @@ MACHINE_CONFIG_DERIVED( sfiii3, cps3 ) MCFG_FRAGMENT_ADD(simm6_128mbit) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( jojoba, cps3 ) +MACHINE_CONFIG_DERIVED(cps3_state::jojoba, cps3) MCFG_FRAGMENT_ADD(simm1_64mbit) MCFG_FRAGMENT_ADD(simm2_64mbit) MCFG_FRAGMENT_ADD(simm3_128mbit) diff --git a/src/mame/drivers/craft.cpp b/src/mame/drivers/craft.cpp index cf54843ddbf..8c24c33de20 100644 --- a/src/mame/drivers/craft.cpp +++ b/src/mame/drivers/craft.cpp @@ -67,6 +67,7 @@ public: uint32_t screen_update_craft(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); inline void verboselog(int n_level, const char *s_fmt, ...) ATTR_PRINTF(3,4); required_device m_dac; + void craft(machine_config &config); }; inline void craft_state::verboselog(int n_level, const char *s_fmt, ...) @@ -237,7 +238,7 @@ void craft_state::machine_reset() m_last_cycles = 0; } -static MACHINE_CONFIG_START( craft ) +MACHINE_CONFIG_START(craft_state::craft) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ATMEGA88, MASTER_CLOCK) diff --git a/src/mame/drivers/crbaloon.cpp b/src/mame/drivers/crbaloon.cpp index e43df078ad2..dbf15eccfdc 100644 --- a/src/mame/drivers/crbaloon.cpp +++ b/src/mame/drivers/crbaloon.cpp @@ -359,7 +359,7 @@ INTERRUPT_GEN_MEMBER(crbaloon_state::vblank_irq) } -static MACHINE_CONFIG_START( crbaloon ) +MACHINE_CONFIG_START(crbaloon_state::crbaloon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CRBALOON_MASTER_XTAL / 3) diff --git a/src/mame/drivers/crgolf.cpp b/src/mame/drivers/crgolf.cpp index 3088ee9437f..515479623ad 100644 --- a/src/mame/drivers/crgolf.cpp +++ b/src/mame/drivers/crgolf.cpp @@ -513,7 +513,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( crgolf ) +MACHINE_CONFIG_START(crgolf_state::crgolf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/3/2) @@ -559,7 +559,7 @@ static MACHINE_CONFIG_START( crgolf ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( crgolfhi, crgolf ) +MACHINE_CONFIG_DERIVED(crgolf_state::crgolfhi, crgolf) MCFG_SOUND_ADD("msm", MSM5205, 384000) MCFG_MSM5205_VCLK_CB(WRITELINE(crgolf_state, vck_callback)) @@ -568,7 +568,7 @@ static MACHINE_CONFIG_DERIVED( crgolfhi, crgolf ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mastrglf, crgolfhi ) +MACHINE_CONFIG_DERIVED(crgolf_state::mastrglf, crgolfhi) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp index b9da7dfa178..60d3c24a0ea 100644 --- a/src/mame/drivers/crimfght.cpp +++ b/src/mame/drivers/crimfght.cpp @@ -297,7 +297,7 @@ CUSTOM_INPUT_MEMBER( crimfght_state::system_r ) return data >> 4; } -static MACHINE_CONFIG_START( crimfght ) +MACHINE_CONFIG_START(crimfght_state::crimfght) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/8) /* 052001 (verified on pcb) */ diff --git a/src/mame/drivers/crospang.cpp b/src/mame/drivers/crospang.cpp index 78b49862193..550c5df6f90 100644 --- a/src/mame/drivers/crospang.cpp +++ b/src/mame/drivers/crospang.cpp @@ -336,7 +336,7 @@ void crospang_state::machine_reset() } -static MACHINE_CONFIG_START( crospang ) +MACHINE_CONFIG_START(crospang_state::crospang) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14318180) @@ -382,7 +382,7 @@ static MACHINE_CONFIG_START( crospang ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bestri, crospang ) +MACHINE_CONFIG_DERIVED(crospang_state::bestri, crospang) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -390,7 +390,7 @@ static MACHINE_CONFIG_DERIVED( bestri, crospang ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bestria, crospang ) +MACHINE_CONFIG_DERIVED(crospang_state::bestria, crospang) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/crshrace.cpp b/src/mame/drivers/crshrace.cpp index 914e72164e2..d75be7635b2 100644 --- a/src/mame/drivers/crshrace.cpp +++ b/src/mame/drivers/crshrace.cpp @@ -399,7 +399,7 @@ void crshrace_state::machine_reset() m_flipscreen = 0; } -static MACHINE_CONFIG_START( crshrace ) +MACHINE_CONFIG_START(crshrace_state::crshrace) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,16000000) /* 16 MHz ??? */ diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp index 3880ce41e9d..b7993c83d3b 100644 --- a/src/mame/drivers/crvision.cpp +++ b/src/mame/drivers/crvision.cpp @@ -734,7 +734,7 @@ SLOT_INTERFACE_END MACHINE_CONFIG_START( creativision ) -------------------------------------------------*/ -static MACHINE_CONFIG_START( creativision ) +MACHINE_CONFIG_START(crvision_state::creativision) // basic machine hardware MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_2MHz) MCFG_CPU_PROGRAM_MAP(crvision_map) @@ -784,7 +784,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED( ntsc, creativision ) -------------------------------------------------*/ -static MACHINE_CONFIG_DERIVED( ntsc, creativision ) +MACHINE_CONFIG_DERIVED(crvision_state::ntsc, creativision) // video hardware MCFG_DEVICE_ADD( TMS9929_TAG, TMS9918, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -797,7 +797,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED( pal, creativision ) -------------------------------------------------*/ -static MACHINE_CONFIG_DERIVED( pal, creativision ) +MACHINE_CONFIG_DERIVED(crvision_pal_state::pal, creativision) // video hardware MCFG_DEVICE_ADD( TMS9929_TAG, TMS9929, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -810,7 +810,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START( lasr2001 ) -------------------------------------------------*/ -static MACHINE_CONFIG_START( lasr2001 ) +MACHINE_CONFIG_START(laser2001_state::lasr2001) // basic machine hardware MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_17_73447MHz/9) MCFG_CPU_PROGRAM_MAP(lasr2001_map) diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp index c3a0059b321..aa0e4e3e9bb 100644 --- a/src/mame/drivers/crystal.cpp +++ b/src/mame/drivers/crystal.cpp @@ -335,6 +335,10 @@ public: void PatchReset( ); uint16_t GetVidReg( address_space &space, uint16_t reg ); void SetVidReg( address_space &space, uint16_t reg, uint16_t val ); + void crospuzl(machine_config &config); + void crystal(machine_config &config); + void crzyddz2(machine_config &config); + void trivrus(machine_config &config); }; void crystal_state::IntReq( int num ) @@ -1471,7 +1475,7 @@ static INPUT_PORTS_START(crzyddz2) INPUT_PORTS_END -static MACHINE_CONFIG_START( crystal ) +MACHINE_CONFIG_START(crystal_state::crystal) MCFG_CPU_ADD("maincpu", SE3208, 43000000) MCFG_CPU_PROGRAM_MAP(crystal_mem) @@ -1505,17 +1509,17 @@ static MACHINE_CONFIG_START( crystal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( trivrus, crystal ) +MACHINE_CONFIG_DERIVED(crystal_state::trivrus, crystal) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(trivrus_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( crospuzl, crystal ) +MACHINE_CONFIG_DERIVED(crystal_state::crospuzl, crystal) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(crospuzl_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( crzyddz2, crystal ) +MACHINE_CONFIG_DERIVED(crystal_state::crzyddz2, crystal) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(crzyddz2_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp index f4922510735..9252856e672 100644 --- a/src/mame/drivers/csplayh5.cpp +++ b/src/mame/drivers/csplayh5.cpp @@ -102,6 +102,7 @@ public: DECLARE_WRITE_LINE_MEMBER(csplayh5_vdp0_interrupt); void general_init(int patchaddress, int patchvalue); + void csplayh5(machine_config &config); }; @@ -352,7 +353,7 @@ WRITE16_MEMBER(csplayh5_state::tmp68301_parallel_port_w) } -static MACHINE_CONFIG_START( csplayh5 ) +MACHINE_CONFIG_START(csplayh5_state::csplayh5) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,16000000) /* TMP68301-16 */ diff --git a/src/mame/drivers/cswat.cpp b/src/mame/drivers/cswat.cpp index 58d5874398c..354e748e587 100644 --- a/src/mame/drivers/cswat.cpp +++ b/src/mame/drivers/cswat.cpp @@ -62,6 +62,7 @@ public: virtual void video_start() override; virtual void machine_reset() override; virtual void machine_start() override; + void cswat(machine_config &config); }; @@ -253,7 +254,7 @@ void cswat_state::machine_start() save_item(NAME(m_nmi_enabled)); } -static MACHINE_CONFIG_START( cswat ) +MACHINE_CONFIG_START(cswat_state::cswat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_18_432MHz/3/4) // HD68A09EP, 1.5MHz? diff --git a/src/mame/drivers/ct486.cpp b/src/mame/drivers/ct486.cpp index 8fe4b9c53fe..3830cebd37d 100644 --- a/src/mame/drivers/ct486.cpp +++ b/src/mame/drivers/ct486.cpp @@ -51,6 +51,7 @@ public: DECLARE_WRITE_LINE_MEMBER( cs4031_hold ); DECLARE_WRITE8_MEMBER( cs4031_tc ) { m_isabus->eop_w(offset, data); } DECLARE_WRITE_LINE_MEMBER( cs4031_spkr ) { m_speaker->level_w(state); } + void ct486(machine_config &config); }; @@ -104,7 +105,7 @@ ADDRESS_MAP_END // MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( ct486 ) +MACHINE_CONFIG_START(ct486_state::ct486) MCFG_CPU_ADD("maincpu", I486, XTAL_25MHz) MCFG_CPU_PROGRAM_MAP(ct486_map) MCFG_CPU_IO_MAP(ct486_io) diff --git a/src/mame/drivers/cubeqst.cpp b/src/mame/drivers/cubeqst.cpp index 9908bf4f8a0..9166d20ff86 100644 --- a/src/mame/drivers/cubeqst.cpp +++ b/src/mame/drivers/cubeqst.cpp @@ -86,6 +86,7 @@ public: INTERRUPT_GEN_MEMBER(vblank); TIMER_CALLBACK_MEMBER(delayed_bank_swap); void swap_linecpu_banks(); + void cubeqst(machine_config &config); }; @@ -512,7 +513,7 @@ WRITE16_MEMBER( cubeqst_state::sound_dac_w ) * *************************************/ -static MACHINE_CONFIG_START( cubeqst ) +MACHINE_CONFIG_START(cubeqst_state::cubeqst) MCFG_CPU_ADD("main_cpu", M68000, XTAL_16MHz / 2) MCFG_CPU_PROGRAM_MAP(m68k_program_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cubeqst_state, vblank) diff --git a/src/mame/drivers/cubo.cpp b/src/mame/drivers/cubo.cpp index 0c330435f5c..1f6b56a07f7 100644 --- a/src/mame/drivers/cubo.cpp +++ b/src/mame/drivers/cubo.cpp @@ -357,6 +357,7 @@ public: int m_cd32_shifter[2]; uint16_t m_potgo_value; + void cubo(machine_config &config); protected: virtual void rs232_tx(int state) override; virtual void potgo_w(uint16_t data) override; @@ -1024,7 +1025,7 @@ static INPUT_PORTS_START( mgprem11 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( cubo ) +MACHINE_CONFIG_START(cubo_state::cubo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2) diff --git a/src/mame/drivers/cultures.cpp b/src/mame/drivers/cultures.cpp index 57af8705e75..6ac70acc5dc 100644 --- a/src/mame/drivers/cultures.cpp +++ b/src/mame/drivers/cultures.cpp @@ -78,6 +78,7 @@ public: virtual void video_start() override; uint32_t screen_update_cultures(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(cultures_interrupt); + void cultures(machine_config &config); }; @@ -394,7 +395,7 @@ void cultures_state::machine_reset() -static MACHINE_CONFIG_START( cultures ) +MACHINE_CONFIG_START(cultures_state::cultures) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */ diff --git a/src/mame/drivers/cupidon.cpp b/src/mame/drivers/cupidon.cpp index dfa492d297c..2fb372186be 100644 --- a/src/mame/drivers/cupidon.cpp +++ b/src/mame/drivers/cupidon.cpp @@ -42,6 +42,7 @@ public: return -1; // or it hits an illegal opcode (sleep on the 68340?) }; + void cupidon(machine_config &config); protected: @@ -99,7 +100,7 @@ static INPUT_PORTS_START( cupidon ) INPUT_PORTS_END -static MACHINE_CONFIG_START( cupidon ) +MACHINE_CONFIG_START(cupidon_state::cupidon) MCFG_CPU_ADD("maincpu", M68340, 16000000) // The access to 3FF00 at the start would suggest this is a 68340 so probably 16 or 25 mhz? MCFG_CPU_PROGRAM_MAP(cupidon_map) diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index f9b326575f4..5ec2615f210 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/src/mame/drivers/cv1k.cpp @@ -237,6 +237,8 @@ public: uint32_t m_idleramoffs; uint32_t m_idlepc; void install_speedups(uint32_t idleramoff, uint32_t idlepc, bool is_typed); + void cv1k_d(machine_config &config); + void cv1k(machine_config &config); }; @@ -449,7 +451,7 @@ void cv1k_state::machine_reset() m_blitter->reset(); } -static MACHINE_CONFIG_START( cv1k ) +MACHINE_CONFIG_START(cv1k_state::cv1k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH3BE, XTAL_12_8MHz*8) // 102.4MHz @@ -488,7 +490,7 @@ static MACHINE_CONFIG_START( cv1k ) MCFG_EPIC12_SET_MAINRAMSIZE(0x800000) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cv1k_d, cv1k ) +MACHINE_CONFIG_DERIVED(cv1k_state::cv1k_d, cv1k) /* basic machine hardware */ MCFG_DEVICE_REMOVE("maincpu") diff --git a/src/mame/drivers/cvicny.cpp b/src/mame/drivers/cvicny.cpp index aaa9959447f..b437b631b37 100644 --- a/src/mame/drivers/cvicny.cpp +++ b/src/mame/drivers/cvicny.cpp @@ -51,6 +51,7 @@ public: DECLARE_WRITE8_MEMBER(segment_w ); uint8_t m_digit; uint8_t m_digit_last; + void cvicny(machine_config &config); }; WRITE8_MEMBER( cvicny_state::segment_w ) // output segments on the selected digit @@ -128,7 +129,7 @@ static INPUT_PORTS_START( cvicny ) INPUT_PORTS_END -static MACHINE_CONFIG_START( cvicny ) +MACHINE_CONFIG_START(cvicny_state::cvicny) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_2MHz) MCFG_CPU_PROGRAM_MAP(cvicny_mem) diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp index e8c6e278c96..322f813ee40 100644 --- a/src/mame/drivers/cvs.cpp +++ b/src/mame/drivers/cvs.cpp @@ -957,7 +957,7 @@ MACHINE_RESET_MEMBER(cvs_state,cvs) } -static MACHINE_CONFIG_START( cvs ) +MACHINE_CONFIG_START(cvs_state::cvs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, XTAL_14_31818MHz/16) diff --git a/src/mame/drivers/cxgz80.cpp b/src/mame/drivers/cxgz80.cpp index a03e4b89686..346c70996e6 100644 --- a/src/mame/drivers/cxgz80.cpp +++ b/src/mame/drivers/cxgz80.cpp @@ -90,6 +90,7 @@ public: DECLARE_WRITE8_MEMBER(ch2001_leds_w); DECLARE_READ8_MEMBER(ch2001_input_r); + void ch2001(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -392,7 +393,7 @@ INPUT_PORTS_END Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( ch2001 ) +MACHINE_CONFIG_START(cxgz80_state::ch2001) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) diff --git a/src/mame/drivers/cxhumax.cpp b/src/mame/drivers/cxhumax.cpp index 416a8c1ebc4..f039aa7e548 100644 --- a/src/mame/drivers/cxhumax.cpp +++ b/src/mame/drivers/cxhumax.cpp @@ -1053,7 +1053,7 @@ void cxhumax_state::machine_reset() memset(m_gxa_cmd_regs,0,sizeof(m_gxa_cmd_regs)); } -static MACHINE_CONFIG_START( cxhumax ) +MACHINE_CONFIG_START(cxhumax_state::cxhumax) MCFG_CPU_ADD("maincpu", ARM920T, 180000000) // CX24175 (RevC up?) MCFG_CPU_PROGRAM_MAP(cxhumax_map) diff --git a/src/mame/drivers/cyberbal.cpp b/src/mame/drivers/cyberbal.cpp index f6821f23424..e111b34fdb8 100644 --- a/src/mame/drivers/cyberbal.cpp +++ b/src/mame/drivers/cyberbal.cpp @@ -395,7 +395,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( cyberbal ) +MACHINE_CONFIG_START(cyberbal_state::cyberbal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) @@ -476,7 +476,7 @@ static MACHINE_CONFIG_START( cyberbal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cyberbalt, cyberbal ) +MACHINE_CONFIG_DERIVED(cyberbal_state::cyberbalt, cyberbal) MCFG_DEVICE_REMOVE("eeprom") MCFG_EEPROM_2816_ADD("eeprom") MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true) @@ -485,7 +485,7 @@ static MACHINE_CONFIG_DERIVED( cyberbalt, cyberbal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cyberbal2p ) +MACHINE_CONFIG_START(cyberbal_state::cyberbal2p) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp index 666695fac32..ba970356967 100644 --- a/src/mame/drivers/cybertnk.cpp +++ b/src/mame/drivers/cybertnk.cpp @@ -238,6 +238,7 @@ public: uint32_t update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int screen_shift); uint32_t screen_update_cybertnk_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_cybertnk_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void cybertnk(machine_config &config); }; /* tile format @@ -831,7 +832,7 @@ GFXDECODE_END */ -static MACHINE_CONFIG_START( cybertnk ) +MACHINE_CONFIG_START(cybertnk_state::cybertnk) MCFG_CPU_ADD("maincpu", M68000,XTAL_20MHz/2) MCFG_CPU_PROGRAM_MAP(master_mem) MCFG_CPU_VBLANK_INT_DRIVER("lscreen", cybertnk_state, irq1_line_assert) diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp index 67b986f7312..6dd01c923d8 100644 --- a/src/mame/drivers/cybiko.cpp +++ b/src/mame/drivers/cybiko.cpp @@ -384,7 +384,7 @@ static DEVICE_INPUT_DEFAULTS_START( debug_serial ) // set up debug port to defau DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( cybikov1 ) +MACHINE_CONFIG_START(cybiko_state::cybikov1) // cpu MCFG_CPU_ADD( "maincpu", H8S2241, XTAL_11_0592MHz ) MCFG_CPU_PROGRAM_MAP( cybikov1_mem ) @@ -436,7 +436,7 @@ static MACHINE_CONFIG_START( cybikov1 ) MCFG_QUICKLOAD_ADD("quickload", cybiko_state, cybiko, "bin,nv", 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cybikov2, cybikov1) +MACHINE_CONFIG_DERIVED(cybiko_state::cybikov2, cybikov1) // cpu MCFG_CPU_REPLACE("maincpu", H8S2246, XTAL_11_0592MHz) MCFG_CPU_PROGRAM_MAP(cybikov2_mem) @@ -461,7 +461,7 @@ static MACHINE_CONFIG_DERIVED( cybikov2, cybikov1) MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":debug_serial", rs232_port_device, write_txd)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cybikoxt, cybikov1) +MACHINE_CONFIG_DERIVED(cybiko_state::cybikoxt, cybikov1) // cpu MCFG_CPU_REPLACE("maincpu", H8S2323, XTAL_18_432MHz) MCFG_CPU_PROGRAM_MAP(cybikoxt_mem ) diff --git a/src/mame/drivers/cybstorm.cpp b/src/mame/drivers/cybstorm.cpp index 484aed51582..0eb86198495 100755 --- a/src/mame/drivers/cybstorm.cpp +++ b/src/mame/drivers/cybstorm.cpp @@ -232,7 +232,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( round2 ) +MACHINE_CONFIG_START(cybstorm_state::round2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_14MHz) @@ -275,7 +275,7 @@ static MACHINE_CONFIG_START( round2 ) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( cybstorm, round2 ) +MACHINE_CONFIG_DERIVED(cybstorm_state::cybstorm, round2) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/cyclemb.cpp b/src/mame/drivers/cyclemb.cpp index 65d6b3fa6fb..08a84c80eb2 100644 --- a/src/mame/drivers/cyclemb.cpp +++ b/src/mame/drivers/cyclemb.cpp @@ -144,6 +144,8 @@ public: void skydest_draw_tilemap(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void skydest_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void skydest_i8741_reset(); + void cyclemb(machine_config &config); + void skydest(machine_config &config); }; @@ -952,7 +954,7 @@ static GFXDECODE_START( cyclemb ) GFXDECODE_ENTRY( "sprite_data", 0, spritelayout_32x32, 0x00, 0x40 ) GFXDECODE_END -static MACHINE_CONFIG_START( cyclemb ) +MACHINE_CONFIG_START(cyclemb_state::cyclemb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/3) // Z8400BPS MCFG_CPU_PROGRAM_MAP(cyclemb_map) @@ -990,7 +992,7 @@ static MACHINE_CONFIG_START( cyclemb ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( skydest, cyclemb ) +MACHINE_CONFIG_DERIVED(cyclemb_state::skydest, cyclemb) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(skydest_io) diff --git a/src/mame/drivers/czk80.cpp b/src/mame/drivers/czk80.cpp index 1f91ac23027..191d6cb0f0c 100644 --- a/src/mame/drivers/czk80.cpp +++ b/src/mame/drivers/czk80.cpp @@ -72,6 +72,7 @@ public: DECLARE_WRITE_LINE_MEMBER(ctc_z0_w); DECLARE_WRITE_LINE_MEMBER(ctc_z1_w); DECLARE_WRITE_LINE_MEMBER(ctc_z2_w); + void czk80(machine_config &config); private: uint8_t m_term_data; required_device m_maincpu; @@ -187,7 +188,7 @@ void czk80_state::kbd_put(u8 data) m_term_data = data; } -static MACHINE_CONFIG_START( czk80 ) +MACHINE_CONFIG_START(czk80_state::czk80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(czk80_mem) diff --git a/src/mame/drivers/d400.cpp b/src/mame/drivers/d400.cpp index 9513fa934f6..16963d4b4b0 100644 --- a/src/mame/drivers/d400.cpp +++ b/src/mame/drivers/d400.cpp @@ -23,6 +23,7 @@ public: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void d461(machine_config &config); private: required_device m_maincpu; }; @@ -47,7 +48,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( d461 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( d461 ) +MACHINE_CONFIG_START(d400_state::d461) MCFG_CPU_ADD("maincpu", MC6809E, 4'000'000) // HD68B09EP MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp index b5ae97dbe1c..05c96b0e57d 100644 --- a/src/mame/drivers/d6800.cpp +++ b/src/mame/drivers/d6800.cpp @@ -81,6 +81,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(d6800_p); DECLARE_QUICKLOAD_LOAD_MEMBER( d6800 ); + void d6800(machine_config &config); private: uint8_t m_rtc; bool m_cb2; @@ -381,7 +382,7 @@ QUICKLOAD_LOAD_MEMBER( d6800_state, d6800 ) return result; } -static MACHINE_CONFIG_START( d6800 ) +MACHINE_CONFIG_START(d6800_state::d6800) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6800, XTAL_4MHz/4) MCFG_CPU_PROGRAM_MAP(d6800_map) diff --git a/src/mame/drivers/d6809.cpp b/src/mame/drivers/d6809.cpp index c3f05f44b22..74ad54dba89 100644 --- a/src/mame/drivers/d6809.cpp +++ b/src/mame/drivers/d6809.cpp @@ -101,6 +101,7 @@ public: DECLARE_WRITE8_MEMBER( term_w ); void kbd_put(u8 data); + void d6809(machine_config &config); private: uint8_t m_term_data; virtual void machine_reset() override; @@ -147,7 +148,7 @@ void d6809_state::machine_reset() } -static MACHINE_CONFIG_START( d6809 ) +MACHINE_CONFIG_START(d6809_state::d6809) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_14_7456MHz / 8) // MC68B09EP MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp index 947c2c7d356..130f03024c6 100644 --- a/src/mame/drivers/d9final.cpp +++ b/src/mame/drivers/d9final.cpp @@ -65,6 +65,7 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void d9final(machine_config &config); }; @@ -293,7 +294,7 @@ void d9final_state::machine_start() membank("bank1")->set_entry(0); } -static MACHINE_CONFIG_START( d9final ) +MACHINE_CONFIG_START(d9final_state::d9final) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 24000000/4)/* ? MHz */ MCFG_CPU_PROGRAM_MAP(d9final_map) diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp index 4a446ee4972..e7c949ee8a1 100644 --- a/src/mame/drivers/dacholer.cpp +++ b/src/mame/drivers/dacholer.cpp @@ -105,6 +105,8 @@ public: INTERRUPT_GEN_MEMBER(sound_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void itaten(machine_config &config); + void dacholer(machine_config &config); }; TILE_GET_INFO_MEMBER(dacholer_state::get_bg_tile_info) @@ -641,7 +643,7 @@ PALETTE_INIT_MEMBER(dacholer_state, dacholer) } /* note: clocks are taken from itaten sound reference recording */ -static MACHINE_CONFIG_START( dacholer ) +MACHINE_CONFIG_START(dacholer_state::dacholer) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/4) /* ? */ @@ -690,7 +692,7 @@ static MACHINE_CONFIG_START( dacholer ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( itaten, dacholer ) +MACHINE_CONFIG_DERIVED(dacholer_state::itaten, dacholer) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(itaten_main_map) diff --git a/src/mame/drivers/dai.cpp b/src/mame/drivers/dai.cpp index 3fa1cf8da01..929ffb834a5 100644 --- a/src/mame/drivers/dai.cpp +++ b/src/mame/drivers/dai.cpp @@ -185,7 +185,7 @@ static GFXDECODE_START( dai ) GFXDECODE_END /* machine definition */ -static MACHINE_CONFIG_START( dai ) +MACHINE_CONFIG_START(dai_state::dai) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, 2000000) MCFG_CPU_PROGRAM_MAP(dai_mem) diff --git a/src/mame/drivers/dai3wksi.cpp b/src/mame/drivers/dai3wksi.cpp index f0c0975dfe2..e1bc834f067 100644 --- a/src/mame/drivers/dai3wksi.cpp +++ b/src/mame/drivers/dai3wksi.cpp @@ -97,6 +97,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void dai3wksi(machine_config &config); }; @@ -400,7 +401,7 @@ void dai3wksi_state::machine_reset() } -static MACHINE_CONFIG_START( dai3wksi ) +MACHINE_CONFIG_START(dai3wksi_state::dai3wksi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/4) diff --git a/src/mame/drivers/dambustr.cpp b/src/mame/drivers/dambustr.cpp index ca7c0047e6a..69a6ace5f98 100644 --- a/src/mame/drivers/dambustr.cpp +++ b/src/mame/drivers/dambustr.cpp @@ -71,6 +71,7 @@ public: int m_noise_data; DECLARE_WRITE8_MEMBER(dambustr_noise_enable_w); DECLARE_DRIVER_INIT(dambustr); + void dambustr(machine_config &config); }; @@ -251,7 +252,7 @@ DRIVER_INIT_MEMBER(dambustr_state,dambustr) -static MACHINE_CONFIG_START( dambustr ) +MACHINE_CONFIG_START(dambustr_state::dambustr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(dambustr_map) diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp index 5be2e3428da..c54c9576cbb 100644 --- a/src/mame/drivers/darius.cpp +++ b/src/mame/drivers/darius.cpp @@ -698,7 +698,7 @@ void darius_state::machine_reset() } -static MACHINE_CONFIG_START( darius ) +MACHINE_CONFIG_START(darius_state::darius) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* 8 MHz */ diff --git a/src/mame/drivers/darkmist.cpp b/src/mame/drivers/darkmist.cpp index 3329aae6f7b..261335d05fa 100644 --- a/src/mame/drivers/darkmist.cpp +++ b/src/mame/drivers/darkmist.cpp @@ -237,7 +237,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(darkmist_state::scanline) -static MACHINE_CONFIG_START( darkmist ) +MACHINE_CONFIG_START(darkmist_state::darkmist) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(memmap) diff --git a/src/mame/drivers/darkseal.cpp b/src/mame/drivers/darkseal.cpp index b7d67a87326..fa0e0f82d49 100644 --- a/src/mame/drivers/darkseal.cpp +++ b/src/mame/drivers/darkseal.cpp @@ -228,7 +228,7 @@ GFXDECODE_END /******************************************************************************/ -static MACHINE_CONFIG_START( darkseal ) +MACHINE_CONFIG_START(darkseal_state::darkseal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* Custom chip 59 */ diff --git a/src/mame/drivers/daruma.cpp b/src/mame/drivers/daruma.cpp index 49e5f399621..8d3a23e437c 100644 --- a/src/mame/drivers/daruma.cpp +++ b/src/mame/drivers/daruma.cpp @@ -39,6 +39,7 @@ public: required_device m_maincpu; required_device m_speaker; char port0, port1, port2, port3; + void daruma(machine_config &config); }; WRITE8_MEMBER(daruma_state::port_w) @@ -140,7 +141,7 @@ static INPUT_PORTS_START( daruma ) INPUT_PORTS_END -static MACHINE_CONFIG_START( daruma ) +MACHINE_CONFIG_START(daruma_state::daruma) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C32,11059200) //verified on pcb MCFG_CPU_PROGRAM_MAP(mem_prg) diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp index f48ebd2658b..7c3ba5da175 100644 --- a/src/mame/drivers/dassault.cpp +++ b/src/mame/drivers/dassault.cpp @@ -511,7 +511,7 @@ DECO16IC_BANK_CB_MEMBER(dassault_state::bank_callback) return ((bank >> 4) & 0xf) << 12; } -static MACHINE_CONFIG_START( dassault ) +MACHINE_CONFIG_START(dassault_state::dassault) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* 14MHz - Accurate */ diff --git a/src/mame/drivers/datum.cpp b/src/mame/drivers/datum.cpp index cdeafa1f3d9..2738b82af5b 100644 --- a/src/mame/drivers/datum.cpp +++ b/src/mame/drivers/datum.cpp @@ -70,6 +70,7 @@ public: DECLARE_WRITE8_MEMBER(pb_w); DECLARE_INPUT_CHANGED_MEMBER(trigger_reset); DECLARE_INPUT_CHANGED_MEMBER(trigger_nmi); + void datum(machine_config &config); private: uint8_t m_keydata; virtual void machine_reset() override; @@ -176,7 +177,7 @@ WRITE8_MEMBER( datum_state::pb_w ) } -static MACHINE_CONFIG_START( datum ) +MACHINE_CONFIG_START(datum_state::datum) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6802, XTAL_4MHz) // internally divided to 1 MHz MCFG_CPU_PROGRAM_MAP(datum_mem) diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp index 099b85253cd..791eff14c39 100644 --- a/src/mame/drivers/dblcrown.cpp +++ b/src/mame/drivers/dblcrown.cpp @@ -103,6 +103,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(dblcrown_irq_scanline); DECLARE_PALETTE_INIT(dblcrown); + void dblcrown(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -592,7 +593,7 @@ It needs at least 64 instances because 0xa05b will be eventually nuked by the vb } -static MACHINE_CONFIG_START( dblcrown ) +MACHINE_CONFIG_START(dblcrown_state::dblcrown) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) diff --git a/src/mame/drivers/dblewing.cpp b/src/mame/drivers/dblewing.cpp index 8ca06f27bb5..d766e01bb31 100644 --- a/src/mame/drivers/dblewing.cpp +++ b/src/mame/drivers/dblewing.cpp @@ -123,6 +123,7 @@ public: READ16_MEMBER( wf_protection_region_0_104_r ); WRITE16_MEMBER( wf_protection_region_0_104_w ); + void dblewing(machine_config &config); private: bool m_soundlatch_pending; }; @@ -339,7 +340,7 @@ DECOSPR_PRIORITY_CB_MEMBER(dblewing_state::pri_callback) return 0; // sprites always on top? } -static MACHINE_CONFIG_START( dblewing ) +MACHINE_CONFIG_START(dblewing_state::dblewing) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* DE102 */ diff --git a/src/mame/drivers/dbox.cpp b/src/mame/drivers/dbox.cpp index bcb12cc8fd3..65124acc8cc 100644 --- a/src/mame/drivers/dbox.cpp +++ b/src/mame/drivers/dbox.cpp @@ -453,6 +453,8 @@ class dbox_state : public driver_device DECLARE_WRITE8_MEMBER(sda5708_clk); DECLARE_WRITE8_MEMBER(write_pa); + void dbox(machine_config &config); + #if LOCALFLASH DECLARE_READ16_MEMBER (sysflash_r); DECLARE_WRITE16_MEMBER (sysflash_w); @@ -595,7 +597,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( dbox ) INPUT_PORTS_END -static MACHINE_CONFIG_START( dbox ) +MACHINE_CONFIG_START(dbox_state::dbox) MCFG_CPU_ADD("maincpu", M68340, 0) // The 68340 has an internal VCO as clock source, hence need no CPU clock MCFG_MC68340_ADD_CRYSTAL(XTAL_32_768kHz) // The dbox uses the VCO and has a crystal as VCO reference and to synthesize internal clocks from MCFG_CPU_PROGRAM_MAP(dbox_map) diff --git a/src/mame/drivers/dbz.cpp b/src/mame/drivers/dbz.cpp index 45d260606a1..b7179dfd4de 100644 --- a/src/mame/drivers/dbz.cpp +++ b/src/mame/drivers/dbz.cpp @@ -325,7 +325,7 @@ void dbz_state::machine_reset() m_control = 0; } -static MACHINE_CONFIG_START( dbz ) +MACHINE_CONFIG_START(dbz_state::dbz) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp index 553657c96f5..ae4edd24093 100644 --- a/src/mame/drivers/dccons.cpp +++ b/src/mame/drivers/dccons.cpp @@ -568,13 +568,14 @@ static INPUT_PORTS_START( dc ) PORT_CONFSETTING( 0x03, "S-Video" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gdrom_config ) - MCFG_DEVICE_MODIFY("cdda") +void dc_cons_state::gdrom_config(device_t *device) +{ + device = device->subdevice("cdda"); MCFG_SOUND_ROUTE(0, "^^^^lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "^^^^rspeaker", 1.0) -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_START( dc ) +MACHINE_CONFIG_START(dc_cons_state::dc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH4LE, CPU_CLOCK) MCFG_SH4_MD0(1) diff --git a/src/mame/drivers/dcheese.cpp b/src/mame/drivers/dcheese.cpp index 0aa4dcf0fd4..b960377e4e1 100644 --- a/src/mame/drivers/dcheese.cpp +++ b/src/mame/drivers/dcheese.cpp @@ -370,7 +370,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( dcheese ) +MACHINE_CONFIG_START(dcheese_state::dcheese) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MAIN_OSC) @@ -411,7 +411,7 @@ static MACHINE_CONFIG_START( dcheese ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fredmem, dcheese ) +MACHINE_CONFIG_DERIVED(dcheese_state::fredmem, dcheese) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 359, 0, 239) MACHINE_CONFIG_END diff --git a/src/mame/drivers/dcon.cpp b/src/mame/drivers/dcon.cpp index bd14b6c1145..a88536d352e 100644 --- a/src/mame/drivers/dcon.cpp +++ b/src/mame/drivers/dcon.cpp @@ -273,7 +273,7 @@ WRITE16_MEMBER( dcon_state::layer_scroll_w ) /******************************************************************************/ -static MACHINE_CONFIG_START( dcon ) +MACHINE_CONFIG_START(dcon_state::dcon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) @@ -317,7 +317,7 @@ static MACHINE_CONFIG_START( dcon ) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sdgndmps ) /* PCB number is PB91008 */ +MACHINE_CONFIG_START(dcon_state::sdgndmps) /* PCB number is PB91008 */ /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) diff --git a/src/mame/drivers/dct11em.cpp b/src/mame/drivers/dct11em.cpp index 3420130780a..25f518a915f 100644 --- a/src/mame/drivers/dct11em.cpp +++ b/src/mame/drivers/dct11em.cpp @@ -23,6 +23,7 @@ public: virtual void video_start() override; uint32_t screen_update_dct11em(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void dct11em(machine_config &config); }; static ADDRESS_MAP_START( dct11em_mem, AS_PROGRAM, 16, dct11em_state ) @@ -51,7 +52,7 @@ uint32_t dct11em_state::screen_update_dct11em(screen_device &screen, bitmap_ind1 } -static MACHINE_CONFIG_START( dct11em ) +MACHINE_CONFIG_START(dct11em_state::dct11em) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",T11, 7500000) // 7.5MHz XTAL MCFG_T11_INITIAL_MODE(0x1403) /* according to specs */ diff --git a/src/mame/drivers/dday.cpp b/src/mame/drivers/dday.cpp index 84723b93e8d..eb517f4f969 100644 --- a/src/mame/drivers/dday.cpp +++ b/src/mame/drivers/dday.cpp @@ -253,7 +253,7 @@ void dday_state::machine_reset() } -static MACHINE_CONFIG_START( dday ) +MACHINE_CONFIG_START(dday_state::dday) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */ diff --git a/src/mame/drivers/ddayjlc.cpp b/src/mame/drivers/ddayjlc.cpp index dd34b26f4c5..436d2cec3a3 100644 --- a/src/mame/drivers/ddayjlc.cpp +++ b/src/mame/drivers/ddayjlc.cpp @@ -123,6 +123,7 @@ public: uint32_t screen_update_ddayjlc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(ddayjlc_interrupt); INTERRUPT_GEN_MEMBER(ddayjlc_snd_interrupt); + void ddayjlc(machine_config &config); }; @@ -510,7 +511,7 @@ PALETTE_INIT_MEMBER(ddayjlc_state, ddayjlc) } } -static MACHINE_CONFIG_START( ddayjlc ) +MACHINE_CONFIG_START(ddayjlc_state::ddayjlc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/3) diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp index df1e7fb2938..10bec2366d2 100644 --- a/src/mame/drivers/ddealer.cpp +++ b/src/mame/drivers/ddealer.cpp @@ -173,6 +173,7 @@ public: INTERRUPT_GEN_MEMBER(interrupt); TIMER_DEVICE_CALLBACK_MEMBER(mcu_sim); void draw_video_layer(uint16_t* vreg_base, uint16_t* top, uint16_t* bottom, bitmap_ind16 &bitmap, const rectangle &cliprect, int flipy); + void ddealer(machine_config &config); }; @@ -616,7 +617,7 @@ INTERRUPT_GEN_MEMBER(ddealer_state::interrupt) device.execute().set_input_line(4, HOLD_LINE); } -static MACHINE_CONFIG_START( ddealer ) +MACHINE_CONFIG_START(ddealer_state::ddealer) MCFG_CPU_ADD("maincpu" , M68000, XTAL_16MHz/2) /* 8MHz */ MCFG_CPU_PROGRAM_MAP(ddealer) diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp index 3531b5cb765..8f813152cc1 100644 --- a/src/mame/drivers/ddenlovr.cpp +++ b/src/mame/drivers/ddenlovr.cpp @@ -451,6 +451,41 @@ public: void mmpanic_update_leds(); void mjchuuka_get_romdata(); uint8_t hgokou_player_r( int player ); + void mjmywrld(machine_config &config); + void mjmyster(machine_config &config); + void mmpanic(machine_config &config); + void nettoqc(machine_config &config); + void mjmyornt(machine_config &config); + void kotbinsp(machine_config &config); + void mjgnight(machine_config &config); + void ddenlovrk(machine_config &config); + void quizchq(machine_config &config); + void mjmyuniv(machine_config &config); + void dtoyoken(machine_config &config); + void hgokou(machine_config &config); + void seljan2(machine_config &config); + void janshinp(machine_config &config); + void hkagerou(machine_config &config); + void ultrchmp(machine_config &config); + void rongrong(machine_config &config); + void mjflove(machine_config &config); + void hanakanz(machine_config &config); + void jongtei(machine_config &config); + void akamaru(machine_config &config); + void mjchuuka(machine_config &config); + void hparadis(machine_config &config); + void mjreach1(machine_config &config); + void ddenlovr(machine_config &config); + void funkyfig(machine_config &config); + void hginga(machine_config &config); + void daimyojn(machine_config &config); + void htengoku(machine_config &config); + void sryudens(machine_config &config); + void hgokbang(machine_config &config); + void quiz365(machine_config &config); + void kotbinyo(machine_config &config); + void mjschuka(machine_config &config); + void ddenlovj(machine_config &config); }; VIDEO_START_MEMBER(ddenlovr_state,ddenlovr) @@ -4262,7 +4297,7 @@ static ADDRESS_MAP_START( htengoku_banked_map, AS_PROGRAM, 8, dynax_state ) AM_RANGE(0x80000, 0x801ff) AM_WRITE(tenkai_palette_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START( htengoku ) +MACHINE_CONFIG_START(ddenlovr_state::htengoku) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,20000000 / 4) @@ -9608,7 +9643,7 @@ MACHINE_START_MEMBER(ddenlovr_state,sryudens) Don Den Lover Vol.1 ***************************************************************************/ -static MACHINE_CONFIG_START( ddenlovr ) +MACHINE_CONFIG_START(ddenlovr_state::ddenlovr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000, XTAL_24MHz / 2) @@ -9653,7 +9688,7 @@ static MACHINE_CONFIG_START( ddenlovr ) MCFG_DEVICE_ADD("rtc", RTC72421, XTAL_32_768kHz) // internal oscillator MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ddenlovj, ddenlovr ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::ddenlovj, ddenlovr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -9665,19 +9700,19 @@ static MACHINE_CONFIG_DERIVED( ddenlovj, ddenlovr ) MCFG_DEVICE_REPLACE("rtc", RTC62421, XTAL_32_768kHz) // internal oscillator MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ddenlovrk, ddenlovr ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::ddenlovrk, ddenlovr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(ddenlovrk_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( akamaru, ddenlovr ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::akamaru, ddenlovr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(akamaru_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quiz365, ddenlovj ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::quiz365, ddenlovj) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -9695,14 +9730,14 @@ static MACHINE_CONFIG_DERIVED( quiz365, ddenlovj ) MCFG_DEVICE_REPLACE("rtc", MSM6242, XTAL_32_768kHz) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nettoqc, ddenlovj ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::nettoqc, ddenlovj) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(nettoqc_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ultrchmp, ddenlovr ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::ultrchmp, ddenlovr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -9742,7 +9777,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::quizchq_rtc_irq ) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xfc); } -static MACHINE_CONFIG_START( quizchq ) +MACHINE_CONFIG_START(ddenlovr_state::quizchq) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* Verified */ @@ -9781,7 +9816,7 @@ static MACHINE_CONFIG_START( quizchq ) MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, quizchq_rtc_irq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rongrong, quizchq ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::rongrong, quizchq) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -9821,7 +9856,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::mmpanic_rtc_irq ) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xdf); // RST 18, clock } -static MACHINE_CONFIG_START( mmpanic ) +MACHINE_CONFIG_START(ddenlovr_state::mmpanic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 8000000) @@ -9905,7 +9940,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::hanakanz_rtc_irq) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xe2); } -static MACHINE_CONFIG_START( hanakanz ) +MACHINE_CONFIG_START(ddenlovr_state::hanakanz) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,8000000) // TMPZ84C015BF-8 @@ -9944,14 +9979,14 @@ static MACHINE_CONFIG_START( hanakanz ) MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hanakanz_rtc_irq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hkagerou, hanakanz ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::hkagerou, hanakanz) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(hkagerou_portmap) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( kotbinyo ) +MACHINE_CONFIG_START(ddenlovr_state::kotbinyo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2) // !! KL5C80A12CFP @ 10MHz? (actually 4 times faster than Z80) !! @@ -9990,7 +10025,7 @@ static MACHINE_CONFIG_START( kotbinyo ) // MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hanakanz_rtc_irq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kotbinsp, kotbinyo ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::kotbinsp, kotbinyo) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -9998,7 +10033,7 @@ static MACHINE_CONFIG_DERIVED( kotbinsp, kotbinyo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjreach1, hanakanz ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::mjreach1, hanakanz) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -10037,7 +10072,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::mjchuuka_rtc_irq) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xfa); } -static MACHINE_CONFIG_DERIVED( mjchuuka, hanakanz ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::mjchuuka, hanakanz) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -10052,7 +10087,7 @@ static MACHINE_CONFIG_DERIVED( mjchuuka, hanakanz ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( funkyfig, mmpanic ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::funkyfig, mmpanic) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(funkyfig_map) MCFG_CPU_IO_MAP(funkyfig_portmap) @@ -10074,7 +10109,7 @@ MACHINE_CONFIG_END Mahjong Super Dai Chuuka Ken ***************************************************************************/ -static MACHINE_CONFIG_START( mjschuka ) +MACHINE_CONFIG_START(ddenlovr_state::mjschuka) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,XTAL_16MHz/2) @@ -10163,7 +10198,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::mjmyster_rtc_irq) } -static MACHINE_CONFIG_DERIVED( mjmyster, quizchq ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::mjmyster, quizchq) /* basic machine hardware */ MCFG_DEVICE_REMOVE("maincpu") @@ -10218,7 +10253,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::hginga_rtc_irq) } -static MACHINE_CONFIG_DERIVED( hginga, quizchq ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::hginga, quizchq) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -10237,7 +10272,7 @@ static MACHINE_CONFIG_DERIVED( hginga, quizchq ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hgokou, quizchq ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::hgokou, quizchq) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -10256,7 +10291,7 @@ static MACHINE_CONFIG_DERIVED( hgokou, quizchq ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hgokbang, hgokou ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::hgokbang, hgokou) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -10264,7 +10299,7 @@ static MACHINE_CONFIG_DERIVED( hgokbang, hgokou ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjmywrld, mjmyster ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::mjmywrld, mjmyster) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -10272,7 +10307,7 @@ static MACHINE_CONFIG_DERIVED( mjmywrld, mjmyster ) MCFG_CPU_IO_MAP(mjmywrld_portmap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjmyuniv, quizchq ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::mjmyuniv, quizchq) /* basic machine hardware */ MCFG_DEVICE_REMOVE("maincpu") @@ -10292,7 +10327,7 @@ static MACHINE_CONFIG_DERIVED( mjmyuniv, quizchq ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjmyornt, quizchq ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::mjmyornt, quizchq) /* basic machine hardware */ MCFG_DEVICE_REMOVE("maincpu") @@ -10329,7 +10364,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::mjflove_rtc_irq) } -static MACHINE_CONFIG_DERIVED( mjflove, quizchq ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::mjflove, quizchq) /* basic machine hardware */ MCFG_DEVICE_REMOVE("maincpu") @@ -10357,7 +10392,7 @@ INTERRUPT_GEN_MEMBER(ddenlovr_state::hparadis_irq) device.execute().set_input_line_and_vector(0, HOLD_LINE, 0xee); } -static MACHINE_CONFIG_DERIVED( hparadis, quizchq ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::hparadis, quizchq) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -10370,7 +10405,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( jongtei ) +MACHINE_CONFIG_START(ddenlovr_state::jongtei) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2) // TMPZ84C015 @@ -10409,7 +10444,7 @@ static MACHINE_CONFIG_START( jongtei ) MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hanakanz_rtc_irq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjgnight, jongtei ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::mjgnight, jongtei) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(mjgnight_portmap) @@ -10422,7 +10457,7 @@ MACHINE_CONFIG_END Mahjong Seiryu Densetsu ***************************************************************************/ -static MACHINE_CONFIG_START( sryudens ) +MACHINE_CONFIG_START(ddenlovr_state::sryudens) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 2) // ? @@ -10469,7 +10504,7 @@ MACHINE_CONFIG_END ***************************************************************************/ // PCB: NM7001004 -static MACHINE_CONFIG_START( janshinp ) +MACHINE_CONFIG_START(ddenlovr_state::janshinp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 2) @@ -10512,7 +10547,7 @@ static MACHINE_CONFIG_START( janshinp ) MACHINE_CONFIG_END // Same PCB as janshinp -static MACHINE_CONFIG_DERIVED( dtoyoken, janshinp ) +MACHINE_CONFIG_DERIVED(ddenlovr_state::dtoyoken, janshinp) MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove) // blitter commands in the roms are shuffled around MACHINE_CONFIG_END @@ -10536,7 +10571,7 @@ MACHINE_START_MEMBER(ddenlovr_state,seljan2) MACHINE_START_CALL_MEMBER(ddenlovr); } -static MACHINE_CONFIG_START( seljan2 ) +MACHINE_CONFIG_START(ddenlovr_state::seljan2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 2) @@ -10586,7 +10621,7 @@ MACHINE_CONFIG_END ***************************************************************************/ -static MACHINE_CONFIG_START( daimyojn ) +MACHINE_CONFIG_START(ddenlovr_state::daimyojn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2) diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp index 8d2a127dde0..9c2b556744b 100644 --- a/src/mame/drivers/ddragon.cpp +++ b/src/mame/drivers/ddragon.cpp @@ -936,7 +936,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( ddragon ) +MACHINE_CONFIG_START(ddragon_state::ddragon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK) /* 12 MHz / 4 internally */ @@ -989,7 +989,7 @@ static MACHINE_CONFIG_START( ddragon ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ddragonb, ddragon ) +MACHINE_CONFIG_DERIVED(ddragon_state::ddragonb, ddragon) /* basic machine hardware */ MCFG_CPU_REPLACE("sub", M6809, MAIN_CLOCK / 8) /* 1.5MHz */ @@ -997,7 +997,7 @@ static MACHINE_CONFIG_DERIVED( ddragonb, ddragon ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ddragonba, ddragon ) +MACHINE_CONFIG_DERIVED(ddragon_state::ddragonba, ddragon) /* basic machine hardware */ MCFG_CPU_REPLACE("sub", M6803, MAIN_CLOCK / 2) /* 6MHz / 4 internally */ @@ -1006,7 +1006,7 @@ static MACHINE_CONFIG_DERIVED( ddragonba, ddragon ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ddragon6809 ) +MACHINE_CONFIG_START(ddragon_state::ddragon6809) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CLOCK / 8) /* 1.5 MHz */ @@ -1059,7 +1059,7 @@ static MACHINE_CONFIG_START( ddragon6809 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ddragon2 ) +MACHINE_CONFIG_START(ddragon_state::ddragon2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK) /* 12 MHz / 4 internally */ @@ -1105,7 +1105,7 @@ static MACHINE_CONFIG_START( ddragon2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( darktowr, ddragon ) +MACHINE_CONFIG_DERIVED(darktowr_state::darktowr, ddragon) /* basic machine hardware */ MCFG_CPU_ADD("mcu", M68705P3, XTAL_4MHz) @@ -1115,7 +1115,7 @@ static MACHINE_CONFIG_DERIVED( darktowr, ddragon ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( toffy, ddragon ) +MACHINE_CONFIG_DERIVED(toffy_state::toffy, ddragon) /* basic machine hardware */ MCFG_DEVICE_REMOVE("sub") diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp index accead64048..bf41269c3b0 100644 --- a/src/mame/drivers/ddragon3.cpp +++ b/src/mame/drivers/ddragon3.cpp @@ -814,7 +814,7 @@ void ddragon3_state::machine_reset() m_bg_tilebase = 0; } -static MACHINE_CONFIG_START( ddragon3 ) +MACHINE_CONFIG_START(ddragon3_state::ddragon3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2) @@ -853,7 +853,7 @@ static MACHINE_CONFIG_START( ddragon3 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ddragon3b, ddragon3 ) +MACHINE_CONFIG_DERIVED(ddragon3_state::ddragon3b, ddragon3) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(dd3b_map) @@ -862,7 +862,7 @@ static MACHINE_CONFIG_DERIVED( ddragon3b, ddragon3 ) MCFG_SCREEN_VBLANK_CALLBACK(NOOP) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ctribe, ddragon3 ) +MACHINE_CONFIG_DERIVED(ddragon3_state::ctribe, ddragon3) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(ctribe_map) @@ -889,7 +889,7 @@ static MACHINE_CONFIG_DERIVED( ctribe, ddragon3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wwfwfest ) +MACHINE_CONFIG_START(wwfwfest_state::wwfwfest) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 24 crystal, 12 rated chip */ @@ -927,7 +927,7 @@ static MACHINE_CONFIG_START( wwfwfest ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wwfwfstb, wwfwfest ) +MACHINE_CONFIG_DERIVED(wwfwfest_state::wwfwfstb, wwfwfest) MCFG_VIDEO_START_OVERRIDE(wwfwfest_state,wwfwfstb) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp index b1c62fd855b..55dea17f9ec 100644 --- a/src/mame/drivers/ddribble.cpp +++ b/src/mame/drivers/ddribble.cpp @@ -256,7 +256,7 @@ void ddribble_state::machine_reset() m_charbank[1] = 0; } -static MACHINE_CONFIG_START( ddribble ) +MACHINE_CONFIG_START(ddribble_state::ddribble) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_18_432MHz/12) /* verified on pcb */ diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp index 1a458e877fa..3a6f0bb195b 100644 --- a/src/mame/drivers/de_2.cpp +++ b/src/mame/drivers/de_2.cpp @@ -53,6 +53,11 @@ public: m_sample_bank(*this, "sample_bank") { } + void de_bg_audio(machine_config &config); + void de_type2(machine_config &config); + void de_type1(machine_config &config); + void de_type2_alpha3(machine_config &config); + void de_type3(machine_config &config); protected: // devices @@ -518,7 +523,7 @@ WRITE8_MEMBER(de_2_state::lamps_w) } -static MACHINE_CONFIG_START( de_bg_audio ) +MACHINE_CONFIG_START(de_2_state::de_bg_audio) /* sound CPU */ MCFG_CPU_ADD("audiocpu", MC6809E, XTAL_8MHz / 4) // MC68B09E MCFG_CPU_PROGRAM_MAP(de_2_audio_map) @@ -535,7 +540,7 @@ static MACHINE_CONFIG_START( de_bg_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( de_type1 ) +MACHINE_CONFIG_START(de_2_state::de_type1) /* basic machine hardware */ MCFG_DECOCPU_TYPE1_ADD("decocpu", XTAL_8MHz / 2, ":maincpu") MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,display_w)) @@ -551,7 +556,7 @@ static MACHINE_CONFIG_START( de_type1 ) MCFG_FRAGMENT_ADD(de_bg_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( de_type2 ) +MACHINE_CONFIG_START(de_2_state::de_type2) /* basic machine hardware */ MCFG_DECOCPU_TYPE2_ADD("decocpu", XTAL_8MHz / 2, ":maincpu") MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,display_w)) @@ -567,7 +572,7 @@ static MACHINE_CONFIG_START( de_type2 ) MCFG_FRAGMENT_ADD(de_bg_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( de_type2_alpha3 ) +MACHINE_CONFIG_START(de_2_state::de_type2_alpha3) /* basic machine hardware */ MCFG_DECOCPU_TYPE2_ADD("decocpu", XTAL_8MHz / 2, ":maincpu") MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,type2alpha3_display_w)) @@ -583,7 +588,7 @@ static MACHINE_CONFIG_START( de_type2_alpha3 ) MCFG_FRAGMENT_ADD(de_bg_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( de_type3 ) +MACHINE_CONFIG_START(de_2_state::de_type3) /* basic machine hardware */ MCFG_DECOCPU_TYPE3_ADD("decocpu", XTAL_8MHz / 2, ":maincpu") MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,alpha3_display_w)) diff --git a/src/mame/drivers/de_3.cpp b/src/mame/drivers/de_3.cpp index 1101e44e18c..c01357dc06f 100644 --- a/src/mame/drivers/de_3.cpp +++ b/src/mame/drivers/de_3.cpp @@ -77,6 +77,9 @@ public: DECLARE_WRITE8_MEMBER(display_w); DECLARE_WRITE8_MEMBER(lamps_w); + void de_3(machine_config &config); + void de_3_dmd1(machine_config &config); + void de_3_dmd2(machine_config &config); protected: // driver_device overrides @@ -391,7 +394,7 @@ DRIVER_INIT_MEMBER(de_3_state,de_3) { } -static MACHINE_CONFIG_START( de_3 ) +MACHINE_CONFIG_START(de_3_state::de_3) /* basic machine hardware */ MCFG_DECOCPU_TYPE3_ADD("decocpu",XTAL_8MHz / 2, ":maincpu") MCFG_DECOCPU_DISPLAY(READ8(de_3_state,display_r),WRITE8(de_3_state,display_w)) @@ -406,11 +409,11 @@ static MACHINE_CONFIG_START( de_3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( de_3_dmd2, de_3 ) +MACHINE_CONFIG_DERIVED(de_3_state::de_3_dmd2, de_3) MCFG_DECODMD_TYPE2_ADD("decodmd2",":gfx3") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( de_3_dmd1, de_3 ) +MACHINE_CONFIG_DERIVED(de_3_state::de_3_dmd1, de_3) MCFG_DECODMD_TYPE1_ADD("decodmd1",":gfx3") MACHINE_CONFIG_END diff --git a/src/mame/drivers/de_3b.cpp b/src/mame/drivers/de_3b.cpp index c313f83c317..916ed34fc4e 100644 --- a/src/mame/drivers/de_3b.cpp +++ b/src/mame/drivers/de_3b.cpp @@ -13,11 +13,11 @@ #include "machine/nvram.h" extern const char layout_pinball[]; -class de_3b_state : public driver_device +class de_3b_state : public genpin_class { public: de_3b_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + : genpin_class(mconfig, type, tag), m_decobsmt(*this, "decobsmt"), m_dmdtype3(*this, "decodmd") { } @@ -41,6 +41,8 @@ public: DECLARE_WRITE8_MEMBER(display_w); DECLARE_WRITE8_MEMBER(lamps_w); + void detest(machine_config &config); + void de_3b(machine_config &config); protected: // driver_device overrides @@ -239,7 +241,7 @@ DRIVER_INIT_MEMBER(de_3b_state,de_3b) { } -static MACHINE_CONFIG_START( de_3b ) +MACHINE_CONFIG_START(de_3b_state::de_3b) /* basic machine hardware */ MCFG_DECOCPU_TYPE3B_ADD("decocpu",XTAL_8MHz / 2, ":maincpu") MCFG_DECOCPU_DISPLAY(READ8(de_3b_state,display_r),WRITE8(de_3b_state,display_w)) @@ -257,7 +259,7 @@ static MACHINE_CONFIG_START( de_3b ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( detest ) +MACHINE_CONFIG_START(de_3b_state::detest) /* basic machine hardware */ MCFG_DECOCPU_TYPE3B_ADD("decocpu",XTAL_8MHz / 2, ":maincpu") diff --git a/src/mame/drivers/deadang.cpp b/src/mame/drivers/deadang.cpp index abbdda051c0..5c89586f9ad 100644 --- a/src/mame/drivers/deadang.cpp +++ b/src/mame/drivers/deadang.cpp @@ -265,7 +265,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(deadang_state::sub_scanline) /* Machine Drivers */ -static MACHINE_CONFIG_START( deadang ) +MACHINE_CONFIG_START(deadang_state::deadang) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */ diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp index be9655a385d..be8313d297a 100644 --- a/src/mame/drivers/dec0.cpp +++ b/src/mame/drivers/dec0.cpp @@ -1599,7 +1599,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( dec0_base ) +MACHINE_CONFIG_START(dec0_state::dec0_base) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1632,7 +1632,7 @@ static MACHINE_CONFIG_START( dec0_base ) MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dec0, dec0_base ) +MACHINE_CONFIG_DERIVED(dec0_state::dec0, dec0_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2) @@ -1666,7 +1666,7 @@ static MACHINE_CONFIG_DERIVED( dec0, dec0_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dec1, dec0_base ) +MACHINE_CONFIG_DERIVED(dec0_state::dec1, dec0_base) /* basic machine hardware */ /* maincpu and audiocpu clocks and address maps differ per game */ @@ -1722,7 +1722,7 @@ WRITE_LINE_MEMBER(dec0_automat_state::msm2_vclk_cb) } -static MACHINE_CONFIG_START( automat ) +MACHINE_CONFIG_START(dec0_automat_state::automat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) @@ -1797,7 +1797,7 @@ static MACHINE_CONFIG_START( automat ) MACHINE_CONFIG_END // this seems very similar to the automat bootleg -static MACHINE_CONFIG_START( secretab ) +MACHINE_CONFIG_START(dec0_automat_state::secretab) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ @@ -1869,7 +1869,7 @@ static MACHINE_CONFIG_START( secretab ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hbarrel, dec0 ) +MACHINE_CONFIG_DERIVED(dec0_state::hbarrel, dec0) MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz) MCFG_CPU_IO_MAP(mcu_io_map) @@ -1879,7 +1879,7 @@ static MACHINE_CONFIG_DERIVED( hbarrel, dec0 ) MCFG_SCREEN_UPDATE_DRIVER(dec0_state, screen_update_hbarrel) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( baddudes, dec0 ) +MACHINE_CONFIG_DERIVED(dec0_state::baddudes, dec0) MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz) MCFG_CPU_IO_MAP(mcu_io_map) @@ -1889,21 +1889,21 @@ static MACHINE_CONFIG_DERIVED( baddudes, dec0 ) MCFG_SCREEN_UPDATE_DRIVER(dec0_state, screen_update_baddudes) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( drgninjab, dec0 ) +MACHINE_CONFIG_DERIVED(dec0_state::drgninjab, dec0) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(dec0_state, screen_update_baddudes) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( birdtry, dec0 ) +MACHINE_CONFIG_DERIVED(dec0_state::birdtry, dec0) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(dec0_state, screen_update_birdtry) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( robocop, dec0 ) +MACHINE_CONFIG_DERIVED(dec0_state::robocop, dec0) MCFG_CPU_ADD("sub", H6280, XTAL_21_4772MHz / 16) MCFG_CPU_PROGRAM_MAP(robocop_sub_map) @@ -1915,14 +1915,14 @@ static MACHINE_CONFIG_DERIVED( robocop, dec0 ) MCFG_SCREEN_UPDATE_DRIVER(dec0_state, screen_update_robocop) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( robocopb, dec0 ) +MACHINE_CONFIG_DERIVED(dec0_state::robocopb, dec0) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(dec0_state, screen_update_robocop) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hippodrm, dec0 ) +MACHINE_CONFIG_DERIVED(dec0_state::hippodrm, dec0) MCFG_CPU_ADD("sub", H6280, XTAL_21_4772MHz / 16) MCFG_CPU_PROGRAM_MAP(hippodrm_sub_map) @@ -1934,7 +1934,7 @@ static MACHINE_CONFIG_DERIVED( hippodrm, dec0 ) MCFG_SCREEN_UPDATE_DRIVER(dec0_state, screen_update_hippodrm) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ffantasybl, dec0 ) +MACHINE_CONFIG_DERIVED(dec0_state::ffantasybl, dec0) // MCFG_CPU_ADD("sub", H6280, XTAL_21_4772MHz / 16) // MCFG_CPU_PROGRAM_MAP(hippodrm_sub_map) @@ -1955,7 +1955,7 @@ MACHINE_RESET_MEMBER(dec0_state,slyspy) m_sndprotect->set_bank(m_slyspy_sound_state); } -static MACHINE_CONFIG_DERIVED( slyspy, dec1 ) +MACHINE_CONFIG_DERIVED(dec0_state::slyspy, dec1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ @@ -1988,7 +1988,7 @@ static MACHINE_CONFIG_DERIVED( slyspy, dec1 ) MCFG_MACHINE_RESET_OVERRIDE(dec0_state,slyspy) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( midres, dec1 ) +MACHINE_CONFIG_DERIVED(dec0_state::midres, dec1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ @@ -2005,7 +2005,7 @@ static MACHINE_CONFIG_DERIVED( midres, dec1 ) MCFG_GFXDECODE_MODIFY("gfxdecode", midres) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( midresb, midres ) +MACHINE_CONFIG_DERIVED(dec0_state::midresb, midres) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(midresb_map) @@ -2031,7 +2031,7 @@ static MACHINE_CONFIG_DERIVED( midresb, midres ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( midresbj, midresb ) +MACHINE_CONFIG_DERIVED(dec0_state::midresbj, midresb) MCFG_DEVICE_REMOVE("mcu") MACHINE_CONFIG_END diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp index 986bcb68b2c..7172a1ab71f 100644 --- a/src/mame/drivers/dec8.cpp +++ b/src/mame/drivers/dec8.cpp @@ -1954,7 +1954,7 @@ void dec8_state::machine_reset() MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz/2,384,0,256,272,8,248) -static MACHINE_CONFIG_START( lastmisn ) +MACHINE_CONFIG_START(dec8_state::lastmisn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, 2000000) @@ -2007,7 +2007,7 @@ static MACHINE_CONFIG_START( lastmisn ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( shackled ) +MACHINE_CONFIG_START(dec8_state::shackled) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, 2000000) @@ -2061,7 +2061,7 @@ static MACHINE_CONFIG_START( shackled ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gondo ) +MACHINE_CONFIG_START(dec8_state::gondo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP */ @@ -2115,7 +2115,7 @@ static MACHINE_CONFIG_START( gondo ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( garyoret ) +MACHINE_CONFIG_START(dec8_state::garyoret) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP */ @@ -2169,7 +2169,7 @@ static MACHINE_CONFIG_START( garyoret ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ghostb ) +MACHINE_CONFIG_START(dec8_state::ghostb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) @@ -2225,12 +2225,12 @@ static MACHINE_CONFIG_START( ghostb ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( meikyuh, ghostb ) +MACHINE_CONFIG_DERIVED(dec8_state::meikyuh, ghostb) MCFG_CPU_REPLACE("audiocpu", M6502, 1500000) MCFG_CPU_PROGRAM_MAP(dec8_s_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( csilver ) +MACHINE_CONFIG_START(dec8_state::csilver) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_12MHz/8) /* verified on pcb */ @@ -2289,7 +2289,7 @@ static MACHINE_CONFIG_START( csilver ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.88) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( oscar ) +MACHINE_CONFIG_START(dec8_state::oscar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309, XTAL_12MHz/2) /* verified on pcb */ @@ -2347,7 +2347,7 @@ static MACHINE_CONFIG_START( oscar ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( srdarwin ) +MACHINE_CONFIG_START(dec8_state::srdarwin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, 2000000) /* MC68A09EP */ @@ -2397,7 +2397,7 @@ static MACHINE_CONFIG_START( srdarwin ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cobracom ) +MACHINE_CONFIG_START(dec8_state::cobracom) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, 2000000) diff --git a/src/mame/drivers/deco156.cpp b/src/mame/drivers/deco156.cpp index 7464130722c..66f65c196d8 100644 --- a/src/mame/drivers/deco156.cpp +++ b/src/mame/drivers/deco156.cpp @@ -68,6 +68,8 @@ public: void descramble_sound( const char *tag ); DECO16IC_BANK_CB_MEMBER(bank_callback); DECOSPR_PRIORITY_CB_MEMBER(pri_callback); + void hvysmsh(machine_config &config); + void wcvol95(machine_config &config); }; @@ -317,7 +319,7 @@ DECOSPR_PRIORITY_CB_MEMBER(deco156_state::pri_callback) return 0; } -static MACHINE_CONFIG_START( hvysmsh ) +MACHINE_CONFIG_START(deco156_state::hvysmsh) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM, 28000000) /* Unconfirmed */ @@ -369,7 +371,7 @@ static MACHINE_CONFIG_START( hvysmsh ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wcvol95 ) +MACHINE_CONFIG_START(deco156_state::wcvol95) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM, 28000000) /* Unconfirmed */ diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp index cf66b1d7371..056e94999cd 100644 --- a/src/mame/drivers/deco32.cpp +++ b/src/mame/drivers/deco32.cpp @@ -1850,7 +1850,7 @@ GFXDECODE_END // MACHINE DEFINITIONS //************************************************************************** -static MACHINE_CONFIG_START( captaven ) +MACHINE_CONFIG_START(captaven_state::captaven) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM, XTAL_28MHz/4) /* verified on pcb (Data East 101 custom)*/ @@ -1935,7 +1935,7 @@ static MACHINE_CONFIG_START( captaven ) MACHINE_CONFIG_END // DE-0380-2 -static MACHINE_CONFIG_START( fghthist ) +MACHINE_CONFIG_START(fghthist_state::fghthist) MCFG_CPU_ADD("maincpu", ARM, XTAL_28MHz / 4) MCFG_CPU_PROGRAM_MAP(fghthist_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert) @@ -2017,7 +2017,7 @@ static MACHINE_CONFIG_START( fghthist ) MACHINE_CONFIG_END // DE-0395-1 -static MACHINE_CONFIG_DERIVED( fghthsta, fghthist ) +MACHINE_CONFIG_DERIVED(fghthist_state::fghthsta, fghthist) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(fghthsta_memmap) @@ -2031,7 +2031,7 @@ static MACHINE_CONFIG_DERIVED( fghthsta, fghthist ) MACHINE_CONFIG_END // DE-0396-0 -static MACHINE_CONFIG_DERIVED( fghthistu, fghthsta ) +MACHINE_CONFIG_DERIVED(fghthist_state::fghthistu, fghthsta) MCFG_DEVICE_REMOVE("audiocpu") MCFG_CPU_ADD("audiocpu", Z80, XTAL_32_22MHz / 9) @@ -2051,7 +2051,7 @@ static MACHINE_CONFIG_DERIVED( fghthistu, fghthsta ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.40) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dragngun ) +MACHINE_CONFIG_START(dragngun_state::dragngun) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM, XTAL_28MHz / 4) @@ -2153,7 +2153,7 @@ static MACHINE_CONFIG_START( dragngun ) MCFG_LC7535_VOLUME_CB(dragngun_state, volume_gun_changed) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lockloadu, dragngun ) +MACHINE_CONFIG_DERIVED(dragngun_state::lockloadu, dragngun) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(lockloadu_map) @@ -2164,7 +2164,7 @@ static MACHINE_CONFIG_DERIVED( lockloadu, dragngun ) MCFG_DECO16IC_WIDTH12(0) // lockload definitely wants pf34 half width.. MACHINE_CONFIG_END -static MACHINE_CONFIG_START( lockload ) +MACHINE_CONFIG_START(dragngun_state::lockload) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM, XTAL_28MHz / 4) @@ -2271,7 +2271,7 @@ static MACHINE_CONFIG_START( lockload ) MCFG_LC7535_VOLUME_CB(dragngun_state, volume_gun_changed) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tattass ) +MACHINE_CONFIG_START(nslasher_state::tattass) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM, 28000000/4) // unconfirmed @@ -2338,7 +2338,7 @@ static MACHINE_CONFIG_START( tattass ) MCFG_DECOBSMT_ADD(DECOBSMT_TAG) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( nslasher ) +MACHINE_CONFIG_START(nslasher_state::nslasher) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM, XTAL_28_322MHz / 4) @@ -2429,7 +2429,7 @@ static MACHINE_CONFIG_START( nslasher ) MACHINE_CONFIG_END // the US release uses a H6280 instead of a Z80, much like Lock 'n' Loaded -static MACHINE_CONFIG_DERIVED( nslasheru, nslasher ) +MACHINE_CONFIG_DERIVED(nslasher_state::nslasheru, nslasher) MCFG_CPU_REPLACE("audiocpu", H6280, 32220000/8) MCFG_CPU_PROGRAM_MAP(h6280_sound_map) diff --git a/src/mame/drivers/deco_ld.cpp b/src/mame/drivers/deco_ld.cpp index 7fb5db179cd..54017aee0cb 100644 --- a/src/mame/drivers/deco_ld.cpp +++ b/src/mame/drivers/deco_ld.cpp @@ -163,6 +163,7 @@ public: uint32_t screen_update_rblaster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(sound_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t *spriteram, uint16_t tile_bank ); + void rblaster(machine_config &config); }; void deco_ld_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t *spriteram, uint16_t tile_bank ) @@ -455,7 +456,7 @@ void deco_ld_state::machine_start() { } -static MACHINE_CONFIG_START( rblaster ) +MACHINE_CONFIG_START(deco_ld_state::rblaster) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6502,8000000/2) diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp index f71e4976822..974d9bb648c 100644 --- a/src/mame/drivers/deco_mlc.cpp +++ b/src/mame/drivers/deco_mlc.cpp @@ -494,7 +494,7 @@ MACHINE_RESET_MEMBER(deco_mlc_state,mlc) m_raster_irq_timer = machine().device("int_timer"); } -static MACHINE_CONFIG_START( avengrgs ) +MACHINE_CONFIG_START(deco_mlc_state::avengrgs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH2,42000000/2) /* 21 MHz clock confirmed on real board */ @@ -527,7 +527,7 @@ static MACHINE_CONFIG_START( avengrgs ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mlc ) +MACHINE_CONFIG_START(deco_mlc_state::mlc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM,42000000/6) /* 42 MHz -> 7MHz clock confirmed on real board */ @@ -563,11 +563,11 @@ static MACHINE_CONFIG_START( mlc ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mlc_6bpp, mlc ) +MACHINE_CONFIG_DERIVED(deco_mlc_state::mlc_6bpp, mlc) MCFG_GFXDECODE_MODIFY("gfxdecode", 6bpp) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mlc_5bpp, mlc ) +MACHINE_CONFIG_DERIVED(deco_mlc_state::mlc_5bpp, mlc) MCFG_GFXDECODE_MODIFY("gfxdecode", 5bpp) // TODO: mono? ch.0 doesn't output any sound in-game diff --git a/src/mame/drivers/decocass.cpp b/src/mame/drivers/decocass.cpp index dbed82ba253..05512340aaf 100644 --- a/src/mame/drivers/decocass.cpp +++ b/src/mame/drivers/decocass.cpp @@ -950,7 +950,7 @@ PALETTE_INIT_MEMBER(decocass_state, decocass) } -static MACHINE_CONFIG_START( decocass ) +MACHINE_CONFIG_START(decocass_state::decocass) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", DECO_222, HCLK4) /* the earlier revision board doesn't have the 222 but must have the same thing implemented in logic for the M6502 */ @@ -997,118 +997,118 @@ static MACHINE_CONFIG_START( decocass ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ctsttape, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::ctsttape, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,ctsttape) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cprogolfj, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::cprogolfj, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cprogolfj) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cdsteljn, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::cdsteljn, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cdsteljn) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cmanhat, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::cmanhat, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cmanhat) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cfishing, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::cfishing, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cfishing) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( chwy, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::chwy, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,chwy) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cterrani, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::cterrani, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cterrani) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( castfant, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::castfant, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,castfant) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( csuperas, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::csuperas, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,csuperas) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cocean1a, decocass ) /* 10 */ +MACHINE_CONFIG_DERIVED(decocass_type1_state::cocean1a, decocass) /* 10 */ /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cocean1a) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( clocknch, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::clocknch, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,clocknch) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( clocknchj, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::clocknchj, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,clocknchj) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cfboy0a1, decocass ) /* 12 */ +MACHINE_CONFIG_DERIVED(decocass_type1_state::cfboy0a1, decocass) /* 12 */ /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cfboy0a1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cprogolf, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::cprogolf, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cprogolf) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cluckypo, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::cluckypo, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cluckypo) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ctisland, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::ctisland, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,ctisland) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ctisland3, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::ctisland3, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,ctisland3) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cexplore, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type1_state::cexplore, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type1_state,cexplore) @@ -1117,91 +1117,91 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cbtime, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::cbtime, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cbtime) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cburnrub, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::cburnrub, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cburnrub) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cgraplop, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::cgraplop, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cgraplop) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cgraplop2, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::cgraplop2, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cgraplop2) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( clapapa, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::clapapa, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,clapapa) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cskater, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::cskater, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cskater) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cprobowl, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::cprobowl, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cprobowl) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cnightst, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::cnightst, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cnightst) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cpsoccer, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::cpsoccer, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cpsoccer) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( csdtenis, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::csdtenis, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,csdtenis) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( czeroize, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::czeroize, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,czeroize) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cppicf, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::cppicf, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cppicf) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cfghtice, decocass ) +MACHINE_CONFIG_DERIVED(decocass_type3_state::cfghtice, decocass) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(decocass_type3_state,cfghtice) diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp index af810c8aca9..01df0fe024b 100644 --- a/src/mame/drivers/dectalk.cpp +++ b/src/mame/drivers/dectalk.cpp @@ -321,6 +321,7 @@ public: uint16_t dsp_outfifo_r(); DECLARE_WRITE_LINE_MEMBER(dectalk_reset); + void dectalk(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -868,7 +869,7 @@ TIMER_CALLBACK_MEMBER(dectalk_state::outfifo_read_cb) duart_rx_break(duart, 1, 0);*/ } -static MACHINE_CONFIG_START( dectalk ) +MACHINE_CONFIG_START(dectalk_state::dectalk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* E74 20MHz OSC (/2) */ MCFG_CPU_PROGRAM_MAP(m68k_mem) diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp index ce5ec65cf36..dd89218f9df 100644 --- a/src/mame/drivers/decwritr.cpp +++ b/src/mame/drivers/decwritr.cpp @@ -54,6 +54,7 @@ public: DECLARE_WRITE8_MEMBER(la120_NVR_w); DECLARE_READ8_MEMBER(la120_DC305_r); DECLARE_WRITE8_MEMBER(la120_DC305_w); + void la120(machine_config &config); private: virtual void machine_start() override; //virtual void machine_reset(); @@ -398,7 +399,7 @@ void decwriter_state::machine_reset() // MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( la120 ) +MACHINE_CONFIG_START(decwriter_state::la120) MCFG_CPU_ADD("maincpu",I8080, XTAL_18MHz / 9) // 18Mhz xtal on schematics, using an i8224 clock divider/reset sanitizer IC MCFG_CPU_PROGRAM_MAP(la120_mem) diff --git a/src/mame/drivers/deniam.cpp b/src/mame/drivers/deniam.cpp index a8f7368c199..b7dc77e9cb6 100644 --- a/src/mame/drivers/deniam.cpp +++ b/src/mame/drivers/deniam.cpp @@ -246,7 +246,7 @@ void deniam_state::machine_reset() m_oki->set_rom_bank(0); } -static MACHINE_CONFIG_START( deniam16b ) +MACHINE_CONFIG_START(deniam_state::deniam16b) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,XTAL_25MHz/2) /* 12.5Mhz verified */ @@ -286,7 +286,7 @@ static MACHINE_CONFIG_START( deniam16b ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( deniam16c ) +MACHINE_CONFIG_START(deniam_state::deniam16c) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,XTAL_25MHz/2) /* 12.5Mhz verified */ diff --git a/src/mame/drivers/deshoros.cpp b/src/mame/drivers/deshoros.cpp index b06f519baa4..1572c303e5d 100644 --- a/src/mame/drivers/deshoros.cpp +++ b/src/mame/drivers/deshoros.cpp @@ -61,6 +61,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + void destiny(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -261,7 +262,7 @@ void destiny_state::machine_reset() bank_select_w(m_maincpu->space(AS_PROGRAM), 0, 0); } -static MACHINE_CONFIG_START( destiny ) +MACHINE_CONFIG_START(destiny_state::destiny) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, XTAL_4MHz/2) diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp index c4ce0c64d37..60a1e836256 100644 --- a/src/mame/drivers/destroyr.cpp +++ b/src/mame/drivers/destroyr.cpp @@ -83,6 +83,7 @@ public: TIMER_CALLBACK_MEMBER(dial_callback); TIMER_CALLBACK_MEMBER(frame_callback); + void destroyr(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -472,7 +473,7 @@ void destroyr_state::machine_start() save_item(NAME(m_potsense)); } -static MACHINE_CONFIG_START( destroyr ) +MACHINE_CONFIG_START(destroyr_state::destroyr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 16) diff --git a/src/mame/drivers/dfruit.cpp b/src/mame/drivers/dfruit.cpp index 5156b8c3877..70f9e8ff4a0 100644 --- a/src/mame/drivers/dfruit.cpp +++ b/src/mame/drivers/dfruit.cpp @@ -70,6 +70,7 @@ public: uint8_t ram_bank_r(uint16_t offset, uint8_t bank_num); void ram_bank_w(uint16_t offset, uint8_t data, uint8_t bank_num); TIMER_DEVICE_CALLBACK_MEMBER(dfruit_irq_scanline); + void dfruit(machine_config &config); }; void dfruit_state::video_start() @@ -365,7 +366,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(dfruit_state::dfruit_irq_scanline) #define MASTER_CLOCK XTAL_14MHz -static MACHINE_CONFIG_START( dfruit ) +MACHINE_CONFIG_START(dfruit_state::dfruit) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,MASTER_CLOCK/2) //!!! TC0091LVC !!! diff --git a/src/mame/drivers/dgn_beta.cpp b/src/mame/drivers/dgn_beta.cpp index 582f59e81d2..01b7b58163b 100644 --- a/src/mame/drivers/dgn_beta.cpp +++ b/src/mame/drivers/dgn_beta.cpp @@ -317,7 +317,7 @@ static SLOT_INTERFACE_START( dgnbeta_floppies ) SLOT_INTERFACE("dd", FLOPPY_35_DD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( dgnbeta ) +MACHINE_CONFIG_START(dgn_beta_state::dgnbeta) /* basic machine hardware */ MCFG_CPU_ADD(MAINCPU_TAG, MC6809E, DGNBETA_CPU_SPEED_HZ) /* 2 MHz */ MCFG_CPU_PROGRAM_MAP(dgnbeta_map) diff --git a/src/mame/drivers/dgpix.cpp b/src/mame/drivers/dgpix.cpp index 8a4abd1f191..41d6c7b42cf 100644 --- a/src/mame/drivers/dgpix.cpp +++ b/src/mame/drivers/dgpix.cpp @@ -195,6 +195,7 @@ public: virtual void video_start() override; uint32_t screen_update_dgpix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void dgpix(machine_config &config); }; @@ -422,7 +423,7 @@ void dgpix_state::machine_reset() } -static MACHINE_CONFIG_START( dgpix ) +MACHINE_CONFIG_START(dgpix_state::dgpix) MCFG_CPU_ADD("maincpu", E132XT, 20000000*4) /* 4x internal multiplier */ MCFG_CPU_PROGRAM_MAP(cpu_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/didact.cpp b/src/mame/drivers/didact.cpp index 278dffd387a..1796c6a8ce9 100644 --- a/src/mame/drivers/didact.cpp +++ b/src/mame/drivers/didact.cpp @@ -186,6 +186,7 @@ class md6802_state : public didact_state virtual void machine_reset() override; virtual void machine_start() override; + void md6802(machine_config &config); protected: required_device m_pia1; required_device m_pia2; @@ -367,6 +368,7 @@ class mp68a_state : public didact_state virtual void machine_reset() override; virtual void machine_start() override; + void mp68a(machine_config &config); protected: required_device m_pia1; required_device m_pia2; @@ -585,7 +587,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(didact_state::scan_artwork) } } -static MACHINE_CONFIG_START( md6802 ) +MACHINE_CONFIG_START(md6802_state::md6802) MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(md6802_map) MCFG_DEFAULT_LAYOUT(layout_md6802) @@ -618,7 +620,7 @@ static MACHINE_CONFIG_START( md6802 ) MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mp68a ) +MACHINE_CONFIG_START(mp68a_state::mp68a) // Clock source is based on a N9602N Dual Retriggerable Resettable Monostable Multivibrator oscillator at aprox 505KHz. // Trimpot seems broken/stuck at 5K Ohm thu. ROM code 1Ms delay loops suggest 1MHz+ MCFG_CPU_ADD("maincpu", M6800, 505000) diff --git a/src/mame/drivers/dietgo.cpp b/src/mame/drivers/dietgo.cpp index fb71b277e68..cb637ecd0a9 100644 --- a/src/mame/drivers/dietgo.cpp +++ b/src/mame/drivers/dietgo.cpp @@ -209,7 +209,7 @@ void dietgo_state::machine_start() { } -static MACHINE_CONFIG_START( dietgo ) +MACHINE_CONFIG_START(dietgo_state::dietgo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* DE102 (verified on pcb) */ diff --git a/src/mame/drivers/digel804.cpp b/src/mame/drivers/digel804.cpp index cd52cf43741..c723726bf68 100644 --- a/src/mame/drivers/digel804.cpp +++ b/src/mame/drivers/digel804.cpp @@ -132,6 +132,8 @@ public: uint8_t m_chipinsert_state; uint8_t m_keyen_state; uint8_t m_op41; + void ep804(machine_config &config); + void digel804(machine_config &config); }; @@ -584,7 +586,7 @@ WRITE_LINE_MEMBER( digel804_state::ep804_acia_irq_w ) { } -static MACHINE_CONFIG_START( digel804 ) +MACHINE_CONFIG_START(digel804_state::digel804) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_6864MHz/2) /* Z80A, X1(aka E0 on schematics): 3.6864Mhz */ MCFG_CPU_PROGRAM_MAP(z80_mem_804_1_4) @@ -628,7 +630,7 @@ static MACHINE_CONFIG_START( digel804 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ep804, digel804 ) +MACHINE_CONFIG_DERIVED(digel804_state::ep804, digel804) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") /* Z80, X1(aka E0 on schematics): 3.6864Mhz */ MCFG_CPU_PROGRAM_MAP(z80_mem_804_1_2) diff --git a/src/mame/drivers/digijet.cpp b/src/mame/drivers/digijet.cpp index f21c4a650ad..7a1eb95d0f6 100644 --- a/src/mame/drivers/digijet.cpp +++ b/src/mame/drivers/digijet.cpp @@ -37,6 +37,7 @@ public: virtual void machine_start() override { } virtual void machine_reset() override { } + void digijet(machine_config &config); }; static ADDRESS_MAP_START( io_map, AS_IO, 8, digijet_state ) @@ -45,7 +46,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( digijet ) INPUT_PORTS_END -static MACHINE_CONFIG_START( digijet ) +MACHINE_CONFIG_START(digijet_state::digijet) /* basic machine hardware */ MCFG_CPU_ADD(I8049_TAG, I8049, XTAL_11MHz) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp index 8e9830fe9dd..29076638791 100644 --- a/src/mame/drivers/dim68k.cpp +++ b/src/mame/drivers/dim68k.cpp @@ -72,6 +72,7 @@ public: void kbd_put(u8 data); MC6845_UPDATE_ROW(crtc_update_row); + void dim68k(machine_config &config); private: bool m_speaker_bit; u8 m_video_control; @@ -303,7 +304,7 @@ void dim68k_state::kbd_put(u8 data) m_term_data = data; } -static MACHINE_CONFIG_START( dim68k ) +MACHINE_CONFIG_START(dim68k_state::dim68k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP(dim68k_mem) diff --git a/src/mame/drivers/discoboy.cpp b/src/mame/drivers/discoboy.cpp index 96e4e596a88..e8ae5990841 100644 --- a/src/mame/drivers/discoboy.cpp +++ b/src/mame/drivers/discoboy.cpp @@ -107,6 +107,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(yunsung8_adpcm_int); + void discoboy(machine_config &config); }; void discoboy_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ) @@ -443,7 +444,7 @@ WRITE_LINE_MEMBER(discoboy_state::yunsung8_adpcm_int) m_audiocpu->set_input_line(INPUT_LINE_NMI, m_toggle); } -static MACHINE_CONFIG_START( discoboy ) +MACHINE_CONFIG_START(discoboy_state::discoboy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz? */ diff --git a/src/mame/drivers/divebomb.cpp b/src/mame/drivers/divebomb.cpp index 0668f081a11..8e9dd1830f3 100644 --- a/src/mame/drivers/divebomb.cpp +++ b/src/mame/drivers/divebomb.cpp @@ -445,7 +445,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( divebomb ) +MACHINE_CONFIG_START(divebomb_state::divebomb) MCFG_CPU_ADD("fgcpu", Z80,XTAL1/4) // ? MCFG_CPU_PROGRAM_MAP(divebomb_fgcpu_map) diff --git a/src/mame/drivers/diverboy.cpp b/src/mame/drivers/diverboy.cpp index 0183eb8946e..a8ff783281b 100644 --- a/src/mame/drivers/diverboy.cpp +++ b/src/mame/drivers/diverboy.cpp @@ -90,6 +90,7 @@ public: virtual void video_start() override; uint32_t screen_update_diverboy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void diverboy(machine_config &config); }; @@ -265,7 +266,7 @@ void diverboy_state::machine_start() { } -static MACHINE_CONFIG_START( diverboy ) +MACHINE_CONFIG_START(diverboy_state::diverboy) MCFG_CPU_ADD("maincpu", M68000, 12000000) /* guess */ MCFG_CPU_PROGRAM_MAP(diverboy_map) diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp index 520b07bca1e..c766ff69f0c 100644 --- a/src/mame/drivers/djboy.cpp +++ b/src/mame/drivers/djboy.cpp @@ -547,7 +547,7 @@ void djboy_state::machine_reset() m_z80_to_beast_full = 0; } -static MACHINE_CONFIG_START( djboy ) +MACHINE_CONFIG_START(djboy_state::djboy) MCFG_CPU_ADD("maincpu", Z80, 6000000) MCFG_CPU_PROGRAM_MAP(cpu0_am) diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp index 8858207c2b0..f6da5f31717 100644 --- a/src/mame/drivers/djmain.cpp +++ b/src/mame/drivers/djmain.cpp @@ -1376,7 +1376,7 @@ void djmain_state::machine_reset() * *************************************/ -static MACHINE_CONFIG_START( djmainj ) +MACHINE_CONFIG_START(djmain_state::djmainj) /* basic machine hardware */ // popn3 works 9.6 MHz or slower in some songs */ @@ -1421,12 +1421,12 @@ static MACHINE_CONFIG_START( djmainj ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(djmainu, djmainj) +MACHINE_CONFIG_DERIVED(djmain_state::djmainu, djmainj) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(maincpu_djmainu) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(djmaina, djmainj) +MACHINE_CONFIG_DERIVED(djmain_state::djmaina, djmainj) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(maincpu_djmaina) MACHINE_CONFIG_END diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp index 8bf68b58669..3a0abd3d91f 100644 --- a/src/mame/drivers/dkong.cpp +++ b/src/mame/drivers/dkong.cpp @@ -1685,7 +1685,7 @@ WRITE_LINE_MEMBER(dkong_state::busreq_w ) m_dma8257->hlda_w(state); } -static MACHINE_CONFIG_START( dkong_base ) +MACHINE_CONFIG_START(dkong_state::dkong_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CLOCK_1H) @@ -1716,7 +1716,7 @@ static MACHINE_CONFIG_START( dkong_base ) MCFG_VIDEO_START_OVERRIDE(dkong_state,dkong) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( radarscp, dkong_base ) +MACHINE_CONFIG_DERIVED(dkong_state::radarscp, dkong_base) /* basic machine hardware */ MCFG_MACHINE_START_OVERRIDE(dkong_state,radarscp) @@ -1728,7 +1728,7 @@ static MACHINE_CONFIG_DERIVED( radarscp, dkong_base ) MCFG_FRAGMENT_ADD(radarscp_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( radarscp1, dkong_base ) +MACHINE_CONFIG_DERIVED(dkong_state::radarscp1, dkong_base) /* basic machine hardware */ MCFG_MACHINE_START_OVERRIDE(dkong_state,radarscp1) @@ -1741,7 +1741,7 @@ static MACHINE_CONFIG_DERIVED( radarscp1, dkong_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dkong2b, dkong_base ) +MACHINE_CONFIG_DERIVED(dkong_state::dkong2b, dkong_base) /* basic machine hardware */ MCFG_MACHINE_START_OVERRIDE(dkong_state,dkong2b) @@ -1752,12 +1752,12 @@ static MACHINE_CONFIG_DERIVED( dkong2b, dkong_base ) MCFG_FRAGMENT_ADD(dkong2b_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( braze, dkong2b ) +MACHINE_CONFIG_DERIVED(dkong_state::braze, dkong2b) MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dkong3 ) +MACHINE_CONFIG_START(dkong_state::dkong3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) /* verified in schematics */ @@ -1788,7 +1788,7 @@ static MACHINE_CONFIG_START( dkong3 ) MCFG_FRAGMENT_ADD(dkong3_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dkongjr, dkong_base ) +MACHINE_CONFIG_DERIVED(dkong_state::dkongjr, dkong_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(dkongjr_map) @@ -1797,7 +1797,7 @@ static MACHINE_CONFIG_DERIVED( dkongjr, dkong_base ) MCFG_FRAGMENT_ADD(dkongjr_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pestplce, dkongjr ) +MACHINE_CONFIG_DERIVED(dkong_state::pestplce, dkongjr) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", pestplce) @@ -1808,7 +1808,7 @@ static MACHINE_CONFIG_DERIVED( pestplce, dkongjr ) MCFG_SCREEN_UPDATE_DRIVER(dkong_state, screen_update_pestplce) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dkong3b, dkongjr ) +MACHINE_CONFIG_DERIVED(dkong_state::dkong3b, dkongjr) /* basic machine hardware */ MCFG_PALETTE_MODIFY("palette") @@ -1821,7 +1821,7 @@ MACHINE_CONFIG_END * *************************************/ -static MACHINE_CONFIG_DERIVED( s2650, dkong2b ) +MACHINE_CONFIG_DERIVED(dkong_state::s2650, dkong2b) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", S2650, CLOCK_1H / 2) /* ??? */ @@ -1839,12 +1839,12 @@ static MACHINE_CONFIG_DERIVED( s2650, dkong2b ) MCFG_MACHINE_START_OVERRIDE(dkong_state,s2650) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( herbiedk, s2650 ) +MACHINE_CONFIG_DERIVED(dkong_state::herbiedk, s2650) MCFG_CPU_MODIFY("maincpu") MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT // ??? MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spclforc, herbiedk ) +MACHINE_CONFIG_DERIVED(dkong_state::spclforc, herbiedk) /* basic machine hardware */ MCFG_DEVICE_REMOVE("soundcpu") @@ -1860,7 +1860,7 @@ MACHINE_CONFIG_END * *************************************/ -static MACHINE_CONFIG_DERIVED( strtheat, dkong2b ) +MACHINE_CONFIG_DERIVED(dkong_state::strtheat, dkong2b) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1869,7 +1869,7 @@ static MACHINE_CONFIG_DERIVED( strtheat, dkong2b ) MCFG_MACHINE_RESET_OVERRIDE(dkong_state,strtheat) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( drakton, dkong2b ) +MACHINE_CONFIG_DERIVED(dkong_state::drakton, dkong2b) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1878,7 +1878,7 @@ static MACHINE_CONFIG_DERIVED( drakton, dkong2b ) MCFG_MACHINE_RESET_OVERRIDE(dkong_state,drakton) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( drktnjr, dkongjr ) +MACHINE_CONFIG_DERIVED(dkong_state::drktnjr, dkongjr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp index ad4efd600c3..49cb99ef855 100644 --- a/src/mame/drivers/dlair.cpp +++ b/src/mame/drivers/dlair.cpp @@ -132,6 +132,10 @@ public: DECLARE_PALETTE_INIT(dleuro); uint32_t screen_update_dleuro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(write_speaker); + void dlair_base(machine_config &config); + void dlair_pr7820(machine_config &config); + void dleuro(machine_config &config); + void dlair_ldv1000(machine_config &config); }; @@ -707,7 +711,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( dlair_base ) +MACHINE_CONFIG_START(dlair_state::dlair_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_US/4) @@ -727,7 +731,7 @@ static MACHINE_CONFIG_START( dlair_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dlair_pr7820, dlair_base ) +MACHINE_CONFIG_DERIVED(dlair_state::dlair_pr7820, dlair_base) MCFG_LASERDISC_PR7820_ADD("ld_pr7820") MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -735,7 +739,7 @@ static MACHINE_CONFIG_DERIVED( dlair_pr7820, dlair_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dlair_ldv1000, dlair_base ) +MACHINE_CONFIG_DERIVED(dlair_state::dlair_ldv1000, dlair_base) MCFG_LASERDISC_LDV1000_ADD("ld_ldv1000") MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -743,7 +747,7 @@ static MACHINE_CONFIG_DERIVED( dlair_ldv1000, dlair_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dleuro ) +MACHINE_CONFIG_START(dlair_state::dleuro) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_EURO/4) diff --git a/src/mame/drivers/dlair2.cpp b/src/mame/drivers/dlair2.cpp index fe85c02e5c0..067cf299604 100644 --- a/src/mame/drivers/dlair2.cpp +++ b/src/mame/drivers/dlair2.cpp @@ -53,6 +53,7 @@ public: INTERRUPT_GEN_MEMBER(dlair2_timer_irq); DECLARE_PALETTE_INIT(dlair2); + void dlair2(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -173,7 +174,7 @@ INTERRUPT_GEN_MEMBER(dlair2_state::dlair2_timer_irq) device.execute().set_input_line_and_vector(0,HOLD_LINE,0x20/4); } -static MACHINE_CONFIG_START( dlair2 ) +MACHINE_CONFIG_START(dlair2_state::dlair2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088 , MAIN_CLOCK/3) /* Schematics show I8088 "max" CPU */ diff --git a/src/mame/drivers/dm7000.cpp b/src/mame/drivers/dm7000.cpp index 7a9519dbc69..357853a9a07 100644 --- a/src/mame/drivers/dm7000.cpp +++ b/src/mame/drivers/dm7000.cpp @@ -300,7 +300,7 @@ void dm7000_state::kbd_put(u8 data) m_scc0_lsr = 1; } -static MACHINE_CONFIG_START( dm7000 ) +MACHINE_CONFIG_START(dm7000_state::dm7000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",PPC405GP, 252000000 / 10) // Should be PPC405D4? // Slowed down 10 times in order to get normal response for now diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp index f45e9901765..d73b09878d7 100644 --- a/src/mame/drivers/dmax8000.cpp +++ b/src/mame/drivers/dmax8000.cpp @@ -54,6 +54,7 @@ public: DECLARE_WRITE8_MEMBER(port40_w); DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void dmax8000(machine_config &config); private: required_device m_maincpu; required_device m_fdc; @@ -143,7 +144,7 @@ static SLOT_INTERFACE_START( floppies ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( dmax8000 ) +MACHINE_CONFIG_START(dmax8000_state::dmax8000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz ) // no idea what crystal is used, but 4MHz clock is confirmed MCFG_CPU_PROGRAM_MAP(dmax8000_mem) diff --git a/src/mame/drivers/dmndrby.cpp b/src/mame/drivers/dmndrby.cpp index 64980d656a6..11cc2ec75b9 100644 --- a/src/mame/drivers/dmndrby.cpp +++ b/src/mame/drivers/dmndrby.cpp @@ -98,6 +98,7 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_soundlatch; + void dderby(machine_config &config); }; @@ -523,7 +524,7 @@ INTERRUPT_GEN_MEMBER(dmndrby_state::dderby_timer_irq) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xcf); /* RST 08h */ } -static MACHINE_CONFIG_START( dderby ) +MACHINE_CONFIG_START(dmndrby_state::dderby) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(memmap) diff --git a/src/mame/drivers/dms5000.cpp b/src/mame/drivers/dms5000.cpp index 5cfd0a1560c..6bbbea7c251 100644 --- a/src/mame/drivers/dms5000.cpp +++ b/src/mame/drivers/dms5000.cpp @@ -24,6 +24,7 @@ public: virtual void video_start() override; uint32_t screen_update_dms5000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void dms5000(machine_config &config); }; @@ -55,7 +56,7 @@ uint32_t dms5000_state::screen_update_dms5000(screen_device &screen, bitmap_ind1 return 0; } -static MACHINE_CONFIG_START( dms5000 ) +MACHINE_CONFIG_START(dms5000_state::dms5000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8086, XTAL_9_8304MHz) MCFG_CPU_PROGRAM_MAP(dms5000_mem) diff --git a/src/mame/drivers/dms86.cpp b/src/mame/drivers/dms86.cpp index 1ac2811406b..418e59b0bcc 100644 --- a/src/mame/drivers/dms86.cpp +++ b/src/mame/drivers/dms86.cpp @@ -51,6 +51,7 @@ public: DECLARE_READ16_MEMBER( port9c_r ); void kbd_put(u8 data); + void dms86(machine_config &config); private: u8 m_term_data; virtual void machine_reset() override; @@ -109,7 +110,7 @@ void dms86_state::kbd_put(u8 data) m_term_data = data; } -static MACHINE_CONFIG_START( dms86 ) +MACHINE_CONFIG_START(dms86_state::dms86) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, XTAL_14_7456MHz / 3) // according to the manual... hmm MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp index 169a292c672..5c530151fdc 100644 --- a/src/mame/drivers/dmv.cpp +++ b/src/mame/drivers/dmv.cpp @@ -176,6 +176,7 @@ public: int m_floppy_motor; int m_busint[8]; int m_irqs[8]; + void dmv(machine_config &config); }; WRITE8_MEMBER(dmv_state::tc_set_w) @@ -712,7 +713,7 @@ static SLOT_INTERFACE_START(dmv_slot7a) SLOT_INTERFACE("k235", DMV_K235) // K235 Internal 8088 module with interrupt controller SLOT_INTERFACE_END -static MACHINE_CONFIG_START( dmv ) +MACHINE_CONFIG_START(dmv_state::dmv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_24MHz / 6) MCFG_CPU_PROGRAM_MAP(dmv_mem) diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp index b342ffa20c2..19aafb9e1be 100644 --- a/src/mame/drivers/docastle.cpp +++ b/src/mame/drivers/docastle.cpp @@ -571,7 +571,7 @@ void docastle_state::machine_start() save_item(NAME(m_buffer1)); } -static MACHINE_CONFIG_START( docastle ) +MACHINE_CONFIG_START(docastle_state::docastle) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) @@ -640,7 +640,7 @@ static MACHINE_CONFIG_START( docastle ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dorunrun, docastle ) +MACHINE_CONFIG_DERIVED(docastle_state::dorunrun, docastle) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -653,7 +653,7 @@ static MACHINE_CONFIG_DERIVED( dorunrun, docastle ) MCFG_VIDEO_START_OVERRIDE(docastle_state,dorunrun) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( idsoccer, docastle ) +MACHINE_CONFIG_DERIVED(docastle_state::idsoccer, docastle) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/dogfgt.cpp b/src/mame/drivers/dogfgt.cpp index 77ee7cd7bf2..d5b95b4c2a1 100644 --- a/src/mame/drivers/dogfgt.cpp +++ b/src/mame/drivers/dogfgt.cpp @@ -237,7 +237,7 @@ void dogfgt_state::machine_reset() } -static MACHINE_CONFIG_START( dogfgt ) +MACHINE_CONFIG_START(dogfgt_state::dogfgt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */ diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp index 336fd823340..a3909d2b828 100644 --- a/src/mame/drivers/dolphunk.cpp +++ b/src/mame/drivers/dolphunk.cpp @@ -107,6 +107,7 @@ public: DECLARE_WRITE8_MEMBER(port00_w); DECLARE_WRITE8_MEMBER(port06_w); TIMER_DEVICE_CALLBACK_MEMBER(dauphin_c); + void dauphin(machine_config &config); private: uint8_t m_cass_data; uint8_t m_last_key; @@ -223,7 +224,7 @@ static INPUT_PORTS_START( dauphin ) INPUT_PORTS_END -static MACHINE_CONFIG_START( dauphin ) +MACHINE_CONFIG_START(dauphin_state::dauphin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz) MCFG_CPU_PROGRAM_MAP(dauphin_mem) diff --git a/src/mame/drivers/dominob.cpp b/src/mame/drivers/dominob.cpp index eacdb5cdb5e..c78a992e538 100644 --- a/src/mame/drivers/dominob.cpp +++ b/src/mame/drivers/dominob.cpp @@ -96,6 +96,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void dominob(machine_config &config); }; void dominob_state::video_start() @@ -289,7 +290,7 @@ static GFXDECODE_START( dominob ) GFXDECODE_END -static MACHINE_CONFIG_START( dominob ) +MACHINE_CONFIG_START(dominob_state::dominob) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp index 297d16f1c63..16c2c51fbd8 100644 --- a/src/mame/drivers/dooyong.cpp +++ b/src/mame/drivers/dooyong.cpp @@ -112,6 +112,8 @@ protected: optional_device m_bg2; optional_device m_fg; optional_device m_fg2; + + void sound_2151_4mhz(machine_config &config); }; class dooyong_z80_state : public dooyong_state @@ -215,6 +217,10 @@ public: save_item(NAME(m_tx_pri)); } + void sound_2151(machine_config &config); + void bluehawk(machine_config &config); + void flytiger(machine_config &config); + void primella(machine_config &config); protected: void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, unsigned extensions = 0); @@ -283,6 +289,10 @@ public: save_item(NAME(m_interrupt_line_2)); } + void sound_2203(machine_config &config); + void pollux(machine_config &config); + void lastday(machine_config &config); + void gulfstrm(machine_config &config); protected: int m_interrupt_line_1 = 0; int m_interrupt_line_2 = 0; @@ -337,6 +347,9 @@ public: /* Register for save/restore */ save_item(NAME(m_bg2_priority)); } + void dooyong_68k(machine_config &config); + void superx(machine_config &config); + void rshark(machine_config &config); }; @@ -362,6 +375,7 @@ public: save_item(NAME(m_bg2_priority)); // Not used atm } + void popbingo(machine_config &config); protected: bitmap_ind16 m_bg_bitmap; bitmap_ind16 m_bg2_bitmap; @@ -1414,7 +1428,7 @@ WRITE_LINE_MEMBER(dooyong_z80_ym2203_state::irqhandler_2203_2) ***************************************************************************/ -MACHINE_CONFIG_START( sound_2203 ) +MACHINE_CONFIG_START(dooyong_z80_ym2203_state::sound_2203) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") @@ -1430,7 +1444,7 @@ MACHINE_CONFIG_START( sound_2203 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END -MACHINE_CONFIG_START( sound_2151 ) +MACHINE_CONFIG_START(dooyong_z80_state::sound_2151) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") @@ -1444,7 +1458,7 @@ MACHINE_CONFIG_START( sound_2151 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END -MACHINE_CONFIG_START( sound_2151_4mhz ) +MACHINE_CONFIG_START(dooyong_state::sound_2151_4mhz ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") @@ -1458,7 +1472,7 @@ MACHINE_CONFIG_START( sound_2151_4mhz ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END -MACHINE_CONFIG_START( lastday ) +MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* 8MHz verified for Last Day / D-day */ @@ -1511,7 +1525,7 @@ MACHINE_CONFIG_START( lastday ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( gulfstrm ) +MACHINE_CONFIG_START(dooyong_z80_ym2203_state::gulfstrm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */ @@ -1550,7 +1564,7 @@ MACHINE_CONFIG_START( gulfstrm ) MCFG_FRAGMENT_ADD( sound_2203 ) /* 3.579545MHz */ MACHINE_CONFIG_END -MACHINE_CONFIG_START( pollux ) +MACHINE_CONFIG_START(dooyong_z80_ym2203_state::pollux) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* 8Mhz */ @@ -1589,7 +1603,7 @@ MACHINE_CONFIG_START( pollux ) MCFG_FRAGMENT_ADD( sound_2203 ) /* 3.579545MHz or 4Mhz ??? */ MACHINE_CONFIG_END -MACHINE_CONFIG_START( bluehawk ) +MACHINE_CONFIG_START(dooyong_z80_state::bluehawk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */ @@ -1629,7 +1643,7 @@ MACHINE_CONFIG_START( bluehawk ) MCFG_FRAGMENT_ADD( sound_2151 ) /* 3.579545MHz or 4Mhz ??? */ MACHINE_CONFIG_END -MACHINE_CONFIG_START( flytiger ) +MACHINE_CONFIG_START(dooyong_z80_state::flytiger) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* 8MHz */ @@ -1668,7 +1682,7 @@ MACHINE_CONFIG_START( flytiger ) MCFG_FRAGMENT_ADD( sound_2151 ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( primella ) +MACHINE_CONFIG_START(dooyong_z80_state::primella) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* 8MHz */ @@ -1718,7 +1732,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(dooyong_68k_state::scanline) } -MACHINE_CONFIG_START( dooyong_68k ) +MACHINE_CONFIG_START(rshark_state::dooyong_68k) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) // 8MHz measured on Super-X @@ -1757,17 +1771,17 @@ MACHINE_CONFIG_START( dooyong_68k ) MCFG_FRAGMENT_ADD(sound_2151_4mhz) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( rshark, dooyong_68k ) +MACHINE_CONFIG_DERIVED(rshark_state::rshark, dooyong_68k) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(rshark_map) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( superx, dooyong_68k ) +MACHINE_CONFIG_DERIVED(rshark_state::superx, dooyong_68k) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(superx_map) MACHINE_CONFIG_END -MACHINE_CONFIG_START( popbingo ) +MACHINE_CONFIG_START(popbingo_state::popbingo) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) // 10MHz measured diff --git a/src/mame/drivers/dorachan.cpp b/src/mame/drivers/dorachan.cpp index 2f025a98ee1..744bfa450fb 100644 --- a/src/mame/drivers/dorachan.cpp +++ b/src/mame/drivers/dorachan.cpp @@ -45,6 +45,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void dorachan(machine_config &config); }; @@ -200,7 +201,7 @@ void dorachan_state::machine_reset() m_flip_screen = 0; } -static MACHINE_CONFIG_START( dorachan ) +MACHINE_CONFIG_START(dorachan_state::dorachan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2000000) diff --git a/src/mame/drivers/dotrikun.cpp b/src/mame/drivers/dotrikun.cpp index e3e0eb57274..2eed5ce68c9 100644 --- a/src/mame/drivers/dotrikun.cpp +++ b/src/mame/drivers/dotrikun.cpp @@ -66,6 +66,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void dotrikun(machine_config &config); }; TIMER_DEVICE_CALLBACK_MEMBER(dotrikun_state::interrupt) @@ -188,7 +189,7 @@ void dotrikun_state::machine_reset() m_color = 0; } -static MACHINE_CONFIG_START( dotrikun ) +MACHINE_CONFIG_START(dotrikun_state::dotrikun) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) diff --git a/src/mame/drivers/dps1.cpp b/src/mame/drivers/dps1.cpp index 93bf9775b78..e83035d8679 100644 --- a/src/mame/drivers/dps1.cpp +++ b/src/mame/drivers/dps1.cpp @@ -44,6 +44,7 @@ public: DECLARE_DRIVER_INIT(dps1); DECLARE_MACHINE_RESET(dps1); + void dps1(machine_config &config); private: bool m_dma_dir; uint16_t m_dma_adr; @@ -181,7 +182,7 @@ static SLOT_INTERFACE_START( floppies ) SLOT_INTERFACE( "floppy0", FLOPPY_8_DSDD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( dps1 ) +MACHINE_CONFIG_START(dps1_state::dps1) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/dragon.cpp b/src/mame/drivers/dragon.cpp index 040654f1b5e..a2ab8de498a 100644 --- a/src/mame/drivers/dragon.cpp +++ b/src/mame/drivers/dragon.cpp @@ -179,7 +179,7 @@ static SLOT_INTERFACE_START( dragon_alpha_floppies ) SLOT_INTERFACE("dd", FLOPPY_35_DD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( dragon_base ) +MACHINE_CONFIG_START(dragon_state::dragon_base) MCFG_DEVICE_MODIFY(":") MCFG_DEVICE_CLOCK(XTAL_14_218MHz / 16) @@ -236,7 +236,7 @@ static MACHINE_CONFIG_START( dragon_base ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("coco_cart_list", "coco_cart") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dragon32, dragon_base ) +MACHINE_CONFIG_DERIVED(dragon_state::dragon32, dragon_base) // internal ram MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("32K") @@ -249,7 +249,7 @@ static MACHINE_CONFIG_DERIVED( dragon32, dragon_base ) MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dragon64, dragon_base ) +MACHINE_CONFIG_DERIVED(dragon64_state::dragon64, dragon_base) // internal ram MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("64K") @@ -269,13 +269,13 @@ static MACHINE_CONFIG_DERIVED( dragon64, dragon_base ) MCFG_SOFTWARE_LIST_ADD("dragon_os9_list", "dragon_os9") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dragon200e, dragon64 ) +MACHINE_CONFIG_DERIVED(dragon200e_state::dragon200e, dragon64) // video hardware MCFG_DEVICE_MODIFY(VDG_TAG) MCFG_MC6847_CHARROM_CALLBACK(dragon200e_state, char_rom_r) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( d64plus, dragon64 ) +MACHINE_CONFIG_DERIVED(d64plus_state::d64plus, dragon64) // video hardware MCFG_SCREEN_ADD("plus_screen", RASTER) MCFG_SCREEN_REFRESH_RATE(50) @@ -292,7 +292,7 @@ static MACHINE_CONFIG_DERIVED( d64plus, dragon64 ) MCFG_MC6845_UPDATE_ROW_CB(d64plus_state, crtc_update_row) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dgnalpha, dragon_base ) +MACHINE_CONFIG_DERIVED(dragon_alpha_state::dgnalpha, dragon_base) // internal ram MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("64K") @@ -339,7 +339,7 @@ static MACHINE_CONFIG_DERIVED( dgnalpha, dragon_base ) MCFG_SOFTWARE_LIST_ADD("dragon_os9_list", "dragon_os9") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tanodr64, dragon64 ) +MACHINE_CONFIG_DERIVED(dragon64_state::tanodr64, dragon64) MCFG_DEVICE_MODIFY(":") MCFG_DEVICE_CLOCK(XTAL_14_31818MHz / 4) diff --git a/src/mame/drivers/dragrace.cpp b/src/mame/drivers/dragrace.cpp index 376589d611e..35393d4c2d8 100644 --- a/src/mame/drivers/dragrace.cpp +++ b/src/mame/drivers/dragrace.cpp @@ -282,7 +282,7 @@ void dragrace_state::machine_reset() m_gear[1] = 0; } -static MACHINE_CONFIG_START( dragrace ) +MACHINE_CONFIG_START(dragrace_state::dragrace) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 12) diff --git a/src/mame/drivers/dreambal.cpp b/src/mame/drivers/dreambal.cpp index ef4899e0096..07a57252689 100644 --- a/src/mame/drivers/dreambal.cpp +++ b/src/mame/drivers/dreambal.cpp @@ -73,6 +73,7 @@ public: m_eeprom->cs_write(data&0x4 ? ASSERT_LINE : CLEAR_LINE); } } + void dreambal(machine_config &config); }; @@ -304,7 +305,7 @@ void dreambal_state::machine_reset() } // xtals = 28.000, 9.8304 -static MACHINE_CONFIG_START( dreambal ) +MACHINE_CONFIG_START(dreambal_state::dreambal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 28000000/2) diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp index c5e19c19f72..7b5ef9cf6a6 100644 --- a/src/mame/drivers/dreamwld.cpp +++ b/src/mame/drivers/dreamwld.cpp @@ -156,6 +156,8 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void baryon(machine_config &config); + void dreamwld(machine_config &config); }; @@ -792,7 +794,7 @@ void dreamwld_state::machine_reset() } -static MACHINE_CONFIG_START( baryon ) +MACHINE_CONFIG_START(dreamwld_state::baryon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* 16MHz verified */ @@ -823,7 +825,7 @@ static MACHINE_CONFIG_START( baryon ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dreamwld, baryon ) +MACHINE_CONFIG_DERIVED(dreamwld_state::dreamwld, baryon) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/drgnmst.cpp b/src/mame/drivers/drgnmst.cpp index d4f62c0d276..e111db3713d 100644 --- a/src/mame/drivers/drgnmst.cpp +++ b/src/mame/drivers/drgnmst.cpp @@ -373,7 +373,7 @@ void drgnmst_state::machine_reset() m_oki0_bank = 0; } -static MACHINE_CONFIG_START( drgnmst ) +MACHINE_CONFIG_START(drgnmst_state::drgnmst) MCFG_CPU_ADD("maincpu", M68000, 12000000) /* Confirmed */ MCFG_CPU_PROGRAM_MAP(drgnmst_main_map) diff --git a/src/mame/drivers/dribling.cpp b/src/mame/drivers/dribling.cpp index 3c460dfe637..b5139267b25 100644 --- a/src/mame/drivers/dribling.cpp +++ b/src/mame/drivers/dribling.cpp @@ -266,7 +266,7 @@ void dribling_state::machine_reset() } -static MACHINE_CONFIG_START( dribling ) +MACHINE_CONFIG_START(dribling_state::dribling) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5000000) diff --git a/src/mame/drivers/drmicro.cpp b/src/mame/drivers/drmicro.cpp index 2e407b5aa20..f0580b8a4c6 100644 --- a/src/mame/drivers/drmicro.cpp +++ b/src/mame/drivers/drmicro.cpp @@ -238,7 +238,7 @@ void drmicro_state::machine_reset() } -static MACHINE_CONFIG_START( drmicro ) +MACHINE_CONFIG_START(drmicro_state::drmicro) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,MCLK/6) /* 3.072MHz? */ diff --git a/src/mame/drivers/drtomy.cpp b/src/mame/drivers/drtomy.cpp index f7bc2dfbe1d..157acd963ac 100644 --- a/src/mame/drivers/drtomy.cpp +++ b/src/mame/drivers/drtomy.cpp @@ -53,6 +53,7 @@ public: required_device m_oki; required_device m_gfxdecode; required_device m_palette; + void drtomy(machine_config &config); }; @@ -299,7 +300,7 @@ void drtomy_state::machine_reset() m_oki_bank = 0; } -static MACHINE_CONFIG_START( drtomy ) +MACHINE_CONFIG_START(drtomy_state::drtomy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* ? MHz */ diff --git a/src/mame/drivers/drw80pkr.cpp b/src/mame/drivers/drw80pkr.cpp index dc21cffa126..8372cdf7f4a 100644 --- a/src/mame/drivers/drw80pkr.cpp +++ b/src/mame/drivers/drw80pkr.cpp @@ -75,6 +75,7 @@ public: uint32_t screen_update_drw80pkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void drw80pkr(machine_config &config); }; @@ -438,7 +439,7 @@ INPUT_PORTS_END * Machine Driver * *************************/ -static MACHINE_CONFIG_START( drw80pkr ) +MACHINE_CONFIG_START(drw80pkr_state::drw80pkr) // basic machine hardware MCFG_CPU_ADD("maincpu", I8039, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(drw80pkr_map) diff --git a/src/mame/drivers/dsb46.cpp b/src/mame/drivers/dsb46.cpp index a488d18a55a..411e1334835 100644 --- a/src/mame/drivers/dsb46.cpp +++ b/src/mame/drivers/dsb46.cpp @@ -49,6 +49,7 @@ public: DECLARE_DRIVER_INIT(dsb46); DECLARE_MACHINE_RESET(dsb46); + void dsb46(machine_config &config); private: required_device m_maincpu; }; @@ -102,7 +103,7 @@ static const z80_daisy_config daisy_chain[] = }; -static MACHINE_CONFIG_START( dsb46 ) +MACHINE_CONFIG_START(dsb46_state::dsb46) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 6) MCFG_CPU_PROGRAM_MAP(dsb46_mem) diff --git a/src/mame/drivers/dual68.cpp b/src/mame/drivers/dual68.cpp index bf152f1b346..9075404be4a 100644 --- a/src/mame/drivers/dual68.cpp +++ b/src/mame/drivers/dual68.cpp @@ -29,6 +29,7 @@ public: void kbd_put(u8 data); DECLARE_WRITE16_MEMBER(terminal_w); + void dual68(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -89,7 +90,7 @@ void dual68_state::kbd_put(u8 data) //m_term_data = data; } -static MACHINE_CONFIG_START( dual68 ) +MACHINE_CONFIG_START(dual68_state::dual68) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz / 2) MCFG_CPU_PROGRAM_MAP(dual68_mem) diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp index 12ff4955e77..c8c9cc75942 100644 --- a/src/mame/drivers/dunhuang.cpp +++ b/src/mame/drivers/dunhuang.cpp @@ -102,6 +102,7 @@ public: DECLARE_READ8_MEMBER(dsw_r); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void dunhuang(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -796,7 +797,7 @@ void dunhuang_state::machine_reset() } -static MACHINE_CONFIG_START( dunhuang ) +MACHINE_CONFIG_START(dunhuang_state::dunhuang) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/2) diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp index ac44370142c..0d312e821dd 100644 --- a/src/mame/drivers/dvk_kcgd.cpp +++ b/src/mame/drivers/dvk_kcgd.cpp @@ -98,6 +98,7 @@ public: emu_timer *m_vsync_off_timer; emu_timer *m_500hz_timer; + void kcgd(machine_config &config); private: void draw_scanline(uint16_t *p, uint16_t offset); rectangle m_tmpclip; @@ -343,7 +344,7 @@ static GFXDECODE_START( kcgd ) GFXDECODE_ENTRY("maincpu", 0112236, kcgd_charlayout, 0, 1) GFXDECODE_END -static MACHINE_CONFIG_START( kcgd ) +MACHINE_CONFIG_START(kcgd_state::kcgd) MCFG_CPU_ADD("maincpu", K1801VM2, XTAL_30_8MHz/4) MCFG_CPU_PROGRAM_MAP(kcgd_mem) MCFG_T11_INITIAL_MODE(0100000) diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp index 803305b9491..be13554bf56 100644 --- a/src/mame/drivers/dvk_ksm.cpp +++ b/src/mame/drivers/dvk_ksm.cpp @@ -123,6 +123,7 @@ public: DECLARE_WRITE8_MEMBER(ksm_ppi_porta_w); DECLARE_WRITE8_MEMBER(ksm_ppi_portc_w); + void ksm(machine_config &config); private: uint32_t draw_scanline(uint16_t *p, uint16_t offset, uint8_t scanline); rectangle m_tmpclip; @@ -410,7 +411,7 @@ static GFXDECODE_START( ksm ) GFXDECODE_ENTRY("chargen", 0x0000, ksm_charlayout, 0, 1) GFXDECODE_END -static MACHINE_CONFIG_START( ksm ) +MACHINE_CONFIG_START(ksm_state::ksm) MCFG_CPU_ADD("maincpu", I8080, XTAL_15_4MHz/10) MCFG_CPU_PROGRAM_MAP(ksm_mem) MCFG_CPU_IO_MAP(ksm_io) diff --git a/src/mame/drivers/dwarfd.cpp b/src/mame/drivers/dwarfd.cpp index e78b7bba441..158c97afc46 100644 --- a/src/mame/drivers/dwarfd.cpp +++ b/src/mame/drivers/dwarfd.cpp @@ -344,6 +344,9 @@ public: I8275_DRAW_CHARACTER_MEMBER(display_pixels); I8275_DRAW_CHARACTER_MEMBER(pesp_display_pixels); I8275_DRAW_CHARACTER_MEMBER(qc_display_pixels); + void dwarfd(machine_config &config); + void pokeresp(machine_config &config); + void qc(machine_config &config); }; @@ -790,7 +793,7 @@ void dwarfd_state::machine_reset() m_back_color = false; } -static MACHINE_CONFIG_START( dwarfd ) +MACHINE_CONFIG_START(dwarfd_state::dwarfd) /* basic machine hardware */ /* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */ @@ -823,7 +826,7 @@ static MACHINE_CONFIG_START( dwarfd ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pokeresp, dwarfd ) +MACHINE_CONFIG_DERIVED(dwarfd_state::pokeresp, dwarfd) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pokeresp_map) MCFG_CPU_IO_MAP(io_map) @@ -832,7 +835,7 @@ static MACHINE_CONFIG_DERIVED( pokeresp, dwarfd ) MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(dwarfd_state, pesp_display_pixels) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( qc, dwarfd ) +MACHINE_CONFIG_DERIVED(dwarfd_state::qc, dwarfd) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(qc_map) diff --git a/src/mame/drivers/dynadice.cpp b/src/mame/drivers/dynadice.cpp index 9f4a665fec0..a67f180b08c 100644 --- a/src/mame/drivers/dynadice.cpp +++ b/src/mame/drivers/dynadice.cpp @@ -73,6 +73,7 @@ public: uint32_t screen_update_dynadice(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void dynadice(machine_config &config); }; @@ -238,7 +239,7 @@ void dynadice_state::machine_reset() m_ay_data = 0; } -static MACHINE_CONFIG_START( dynadice ) +MACHINE_CONFIG_START(dynadice_state::dynadice) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080,18432000/8) diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp index b1e1d1f3ad0..b24e9f2138d 100644 --- a/src/mame/drivers/dynax.cpp +++ b/src/mame/drivers/dynax.cpp @@ -4182,7 +4182,7 @@ MACHINE_START_MEMBER(dynax_state,hanamai) Castle Of Dracula ***************************************************************************/ -static MACHINE_CONFIG_START( cdracula ) +MACHINE_CONFIG_START(dynax_state::cdracula) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/4) /* 5.3693175MHz measured */ @@ -4226,7 +4226,7 @@ MACHINE_CONFIG_END Hana no Mai ***************************************************************************/ -static MACHINE_CONFIG_START( hanamai ) +MACHINE_CONFIG_START(dynax_state::hanamai) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */ @@ -4290,7 +4290,7 @@ MACHINE_CONFIG_END Hana Oriduru ***************************************************************************/ -static MACHINE_CONFIG_START( hnoridur ) +MACHINE_CONFIG_START(dynax_state::hnoridur) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,XTAL_22MHz / 4) /* 5.5MHz */ @@ -4353,7 +4353,7 @@ MACHINE_CONFIG_END Hana Jingi ***************************************************************************/ -static MACHINE_CONFIG_START( hjingi ) +MACHINE_CONFIG_START(dynax_state::hjingi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_22MHz / 4) @@ -4418,7 +4418,7 @@ MACHINE_CONFIG_END Sports Match ***************************************************************************/ -static MACHINE_CONFIG_START( sprtmtch ) +MACHINE_CONFIG_START(dynax_state::sprtmtch) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,22000000 / 4) /* 5.5MHz */ @@ -4470,7 +4470,7 @@ MACHINE_CONFIG_END Mahjong Friday ***************************************************************************/ -static MACHINE_CONFIG_START( mjfriday ) +MACHINE_CONFIG_START(dynax_state::mjfriday) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,24000000/4) /* 6 MHz? */ @@ -4519,7 +4519,7 @@ MACHINE_CONFIG_END Mahjong Dial Q2 ***************************************************************************/ -static MACHINE_CONFIG_DERIVED( mjdialq2, mjfriday ) +MACHINE_CONFIG_DERIVED(dynax_state::mjdialq2, mjfriday) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4547,7 +4547,7 @@ INTERRUPT_GEN_MEMBER(dynax_state::yarunara_clock_interrupt) sprtmtch_update_irq(); } -static MACHINE_CONFIG_DERIVED( yarunara, hnoridur ) +MACHINE_CONFIG_DERIVED(dynax_state::yarunara, hnoridur) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4569,13 +4569,13 @@ static MACHINE_CONFIG_DERIVED( yarunara, hnoridur ) MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjangels, yarunara ) +MACHINE_CONFIG_DERIVED(dynax_state::mjangels, yarunara) MCFG_DEVICE_MODIFY("bankdev") MCFG_DEVICE_PROGRAM_MAP(mjangels_banked_map) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(21) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quiztvqq, mjangels ) +MACHINE_CONFIG_DERIVED(dynax_state::quiztvqq, mjangels) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4587,7 +4587,7 @@ MACHINE_CONFIG_END Mahjong Campus Hunting ***************************************************************************/ -static MACHINE_CONFIG_DERIVED( mcnpshnt, hnoridur ) +MACHINE_CONFIG_DERIVED(dynax_state::mcnpshnt, hnoridur) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mcnpshnt_mem_map) MCFG_CPU_IO_MAP(mcnpshnt_io_map) @@ -4600,7 +4600,7 @@ MACHINE_CONFIG_END 7jigen ***************************************************************************/ -static MACHINE_CONFIG_DERIVED( nanajign, hnoridur ) +MACHINE_CONFIG_DERIVED(dynax_state::nanajign, hnoridur) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(nanajign_mem_map) MCFG_CPU_IO_MAP(nanajign_io_map) @@ -4628,7 +4628,7 @@ MACHINE_START_MEMBER(dynax_state,jantouki) } -static MACHINE_CONFIG_START( jantouki ) +MACHINE_CONFIG_START(dynax_state::jantouki) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */ @@ -4698,7 +4698,7 @@ static MACHINE_CONFIG_START( jantouki ) MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( janyuki, jantouki ) +MACHINE_CONFIG_DERIVED(dynax_state::janyuki, jantouki) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(dynax_state,janyuki) // static palette MACHINE_CONFIG_END @@ -4721,7 +4721,7 @@ void dynax_state::mjelctrn_update_irq() cpu.trg2(1); } -static MACHINE_CONFIG_DERIVED( mjelctrn, hnoridur ) +MACHINE_CONFIG_DERIVED(dynax_state::mjelctrn, hnoridur) MCFG_CPU_REPLACE("maincpu", TMPZ84C015, XTAL_22MHz / 4) MCFG_CPU_PROGRAM_MAP(nanajign_mem_map) MCFG_CPU_IO_MAP(mjelctrn_io_map) @@ -4741,7 +4741,7 @@ static MACHINE_CONFIG_DERIVED( mjelctrn, hnoridur ) MCFG_VIDEO_START_OVERRIDE(dynax_state,mjelctrn) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjembase, mjelctrn ) +MACHINE_CONFIG_DERIVED(dynax_state::mjembase, mjelctrn) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(mjembase_io_map) MCFG_TMPZ84C015_IN_PA_CB(IOPORT("DSW1")) @@ -4765,7 +4765,7 @@ MACHINE_CONFIG_END 0x40 is vblank 0x46 is a periodic irq? */ -static MACHINE_CONFIG_DERIVED( neruton, mjelctrn ) +MACHINE_CONFIG_DERIVED(dynax_state::neruton, mjelctrn) MCFG_VIDEO_START_OVERRIDE(dynax_state,neruton) MACHINE_CONFIG_END @@ -4792,7 +4792,7 @@ WRITE_LINE_MEMBER(dynax_state::tenkai_blitter_ack_w) } -static MACHINE_CONFIG_START( tenkai ) +MACHINE_CONFIG_START(dynax_state::tenkai) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",TMP91640, 21472700 / 2) @@ -4855,13 +4855,13 @@ static MACHINE_CONFIG_START( tenkai ) MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ2)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( majrjhdx, tenkai ) +MACHINE_CONFIG_DERIVED(dynax_state::majrjhdx, tenkai) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(512) MCFG_PALETTE_INIT_OWNER(dynax_state,sprtmtch) // static palette MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjreach, tenkai ) +MACHINE_CONFIG_DERIVED(dynax_state::mjreach, tenkai) MCFG_DEVICE_MODIFY("mainlatch") MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(dynax_state, flipscreen_w)) // not inverted MACHINE_CONFIG_END @@ -4870,7 +4870,7 @@ MACHINE_CONFIG_END Mahjong Gekisha ***************************************************************************/ -static MACHINE_CONFIG_START( gekisha ) +MACHINE_CONFIG_START(dynax_state::gekisha) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",TMP90841, XTAL_10MHz ) // ? diff --git a/src/mame/drivers/dynduke.cpp b/src/mame/drivers/dynduke.cpp index be3cbe3c537..6e66245ef1a 100644 --- a/src/mame/drivers/dynduke.cpp +++ b/src/mame/drivers/dynduke.cpp @@ -304,7 +304,7 @@ INTERRUPT_GEN_MEMBER(dynduke_state::interrupt) /* Machine Driver */ -static MACHINE_CONFIG_START( dynduke ) +MACHINE_CONFIG_START(dynduke_state::dynduke) // basic machine hardware MCFG_CPU_ADD("maincpu", V30, 16000000/2) // NEC V30-8 CPU MCFG_CPU_PROGRAM_MAP(master_map) @@ -357,7 +357,7 @@ static MACHINE_CONFIG_START( dynduke ) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dbldyn, dynduke ) +MACHINE_CONFIG_DERIVED(dynduke_state::dbldyn, dynduke) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(masterj_map) diff --git a/src/mame/drivers/e100.cpp b/src/mame/drivers/e100.cpp index 255e07f5efb..d4631266db1 100644 --- a/src/mame/drivers/e100.cpp +++ b/src/mame/drivers/e100.cpp @@ -178,6 +178,7 @@ public: DECLARE_WRITE_LINE_MEMBER( pia1_ca2_w); DECLARE_WRITE_LINE_MEMBER( pia1_cb2_w); TIMER_DEVICE_CALLBACK_MEMBER(rtc_w); + void e100(machine_config &config); protected: required_ioport m_io_line0; required_ioport m_io_line1; @@ -539,7 +540,7 @@ static INPUT_PORTS_START( e100 ) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) INPUT_PORTS_END -static MACHINE_CONFIG_START( e100 ) +MACHINE_CONFIG_START(e100_state::e100) MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(e100_map) diff --git a/src/mame/drivers/eacc.cpp b/src/mame/drivers/eacc.cpp index 416d4fe79ad..d4b349b808f 100644 --- a/src/mame/drivers/eacc.cpp +++ b/src/mame/drivers/eacc.cpp @@ -81,6 +81,7 @@ public: virtual void machine_reset() override; TIMER_DEVICE_CALLBACK_MEMBER(eacc_cb1); TIMER_DEVICE_CALLBACK_MEMBER(eacc_nmi); + void eacc(machine_config &config); private: uint8_t m_digit; }; @@ -238,7 +239,7 @@ WRITE8_MEMBER( eacc_state::eacc_digit_w ) Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( eacc ) +MACHINE_CONFIG_START(eacc_state::eacc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6802, XTAL_3_579545MHz) /* Divided by 4 inside the m6802*/ MCFG_CPU_PROGRAM_MAP(eacc_mem) diff --git a/src/mame/drivers/ec184x.cpp b/src/mame/drivers/ec184x.cpp index e36ba6224e5..0ca9ddf2282 100644 --- a/src/mame/drivers/ec184x.cpp +++ b/src/mame/drivers/ec184x.cpp @@ -54,6 +54,9 @@ public: DECLARE_READ8_MEMBER(memboard_r); DECLARE_WRITE8_MEMBER(memboard_w); + void ec1841(machine_config &config); + void ec1847(machine_config &config); + void ec1840(machine_config &config); }; /* @@ -208,7 +211,7 @@ ADDRESS_MAP_END // XXX verify everything -static MACHINE_CONFIG_START( ec1840 ) +MACHINE_CONFIG_START(ec184x_state::ec1840) MCFG_CPU_ADD("maincpu", I8088, 4096000) MCFG_CPU_PROGRAM_MAP(ec1840_map) MCFG_CPU_IO_MAP(ec1840_io) @@ -231,7 +234,7 @@ static MACHINE_CONFIG_START( ec1840 ) MCFG_RAM_DEFAULT_SIZE("512K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ec1841 ) +MACHINE_CONFIG_START(ec184x_state::ec1841) MCFG_CPU_ADD("maincpu", I8086, 4096000) MCFG_CPU_PROGRAM_MAP(ec1841_map) MCFG_CPU_IO_MAP(ec1841_io) @@ -258,7 +261,7 @@ static MACHINE_CONFIG_START( ec1841 ) MACHINE_CONFIG_END // XXX verify everything -static MACHINE_CONFIG_START( ec1847 ) +MACHINE_CONFIG_START(ec184x_state::ec1847) MCFG_CPU_ADD("maincpu", I8088, 4772720) MCFG_CPU_PROGRAM_MAP(ec1847_map) MCFG_CPU_IO_MAP(ec1847_io) diff --git a/src/mame/drivers/ec65.cpp b/src/mame/drivers/ec65.cpp index cbd2865f5d1..f6ddeaa94e7 100644 --- a/src/mame/drivers/ec65.cpp +++ b/src/mame/drivers/ec65.cpp @@ -44,6 +44,7 @@ public: void kbd_put(u8 data); MC6845_UPDATE_ROW(crtc_update_row); + void ec65(machine_config &config); private: virtual void machine_reset() override; required_device m_via_0; @@ -61,6 +62,7 @@ public: : driver_device(mconfig, type, tag) { } + void ec65k(machine_config &config); }; static ADDRESS_MAP_START(ec65_mem, AS_PROGRAM, 8, ec65_state) @@ -164,7 +166,7 @@ static GFXDECODE_START( ec65 ) GFXDECODE_ENTRY( "chargen", 0x0000, ec65_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( ec65 ) +MACHINE_CONFIG_START(ec65_state::ec65) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6502, XTAL_4MHz / 4) @@ -202,7 +204,7 @@ static MACHINE_CONFIG_START( ec65 ) MCFG_GENERIC_KEYBOARD_CB(PUT(ec65_state, kbd_put)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ec65k ) +MACHINE_CONFIG_START(ec65k_state::ec65k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",G65816, XTAL_4MHz) // can use 4,2 or 1 MHz diff --git a/src/mame/drivers/ecoinf1.cpp b/src/mame/drivers/ecoinf1.cpp index d390eba3df1..5f6b846306d 100644 --- a/src/mame/drivers/ecoinf1.cpp +++ b/src/mame/drivers/ecoinf1.cpp @@ -23,6 +23,7 @@ public: m_maincpu(*this, "maincpu") { } DECLARE_DRIVER_INIT(ecoinf1); required_device m_maincpu; + void ecoinf1_older(machine_config &config); }; @@ -248,7 +249,7 @@ static INPUT_PORTS_START( ecoinf1 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ecoinf1_older ) +MACHINE_CONFIG_START(ecoinf1_state::ecoinf1_older) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,4000000) MCFG_CPU_PROGRAM_MAP(older_memmap) diff --git a/src/mame/drivers/ecoinf2.cpp b/src/mame/drivers/ecoinf2.cpp index dcfcd6c3fe7..4b90fd84b01 100644 --- a/src/mame/drivers/ecoinf2.cpp +++ b/src/mame/drivers/ecoinf2.cpp @@ -226,6 +226,7 @@ public: DECLARE_MACHINE_START(ecoinf2); + void ecoinf2_oxo(machine_config &config); }; @@ -500,7 +501,7 @@ static INPUT_PORTS_START( ecoinf2 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ecoinf2_oxo ) +MACHINE_CONFIG_START(ecoinf2_state::ecoinf2_oxo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180,4000000) // some of these hit invalid opcodes with a plain z80, some don't? MCFG_CPU_PROGRAM_MAP(oxo_memmap) diff --git a/src/mame/drivers/ecoinf3.cpp b/src/mame/drivers/ecoinf3.cpp index 2a990dc2f3d..c032abdd12a 100644 --- a/src/mame/drivers/ecoinf3.cpp +++ b/src/mame/drivers/ecoinf3.cpp @@ -274,6 +274,7 @@ public: DECLARE_DRIVER_INIT(ecoinf3); DECLARE_DRIVER_INIT(ecoinf3_swap); + void ecoinf3_pyramid(machine_config &config); }; @@ -660,7 +661,7 @@ static INPUT_PORTS_START( ecoinf3 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ecoinf3_pyramid ) +MACHINE_CONFIG_START(ecoinf3_state::ecoinf3_pyramid) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180,8000000) // certainly not a plain z80 at least, invalid opcodes for that diff --git a/src/mame/drivers/ecoinfr.cpp b/src/mame/drivers/ecoinfr.cpp index c72a1260f24..b955fc08f67 100644 --- a/src/mame/drivers/ecoinfr.cpp +++ b/src/mame/drivers/ecoinfr.cpp @@ -123,6 +123,7 @@ public: required_device m_reel1; required_device m_reel2; required_device m_reel3; + void ecoinfr(machine_config &config); }; @@ -770,7 +771,7 @@ void ecoinfr_state::machine_reset() } -static MACHINE_CONFIG_START( ecoinfr ) +MACHINE_CONFIG_START(ecoinfr_state::ecoinfr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,4000000) MCFG_CPU_PROGRAM_MAP(memmap) diff --git a/src/mame/drivers/egghunt.cpp b/src/mame/drivers/egghunt.cpp index 6988f9b9c95..7323c8b5a86 100644 --- a/src/mame/drivers/egghunt.cpp +++ b/src/mame/drivers/egghunt.cpp @@ -97,6 +97,7 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_soundlatch; + void egghunt(machine_config &config); }; @@ -417,7 +418,7 @@ void egghunt_state::machine_reset() m_vidram_bank = 0; } -static MACHINE_CONFIG_START( egghunt ) +MACHINE_CONFIG_START(egghunt_state::egghunt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz ?*/ diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp index ce1d75f413b..c51c77533fe 100644 --- a/src/mame/drivers/einstein.cpp +++ b/src/mame/drivers/einstein.cpp @@ -107,6 +107,7 @@ public: DECLARE_WRITE_LINE_MEMBER(ardy_w); TIMER_DEVICE_CALLBACK_MEMBER(strobe_callback); + void einstein(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -569,7 +570,7 @@ static SLOT_INTERFACE_START( einstein_floppies ) SLOT_INTERFACE("35dd", FLOPPY_35_DD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( einstein ) +MACHINE_CONFIG_START(einstein_state::einstein) /* basic machine hardware */ MCFG_CPU_ADD(IC_I001, Z80, XTAL_X002 / 2) MCFG_CPU_PROGRAM_MAP(einstein_mem) diff --git a/src/mame/drivers/electra.cpp b/src/mame/drivers/electra.cpp index 5ee0471face..902ded5dd18 100644 --- a/src/mame/drivers/electra.cpp +++ b/src/mame/drivers/electra.cpp @@ -54,6 +54,7 @@ public: required_device m_maincpu; required_device m_video; + void electra(machine_config &config); protected: // driver_device overrides @@ -94,7 +95,7 @@ void electra_state::video_start() { } -static MACHINE_CONFIG_START( electra ) +MACHINE_CONFIG_START(electra_state::electra) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/electron.cpp b/src/mame/drivers/electron.cpp index 0bd6611e052..c3d344e53ce 100644 --- a/src/mame/drivers/electron.cpp +++ b/src/mame/drivers/electron.cpp @@ -197,7 +197,7 @@ static INPUT_PORTS_START( electron ) PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("BREAK") PORT_CODE(KEYCODE_F12) PORT_CHAR(UCHAR_MAMEKEY(F12)) PORT_CHANGED_MEMBER(DEVICE_SELF, electron_state, trigger_reset, 0) INPUT_PORTS_END -static MACHINE_CONFIG_START( electron ) +MACHINE_CONFIG_START(electron_state::electron) MCFG_CPU_ADD( "maincpu", M6502, XTAL_16MHz/8 ) MCFG_CPU_PROGRAM_MAP( electron_mem ) @@ -237,7 +237,7 @@ static MACHINE_CONFIG_START( electron ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( btm2105, electron ) +MACHINE_CONFIG_DERIVED(electron_state::btm2105, electron) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_COLOR(rgb_t::amber()) diff --git a/src/mame/drivers/elekscmp.cpp b/src/mame/drivers/elekscmp.cpp index 7813e4d8d6f..c2055e2138d 100644 --- a/src/mame/drivers/elekscmp.cpp +++ b/src/mame/drivers/elekscmp.cpp @@ -44,6 +44,7 @@ public: DECLARE_WRITE8_MEMBER(hex_display_w); uint8_t convert_key(uint8_t data); + void elekscmp(machine_config &config); private: required_device m_maincpu; required_ioport m_x0; @@ -140,7 +141,7 @@ static INPUT_PORTS_START( elekscmp ) PORT_BIT(0xfe, IP_ACTIVE_HIGH, IPT_UNUSED) INPUT_PORTS_END -static MACHINE_CONFIG_START( elekscmp ) +MACHINE_CONFIG_START(elekscmp_state::elekscmp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",INS8060, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/elektronmono.cpp b/src/mame/drivers/elektronmono.cpp index eb589001e37..6c3eda98887 100644 --- a/src/mame/drivers/elektronmono.cpp +++ b/src/mame/drivers/elektronmono.cpp @@ -129,6 +129,7 @@ public: virtual void machine_reset() override; DECLARE_DRIVER_INIT(elektron); + void elektron(machine_config &config); }; void elekmono_state::machine_start() @@ -150,7 +151,7 @@ static ADDRESS_MAP_START( elektron_map, AS_PROGRAM, 32, elekmono_state ) AM_RANGE(0x10000000, 0x107fffff) AM_ROM AM_REGION("maincpu", 0) ADDRESS_MAP_END -static MACHINE_CONFIG_START( elektron ) +MACHINE_CONFIG_START(elekmono_state::elektron) MCFG_CPU_ADD("maincpu", MCF5206E, XTAL_25_447MHz) MCFG_CPU_PROGRAM_MAP(elektron_map) diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp index 40979ef6ef1..33116a74ceb 100644 --- a/src/mame/drivers/elf.cpp +++ b/src/mame/drivers/elf.cpp @@ -230,7 +230,7 @@ QUICKLOAD_LOAD_MEMBER( elf2_state, elf ) return image_init_result::PASS; } -static MACHINE_CONFIG_START( elf2 ) +MACHINE_CONFIG_START(elf2_state::elf2) /* basic machine hardware */ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_3_579545MHz/2) MCFG_CPU_PROGRAM_MAP(elf2_mem) diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp index 43e2cc8adc9..6edd0de8afc 100644 --- a/src/mame/drivers/elwro800.cpp +++ b/src/mame/drivers/elwro800.cpp @@ -67,6 +67,7 @@ public: DECLARE_WRITE8_MEMBER(i8255_port_c_w); DECLARE_WRITE_LINE_MEMBER(write_centronics_ack); + void elwro800(machine_config &config); protected: required_device m_i8251; required_device m_i8255; @@ -554,7 +555,7 @@ static GFXDECODE_START( elwro800 ) GFXDECODE_END -static MACHINE_CONFIG_START( elwro800 ) +MACHINE_CONFIG_START(elwro800_state::elwro800) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, 3500000) /* 3.5 MHz */ diff --git a/src/mame/drivers/embargo.cpp b/src/mame/drivers/embargo.cpp index eb6583ed72f..b66ffe8d068 100644 --- a/src/mame/drivers/embargo.cpp +++ b/src/mame/drivers/embargo.cpp @@ -35,6 +35,7 @@ public: virtual void machine_reset() override; uint32_t screen_update_embargo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void embargo(machine_config &config); }; @@ -257,7 +258,7 @@ void embargo_state::machine_reset() * *************************************/ -static MACHINE_CONFIG_START( embargo ) +MACHINE_CONFIG_START(embargo_state::embargo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 625000) diff --git a/src/mame/drivers/enigma2.cpp b/src/mame/drivers/enigma2.cpp index 47f2405fd0d..82ad7b374a5 100644 --- a/src/mame/drivers/enigma2.cpp +++ b/src/mame/drivers/enigma2.cpp @@ -109,6 +109,8 @@ public: inline int vysnc_chain_counter_to_vpos( uint16_t counter ); void create_interrupt_timers( ); void start_interrupt_timers( ); + void enigma2(machine_config &config); + void enigma2a(machine_config &config); }; @@ -589,7 +591,7 @@ static INPUT_PORTS_START( enigma2a ) INPUT_PORTS_END -static MACHINE_CONFIG_START( enigma2 ) +MACHINE_CONFIG_START(enigma2_state::enigma2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -617,7 +619,7 @@ static MACHINE_CONFIG_START( enigma2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( enigma2a ) +MACHINE_CONFIG_START(enigma2_state::enigma2a) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, CPU_CLOCK) diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp index cd850283463..01f33e71461 100644 --- a/src/mame/drivers/enmirage.cpp +++ b/src/mame/drivers/enmirage.cpp @@ -74,6 +74,7 @@ public: DECLARE_WRITE_LINE_MEMBER(mirage_doc_irq); DECLARE_READ8_MEMBER(mirage_adc_read); + void mirage(machine_config &config); protected: virtual void machine_reset() override; virtual void video_start() override; @@ -207,7 +208,7 @@ WRITE8_MEMBER(enmirage_state::mirage_via_write_portb) } } -static MACHINE_CONFIG_START( mirage ) +MACHINE_CONFIG_START(enmirage_state::mirage) MCFG_CPU_ADD("maincpu", MC6809E, 2000000) MCFG_CPU_PROGRAM_MAP(mirage_map) diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp index aad1ade9dba..eb8a60f425a 100644 --- a/src/mame/drivers/eolith.cpp +++ b/src/mame/drivers/eolith.cpp @@ -544,7 +544,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( eolith45 ) +MACHINE_CONFIG_START(eolith_state::eolith45) MCFG_CPU_ADD("maincpu", E132N, 45000000) /* 45 MHz */ MCFG_CPU_PROGRAM_MAP(eolith_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", eolith_state, eolith_speedup, "screen", 0, 1) @@ -589,12 +589,12 @@ static MACHINE_CONFIG_START( eolith45 ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( eolith50, eolith45 ) +MACHINE_CONFIG_DERIVED(eolith_state::eolith50, eolith45) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(50000000) /* 50 MHz */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ironfort, eolith45 ) +MACHINE_CONFIG_DERIVED(eolith_state::ironfort, eolith45) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(44900000) /* Normally 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.cpp b/src/mame/drivers/eolith16.cpp index 4934516b59e..09833ece4a7 100644 --- a/src/mame/drivers/eolith16.cpp +++ b/src/mame/drivers/eolith16.cpp @@ -40,6 +40,7 @@ public: DECLARE_PALETTE_INIT(eolith16); uint32_t screen_update_eolith16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void eolith16(machine_config &config); }; @@ -172,7 +173,7 @@ PALETTE_INIT_MEMBER(eolith16_state,eolith16) -static MACHINE_CONFIG_START( eolith16 ) +MACHINE_CONFIG_START(eolith16_state::eolith16) MCFG_CPU_ADD("maincpu", E116T, 60000000) /* no internal multiplier */ MCFG_CPU_PROGRAM_MAP(eolith16_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", eolith16_state, eolith_speedup, "screen", 0, 1) diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp index ed23248dc19..3d30ade7a66 100644 --- a/src/mame/drivers/ep64.cpp +++ b/src/mame/drivers/ep64.cpp @@ -217,6 +217,8 @@ public: DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); int m_centronics_busy; + void ep128(machine_config &config); + void ep64(machine_config &config); }; @@ -556,7 +558,7 @@ void ep64_state::machine_reset() // MACHINE_CONFIG( ep64 ) //------------------------------------------------- -static MACHINE_CONFIG_START( ep64 ) +MACHINE_CONFIG_START(ep64_state::ep64) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(ep64_mem) @@ -611,7 +613,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( ep128 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( ep128, ep64 ) +MACHINE_CONFIG_DERIVED(ep64_state::ep128, ep64) MCFG_DEVICE_MODIFY(DAVE_TAG) MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, dave_128k_mem) diff --git a/src/mame/drivers/epos.cpp b/src/mame/drivers/epos.cpp index 8f1c44d3af7..0c3e279a17a 100644 --- a/src/mame/drivers/epos.cpp +++ b/src/mame/drivers/epos.cpp @@ -453,7 +453,7 @@ MACHINE_START_MEMBER(epos_state,dealer) MACHINE_START_CALL_MEMBER(epos); } -static MACHINE_CONFIG_START( epos ) /* EPOS TRISTAR 8000 PCB */ +MACHINE_CONFIG_START(epos_state::epos) /* EPOS TRISTAR 8000 PCB */ /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_11MHz/4) /* 2.75 MHz schematics confirm 11MHz XTAL (see notes) */ @@ -481,7 +481,7 @@ static MACHINE_CONFIG_START( epos ) /* EPOS TRISTAR 8000 PCB */ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dealer ) /* EPOS TRISTAR 9000 PCB */ +MACHINE_CONFIG_START(epos_state::dealer) /* EPOS TRISTAR 9000 PCB */ /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_22_1184MHz/8) /* 2.7648 MHz (measured) */ diff --git a/src/mame/drivers/eprom.cpp b/src/mame/drivers/eprom.cpp index edfa1931cf2..0fc68071df1 100644 --- a/src/mame/drivers/eprom.cpp +++ b/src/mame/drivers/eprom.cpp @@ -386,7 +386,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( eprom ) +MACHINE_CONFIG_START(eprom_state::eprom) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) @@ -435,7 +435,7 @@ static MACHINE_CONFIG_START( eprom ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( klaxp ) +MACHINE_CONFIG_START(eprom_state::klaxp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) @@ -480,7 +480,7 @@ static MACHINE_CONFIG_START( klaxp ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( guts ) +MACHINE_CONFIG_START(eprom_state::guts) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp index d10fbe2b4c6..cf1c2dfb292 100644 --- a/src/mame/drivers/equites.cpp +++ b/src/mame/drivers/equites.cpp @@ -1028,7 +1028,7 @@ static const char *const alphamc07_sample_names[] = #define MSM5232_BASE_VOLUME 1.0 // the sound board is the same in all games -static MACHINE_CONFIG_START( common_sound ) +MACHINE_CONFIG_START(equites_state::common_sound) MCFG_CPU_ADD("audiocpu", I8085A, XTAL_6_144MHz) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(sound_map) @@ -1127,7 +1127,7 @@ void equites_state::machine_reset() } -static MACHINE_CONFIG_START( equites ) +MACHINE_CONFIG_START(equites_state::equites) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz/4) /* 68000P8 running at 3mhz! verified on pcb */ @@ -1162,7 +1162,7 @@ static MACHINE_CONFIG_START( equites ) MCFG_VIDEO_START_OVERRIDE(equites_state,equites) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gekisou, equites ) +MACHINE_CONFIG_DERIVED(equites_state::gekisou, equites) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1177,7 +1177,7 @@ static MACHINE_CONFIG_DERIVED( gekisou, equites ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( splndrbt ) +MACHINE_CONFIG_START(equites_state::splndrbt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 68000P8 running at 6mhz, verified on pcb */ @@ -1211,7 +1211,7 @@ static MACHINE_CONFIG_START( splndrbt ) MCFG_VIDEO_START_OVERRIDE(equites_state,splndrbt) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hvoltage, splndrbt ) +MACHINE_CONFIG_DERIVED(equites_state::hvoltage, splndrbt) // mcu not dumped, so add simulated mcu MCFG_CPU_ADD("mcu", ALPHA8301L, 4000000/8) diff --git a/src/mame/drivers/ertictac.cpp b/src/mame/drivers/ertictac.cpp index 14fba0cf5a3..efb215aa506 100644 --- a/src/mame/drivers/ertictac.cpp +++ b/src/mame/drivers/ertictac.cpp @@ -41,6 +41,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; INTERRUPT_GEN_MEMBER(ertictac_podule_irq); + void ertictac(machine_config &config); }; @@ -218,7 +219,7 @@ INTERRUPT_GEN_MEMBER(ertictac_state::ertictac_podule_irq) #define NVRAM_SIZE 256 #define NVRAM_PAGE_SIZE 0 /* max size of one write request */ -static MACHINE_CONFIG_START( ertictac ) +MACHINE_CONFIG_START(ertictac_state::ertictac) MCFG_CPU_ADD("maincpu", ARM, XTAL_24MHz/3) /* guess, 12MHz 8MHz or 6MHz, what's the correct divider 2, 3 or 4? */ MCFG_CPU_PROGRAM_MAP(ertictac_map) diff --git a/src/mame/drivers/esd16.cpp b/src/mame/drivers/esd16.cpp index 7ea23540101..8410489c9cb 100644 --- a/src/mame/drivers/esd16.cpp +++ b/src/mame/drivers/esd16.cpp @@ -605,7 +605,7 @@ DECOSPR_PRIORITY_CB_MEMBER(esd16_state::hedpanic_pri_callback) return 0; // above everything } -static MACHINE_CONFIG_START( esd16 ) +MACHINE_CONFIG_START(esd16_state::esd16) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000, XTAL_16MHz) /* 16MHz */ @@ -652,7 +652,7 @@ static MACHINE_CONFIG_START( esd16 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jumppop, esd16 ) +MACHINE_CONFIG_DERIVED(esd16_state::jumppop, esd16) /* basic machine hardware */ @@ -673,7 +673,7 @@ MACHINE_CONFIG_END /* The ESD 05-28-99 PCB adds an EEPROM */ -static MACHINE_CONFIG_DERIVED( hedpanio, esd16 ) +MACHINE_CONFIG_DERIVED(esd16_state::hedpanio, esd16) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(hedpanic_map) @@ -683,19 +683,19 @@ MACHINE_CONFIG_END /* The ESD 08-26-1999 PCBs take that further and modify the sprite offsets */ -static MACHINE_CONFIG_DERIVED( hedpanic, hedpanio ) +MACHINE_CONFIG_DERIVED(esd16_state::hedpanic, hedpanio) MCFG_DEVICE_MODIFY("spritegen") MCFG_DECO_SPRITE_OFFSETS(-0x18, -0x100) MACHINE_CONFIG_END /* ESD 08-26-1999 PCBs with different memory maps */ -static MACHINE_CONFIG_DERIVED( mchampdx, hedpanic ) +MACHINE_CONFIG_DERIVED(esd16_state::mchampdx, hedpanic) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mchampdx_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tangtang, hedpanic ) +MACHINE_CONFIG_DERIVED(esd16_state::tangtang, hedpanic) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tangtang_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/esh.cpp b/src/mame/drivers/esh.cpp index 33ffff1355e..3d0e80247d5 100644 --- a/src/mame/drivers/esh.cpp +++ b/src/mame/drivers/esh.cpp @@ -69,6 +69,7 @@ public: required_device m_beep; required_device m_palette; + void esh(machine_config &config); protected: //virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -350,7 +351,7 @@ void esh_state::machine_start() /* DRIVER */ -static MACHINE_CONFIG_START( esh ) +MACHINE_CONFIG_START(esh_state::esh) /* main cpu */ MCFG_CPU_ADD("maincpu", Z80, PCB_CLOCK/6) /* The denominator is a Daphne guess based on PacMan's hardware */ MCFG_CPU_PROGRAM_MAP(z80_0_mem) diff --git a/src/mame/drivers/espial.cpp b/src/mame/drivers/espial.cpp index fa1cbb24027..556f1946c21 100644 --- a/src/mame/drivers/espial.cpp +++ b/src/mame/drivers/espial.cpp @@ -315,7 +315,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( espial ) +MACHINE_CONFIG_START(espial_state::espial) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */ @@ -352,7 +352,7 @@ static MACHINE_CONFIG_START( espial ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( netwars, espial ) +MACHINE_CONFIG_DERIVED(espial_state::netwars, espial) /* basic machine hardware */ diff --git a/src/mame/drivers/esprit.cpp b/src/mame/drivers/esprit.cpp index 4b5ec164966..4dec8e34845 100644 --- a/src/mame/drivers/esprit.cpp +++ b/src/mame/drivers/esprit.cpp @@ -32,6 +32,8 @@ public: MC6845_UPDATE_ROW(crtc_update_row); DECLARE_DRIVER_INIT(init); + void esprit(machine_config &config); + void esprit3(machine_config &config); private: required_device m_maincpu; required_region_ptr m_p_chargen; @@ -112,7 +114,7 @@ DRIVER_INIT_MEMBER( esprit_state, init ) } -static MACHINE_CONFIG_START( esprit ) +MACHINE_CONFIG_START(esprit_state::esprit) MCFG_CPU_ADD("maincpu", M6502, 1000000) // no idea of clock MCFG_CPU_PROGRAM_MAP(mem_map) @@ -133,7 +135,7 @@ static MACHINE_CONFIG_START( esprit ) MCFG_MC6845_UPDATE_ROW_CB(esprit_state, crtc_update_row) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( esprit3, esprit ) +MACHINE_CONFIG_DERIVED(esprit_state::esprit3, esprit) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mem3_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/esq1.cpp b/src/mame/drivers/esq1.cpp index 9b975c7679a..d0cf83f5ed6 100644 --- a/src/mame/drivers/esq1.cpp +++ b/src/mame/drivers/esq1.cpp @@ -425,6 +425,8 @@ public: DECLARE_INPUT_CHANGED_MEMBER(key_stroke); void send_through_panel(uint8_t data); + void esq1(machine_config &config); + void sq80(machine_config &config); }; @@ -579,7 +581,7 @@ INPUT_CHANGED_MEMBER(esq1_state::key_stroke) } } -static MACHINE_CONFIG_START( esq1 ) +MACHINE_CONFIG_START(esq1_state::esq1) MCFG_CPU_ADD("maincpu", MC6809, XTAL_8MHz) // XTAL not directly attached to CPU MCFG_CPU_PROGRAM_MAP(esq1_map) @@ -619,7 +621,7 @@ static MACHINE_CONFIG_START( esq1 ) MCFG_SOUND_ROUTE_EX(7, "filters", 1.0, 7) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(sq80, esq1) +MACHINE_CONFIG_DERIVED(esq1_state::sq80, esq1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sq80_map) diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp index bc48e68781f..281ff3262cb 100644 --- a/src/mame/drivers/esq5505.cpp +++ b/src/mame/drivers/esq5505.cpp @@ -218,6 +218,11 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); + void sq1(machine_config &config); + void vfx(machine_config &config); + void vfxsd(machine_config &config); + void eps(machine_config &config); + void vfx32(machine_config &config); private: uint16_t *m_rom, *m_ram; uint16_t m_analog_values[8]; @@ -604,7 +609,7 @@ INPUT_CHANGED_MEMBER(esq5505_state::key_stroke) } #endif -static MACHINE_CONFIG_START( vfx ) +MACHINE_CONFIG_START(esq5505_state::vfx) MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP(vfx_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(esq5505_state,maincpu_irq_acknowledge_callback) @@ -650,7 +655,7 @@ static MACHINE_CONFIG_START( vfx ) MCFG_SOUND_ROUTE_EX(7, "pump", 1.0, 7) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(eps, vfx) +MACHINE_CONFIG_DERIVED(esq5505_state::eps, vfx) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(eps_map) @@ -672,7 +677,7 @@ static MACHINE_CONFIG_DERIVED(eps, vfx) MCFG_HD63450_DMA_WRITE_0_CB(WRITE8(esq5505_state, fdc_write_byte)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(vfxsd, vfx) +MACHINE_CONFIG_DERIVED(esq5505_state::vfxsd, vfx) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(vfxsd_map) @@ -681,7 +686,7 @@ static MACHINE_CONFIG_DERIVED(vfxsd, vfx) MACHINE_CONFIG_END // 32-voice machines with the VFX-SD type config -static MACHINE_CONFIG_START(vfx32) +MACHINE_CONFIG_START(esq5505_state::vfx32) MCFG_CPU_ADD("maincpu", M68000, XTAL_30_4761MHz / 2) MCFG_CPU_PROGRAM_MAP(vfxsd_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(esq5505_state,maincpu_irq_acknowledge_callback) @@ -730,7 +735,7 @@ static MACHINE_CONFIG_START(vfx32) MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", esq5505_state::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(sq1, vfx) +MACHINE_CONFIG_DERIVED(esq5505_state::sq1, vfx) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(sq1_map) diff --git a/src/mame/drivers/esqasr.cpp b/src/mame/drivers/esqasr.cpp index 6a7f5885136..87ced9c65be 100644 --- a/src/mame/drivers/esqasr.cpp +++ b/src/mame/drivers/esqasr.cpp @@ -67,6 +67,8 @@ public: DECLARE_DRIVER_INIT(asr); DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq); DECLARE_READ16_MEMBER(esq5506_read_adc); + void asrx(machine_config &config); + void asr(machine_config &config); }; void esqasr_state::machine_reset() @@ -93,7 +95,7 @@ READ16_MEMBER(esqasr_state::esq5506_read_adc) return 0; } -static MACHINE_CONFIG_START( asr ) +MACHINE_CONFIG_START(esqasr_state::asr) MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // actually MC68302 MCFG_CPU_PROGRAM_MAP(asr_map) @@ -115,7 +117,7 @@ static MACHINE_CONFIG_START( asr ) MCFG_SOUND_ROUTE(1, "rspeaker", 2.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( asrx ) +MACHINE_CONFIG_START(esqasr_state::asrx) MCFG_CPU_ADD("maincpu", M68020, XTAL_16MHz) // unknown, possibly 68340? MCFG_CPU_PROGRAM_MAP(asrx_map) diff --git a/src/mame/drivers/esqkt.cpp b/src/mame/drivers/esqkt.cpp index c20cf0f1c63..b07298d716f 100644 --- a/src/mame/drivers/esqkt.cpp +++ b/src/mame/drivers/esqkt.cpp @@ -132,6 +132,7 @@ public: DECLARE_DRIVER_INIT(kt); DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq); DECLARE_READ16_MEMBER(esq5506_read_adc); + void kt(machine_config &config); }; void esqkt_state::machine_reset() @@ -201,7 +202,7 @@ WRITE_LINE_MEMBER(esqkt_state::duart_tx_b) m_sq1panel->rx_w(state); } -static MACHINE_CONFIG_START( kt ) +MACHINE_CONFIG_START(esqkt_state::kt) MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(kt_map) diff --git a/src/mame/drivers/esqmr.cpp b/src/mame/drivers/esqmr.cpp index 0ba06ae71f4..84a328879f3 100644 --- a/src/mame/drivers/esqmr.cpp +++ b/src/mame/drivers/esqmr.cpp @@ -226,6 +226,7 @@ public: DECLARE_DRIVER_INIT(mr); DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq); DECLARE_READ16_MEMBER(esq5506_read_adc); + void mr(machine_config &config); }; void esqmr_state::machine_reset() @@ -248,7 +249,7 @@ READ16_MEMBER(esqmr_state::esq5506_read_adc) return 0; } -static MACHINE_CONFIG_START( mr ) +MACHINE_CONFIG_START(esqmr_state::mr) MCFG_CPU_ADD("maincpu", M68340, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(mr_map) diff --git a/src/mame/drivers/esripsys.cpp b/src/mame/drivers/esripsys.cpp index 8186124ecec..748e3befd0c 100644 --- a/src/mame/drivers/esripsys.cpp +++ b/src/mame/drivers/esripsys.cpp @@ -660,7 +660,7 @@ DRIVER_INIT_MEMBER(esripsys_state,esripsys) save_item(NAME(m_fbsel)); } -static MACHINE_CONFIG_START( esripsys ) +MACHINE_CONFIG_START(esripsys_state::esripsys) MCFG_CPU_ADD("game_cpu", MC6809E, XTAL_8MHz / 4) MCFG_CPU_PROGRAM_MAP(game_cpu_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", esripsys_state, esripsys_vblank_irq) diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp index 7251496d27e..fbd3b5530c0 100644 --- a/src/mame/drivers/et3400.cpp +++ b/src/mame/drivers/et3400.cpp @@ -56,6 +56,7 @@ public: DECLARE_WRITE8_MEMBER(pia_bw); DECLARE_WRITE_LINE_MEMBER(reset_key_w); DECLARE_WRITE_LINE_MEMBER(segment_test_w); + void et3400(machine_config &config); private: required_device m_maincpu; required_device m_pia; @@ -203,7 +204,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( et3400 ) +MACHINE_CONFIG_START(et3400_state::et3400) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_4MHz / 4 ) // 1MHz with memory i/o accessory, or 500khz without it MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp index 82781b86bd2..45b0760713f 100644 --- a/src/mame/drivers/eti660.cpp +++ b/src/mame/drivers/eti660.cpp @@ -302,7 +302,7 @@ QUICKLOAD_LOAD_MEMBER( eti660_state, eti660 ) /* Machine Drivers */ -static MACHINE_CONFIG_START( eti660 ) +MACHINE_CONFIG_START(eti660_state::eti660) /* basic machine hardware */ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_8_867238MHz/5) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/ettrivia.cpp b/src/mame/drivers/ettrivia.cpp index cc80a38ee3b..d2a4432d6fa 100644 --- a/src/mame/drivers/ettrivia.cpp +++ b/src/mame/drivers/ettrivia.cpp @@ -75,6 +75,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device_array m_ay; + void ettrivia(machine_config &config); }; @@ -289,7 +290,7 @@ INTERRUPT_GEN_MEMBER(ettrivia_state::ettrivia_interrupt) device.execute().set_input_line(0, HOLD_LINE); } -static MACHINE_CONFIG_START( ettrivia ) +MACHINE_CONFIG_START(ettrivia_state::ettrivia) MCFG_CPU_ADD("maincpu", Z80,12000000/4-48000) //should be ok, it gives the 300 interrupts expected MCFG_CPU_PROGRAM_MAP(cpu_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/eurocom2.cpp b/src/mame/drivers/eurocom2.cpp index 00824337beb..e3927672831 100644 --- a/src/mame/drivers/eurocom2.cpp +++ b/src/mame/drivers/eurocom2.cpp @@ -92,6 +92,7 @@ public: DECLARE_READ_LINE_MEMBER(pia1_cb1_r); DECLARE_WRITE_LINE_MEMBER(pia1_cb2_w); + void eurocom2(machine_config &config); protected: // driver_device overrides virtual void machine_reset() override; @@ -139,6 +140,7 @@ public: DECLARE_READ8_MEMBER(waveterm_adc); DECLARE_WRITE8_MEMBER(waveterm_dac); + void waveterm(machine_config &config); protected: bool m_driveh; uint8_t m_drive; @@ -426,7 +428,7 @@ static SLOT_INTERFACE_START( eurocom_floppies ) SLOT_INTERFACE( "8dsdd", FLOPPY_8_DSDD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( eurocom2 ) +MACHINE_CONFIG_START(eurocom2_state::eurocom2) MCFG_CPU_ADD("maincpu", MC6809, XTAL_10_7172MHz/2) // EXTAL = CLK/2 = 5.3586 MHz; Q = E = 1.33965 MHz MCFG_CPU_PROGRAM_MAP(eurocom2_map) @@ -469,7 +471,7 @@ static MACHINE_CONFIG_START( eurocom2 ) // MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(waveterm, eurocom2) +MACHINE_CONFIG_DERIVED(waveterm_state::waveterm, eurocom2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(waveterm_map) diff --git a/src/mame/drivers/europc.cpp b/src/mame/drivers/europc.cpp index 0dc89e55a4f..72bc79b7d1f 100644 --- a/src/mame/drivers/europc.cpp +++ b/src/mame/drivers/europc.cpp @@ -84,6 +84,10 @@ public: { TIMER_RTC }; + static void cfg_builtin_720K(device_t *device); + void europc(machine_config &config); + void europc2(machine_config &config); + void euroxt(machine_config &config); }; /* @@ -504,17 +508,15 @@ static ADDRESS_MAP_START(europc_io, AS_IO, 8, europc_pc_state ) ADDRESS_MAP_END /* single built-in 3.5" 720K drive, connector for optional external 3.5" or 5.25" drive */ -static MACHINE_CONFIG_START( cfg_builtin_720K ) - MCFG_DEVICE_MODIFY("fdc:0") - MCFG_SLOT_DEFAULT_OPTION("35dd") - MCFG_SLOT_FIXED(true) - - MCFG_DEVICE_MODIFY("fdc:1") - MCFG_SLOT_DEFAULT_OPTION("") -MACHINE_CONFIG_END +void europc_pc_state::cfg_builtin_720K(device_t *device) +{ + device_slot_interface::static_set_default_option(*device->subdevice("fdc:0"), "35dd"); + device_slot_interface::static_set_fixed(*device->subdevice("fdc:0"), true); + device_slot_interface::static_set_default_option(*device->subdevice("fdc:1"), ""); +} //Euro PC -static MACHINE_CONFIG_START( europc ) +MACHINE_CONFIG_START(europc_pc_state::europc) MCFG_CPU_ADD("maincpu", I8088, 4772720*2) MCFG_CPU_PROGRAM_MAP(europc_map) MCFG_CPU_IO_MAP(europc_io) @@ -544,13 +546,13 @@ static MACHINE_CONFIG_START( europc ) MACHINE_CONFIG_END //Euro PC II -static MACHINE_CONFIG_DERIVED ( europc2, europc ) +MACHINE_CONFIG_DERIVED(europc_pc_state::europc2, europc) MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("768K") // could be configured by the BIOS as 640K, 640K+128K EMS or 512K+256K EMS MACHINE_CONFIG_END //Euro XT -static MACHINE_CONFIG_DERIVED ( euroxt, europc ) +MACHINE_CONFIG_DERIVED(europc_pc_state::euroxt, europc) MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("768K") MCFG_DEVICE_MODIFY("isa2") diff --git a/src/mame/drivers/eva.cpp b/src/mame/drivers/eva.cpp index 3099f72898a..ffb66f2a105 100644 --- a/src/mame/drivers/eva.cpp +++ b/src/mame/drivers/eva.cpp @@ -56,6 +56,9 @@ public: DECLARE_WRITE16_MEMBER(eva11_write_o); DECLARE_WRITE16_MEMBER(eva11_write_r); + void tms5110_route(machine_config &config); + void eva11(machine_config &config); + void eva24(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -153,9 +156,10 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( tms5110_route ) +MACHINE_CONFIG_START(eva_state::tms5110_route) /* sound hardware */ + MCFG_DEVICE_MODIFY("tms5100") MCFG_TMS5110_M0_CB(DEVWRITELINE("tms6100", tms6100_device, m0_w)) MCFG_TMS5110_M1_CB(DEVWRITELINE("tms6100", tms6100_device, m1_w)) MCFG_TMS5110_ADDR_CB(DEVWRITE8("tms6100", tms6100_device, add_w)) @@ -164,7 +168,7 @@ static MACHINE_CONFIG_START( tms5110_route ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( eva24 ) +MACHINE_CONFIG_START(eva_state::eva24) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COP420, XTAL_640kHz/2) // guessed @@ -181,7 +185,7 @@ static MACHINE_CONFIG_START( eva24 ) MCFG_FRAGMENT_ADD(tms5110_route) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( eva11 ) +MACHINE_CONFIG_START(eva_state::eva11) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, XTAL_640kHz/2) // from TMS5110A CPU CK diff --git a/src/mame/drivers/evmbug.cpp b/src/mame/drivers/evmbug.cpp index 884b1a0dc18..3875de6a7cc 100644 --- a/src/mame/drivers/evmbug.cpp +++ b/src/mame/drivers/evmbug.cpp @@ -35,6 +35,7 @@ public: DECLARE_WRITE8_MEMBER(rs232_w); void kbd_put(u8 data); + void evmbug(machine_config &config); private: virtual void machine_reset() override; uint8_t m_term_data; @@ -107,7 +108,7 @@ void evmbug_state::machine_reset() m_maincpu->reset_line(ASSERT_LINE); } -static MACHINE_CONFIG_START( evmbug ) +MACHINE_CONFIG_START(evmbug_state::evmbug) // basic machine hardware // TMS9995 CPU @ 12.0 MHz // We have no lines connected yet diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp index c538655f2d8..3a0d54bf4f7 100644 --- a/src/mame/drivers/excali64.cpp +++ b/src/mame/drivers/excali64.cpp @@ -95,6 +95,7 @@ public: DECLARE_MACHINE_RESET(excali64); required_device m_palette; + void excali64(machine_config &config); private: uint8_t *m_p_videoram; uint8_t *m_p_hiresram; @@ -543,7 +544,7 @@ MC6845_UPDATE_ROW( excali64_state::update_row ) } } -static MACHINE_CONFIG_START( excali64 ) +MACHINE_CONFIG_START(excali64_state::excali64) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/exedexes.cpp b/src/mame/drivers/exedexes.cpp index 5770c3329ad..ace60d3f8d2 100644 --- a/src/mame/drivers/exedexes.cpp +++ b/src/mame/drivers/exedexes.cpp @@ -217,7 +217,7 @@ void exedexes_state::machine_reset() m_sc2on = 0; } -static MACHINE_CONFIG_START( exedexes ) +MACHINE_CONFIG_START(exedexes_state::exedexes) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */ diff --git a/src/mame/drivers/exelv.cpp b/src/mame/drivers/exelv.cpp index 46ea2c588aa..883db3b67b7 100644 --- a/src/mame/drivers/exelv.cpp +++ b/src/mame/drivers/exelv.cpp @@ -115,6 +115,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(exelv_hblank_interrupt); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( exelvision_cartridge ); + void exeltel(machine_config &config); + void exl100(machine_config &config); }; @@ -473,7 +475,7 @@ MACHINE_START_MEMBER( exelv_state, exeltel) } -static MACHINE_CONFIG_START( exl100 ) +MACHINE_CONFIG_START(exelv_state::exl100) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS7020_EXL, XTAL_4_9152MHz) @@ -529,7 +531,7 @@ static MACHINE_CONFIG_START( exl100 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( exeltel ) +MACHINE_CONFIG_START(exelv_state::exeltel) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS7040, XTAL_4_9152MHz) diff --git a/src/mame/drivers/exerion.cpp b/src/mame/drivers/exerion.cpp index 129708b2aae..3f5dd746e84 100644 --- a/src/mame/drivers/exerion.cpp +++ b/src/mame/drivers/exerion.cpp @@ -370,7 +370,7 @@ void exerion_state::machine_reset() m_background_latches[i] = 0; } -static MACHINE_CONFIG_START( exerion ) +MACHINE_CONFIG_START(exerion_state::exerion) MCFG_CPU_ADD("maincpu", Z80, EXERION_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/exidy.cpp b/src/mame/drivers/exidy.cpp index a097ad7e2f7..4adb3b51021 100644 --- a/src/mame/drivers/exidy.cpp +++ b/src/mame/drivers/exidy.cpp @@ -148,7 +148,6 @@ Fax 1982 6502 FXL, FLA #include "machine/6821pia.h" #include "audio/exidy.h" #include "includes/exidy.h" -#include "audio/targ.h" /************************************* @@ -814,7 +813,7 @@ MACHINE_START_MEMBER(exidy_state,teetert) * *************************************/ -static MACHINE_CONFIG_START( base ) +MACHINE_CONFIG_START(exidy_state::base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, EXIDY_CPU_CLOCK) @@ -833,7 +832,7 @@ static MACHINE_CONFIG_START( base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sidetrac, base ) +MACHINE_CONFIG_DERIVED(exidy_state::sidetrac, base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -844,7 +843,7 @@ static MACHINE_CONFIG_DERIVED( sidetrac, base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( targ, base ) +MACHINE_CONFIG_DERIVED(exidy_state::targ, base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -855,7 +854,7 @@ static MACHINE_CONFIG_DERIVED( targ, base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spectar, base ) +MACHINE_CONFIG_DERIVED(exidy_state::spectar, base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -866,7 +865,7 @@ static MACHINE_CONFIG_DERIVED( spectar, base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rallys, spectar ) +MACHINE_CONFIG_DERIVED(exidy_state::rallys, spectar) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -874,7 +873,7 @@ static MACHINE_CONFIG_DERIVED( rallys, spectar ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( venture, base ) +MACHINE_CONFIG_DERIVED(exidy_state::venture, base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -887,7 +886,7 @@ static MACHINE_CONFIG_DERIVED( venture, base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( teetert, venture ) +MACHINE_CONFIG_DERIVED(exidy_state::teetert, venture) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -898,7 +897,7 @@ static MACHINE_CONFIG_DERIVED( teetert, venture ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mtrap, venture ) +MACHINE_CONFIG_DERIVED(exidy_state::mtrap, venture) /* basic machine hardware */ @@ -909,7 +908,7 @@ static MACHINE_CONFIG_DERIVED( mtrap, venture ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pepper2, venture ) +MACHINE_CONFIG_DERIVED(exidy_state::pepper2, venture) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -917,7 +916,7 @@ static MACHINE_CONFIG_DERIVED( pepper2, venture ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fax, pepper2 ) +MACHINE_CONFIG_DERIVED(exidy_state::fax, pepper2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/exidy440.cpp b/src/mame/drivers/exidy440.cpp index 9132234065f..91867e06098 100644 --- a/src/mame/drivers/exidy440.cpp +++ b/src/mame/drivers/exidy440.cpp @@ -992,7 +992,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( exidy440 ) +MACHINE_CONFIG_START(exidy440_state::exidy440) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CPU_CLOCK) @@ -1009,7 +1009,7 @@ static MACHINE_CONFIG_START( exidy440 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( topsecex, exidy440 ) +MACHINE_CONFIG_DERIVED(exidy440_state::topsecex, exidy440) /* basic machine hardware */ diff --git a/src/mame/drivers/exidyttl.cpp b/src/mame/drivers/exidyttl.cpp index afb531fddf5..b3918e046d5 100644 --- a/src/mame/drivers/exidyttl.cpp +++ b/src/mame/drivers/exidyttl.cpp @@ -55,6 +55,8 @@ public: required_device m_maincpu; required_device m_video; + void attack(machine_config &config); + void deathrac(machine_config &config); protected: // driver_device overrides @@ -95,7 +97,7 @@ void exidyttl_state::video_start() { } -static MACHINE_CONFIG_START( attack ) +MACHINE_CONFIG_START(exidyttl_state::attack) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) @@ -110,7 +112,7 @@ static MACHINE_CONFIG_START( attack ) MCFG_FIXFREQ_SYNC_THRESHOLD(0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( deathrac ) +MACHINE_CONFIG_START(exidyttl_state::deathrac) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/exp85.cpp b/src/mame/drivers/exp85.cpp index ebd436ca302..b30121947d2 100644 --- a/src/mame/drivers/exp85.cpp +++ b/src/mame/drivers/exp85.cpp @@ -178,7 +178,7 @@ void exp85_state::machine_start() /* Machine Driver */ -static MACHINE_CONFIG_START( exp85 ) +MACHINE_CONFIG_START(exp85_state::exp85) /* basic machine hardware */ MCFG_CPU_ADD(I8085A_TAG, I8085A, XTAL_6_144MHz) MCFG_CPU_PROGRAM_MAP(exp85_mem) diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp index 5b909c257af..1d3dabeac79 100644 --- a/src/mame/drivers/expro02.cpp +++ b/src/mame/drivers/expro02.cpp @@ -259,6 +259,15 @@ public: // comad READ16_MEMBER(comad_timer_r); READ8_MEMBER(comad_okim6295_r); + void supmodel(machine_config &config); + void zipzap(machine_config &config); + void fantasia(machine_config &config); + void fantsia2(machine_config &config); + void comad(machine_config &config); + void comad_noview2(machine_config &config); + void smissw(machine_config &config); + void galhustl(machine_config &config); + void expro02(machine_config &config); }; @@ -877,7 +886,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( expro02 ) +MACHINE_CONFIG_START(expro02_state::expro02) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) @@ -929,7 +938,7 @@ static MACHINE_CONFIG_START( expro02 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( comad, expro02 ) +MACHINE_CONFIG_DERIVED(expro02_state::comad, expro02) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(fantasia_map) @@ -945,20 +954,20 @@ static MACHINE_CONFIG_DERIVED( comad, expro02 ) MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(0)) /* a guess, and certainly wrong */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( comad_noview2, comad ) +MACHINE_CONFIG_DERIVED(expro02_state::comad_noview2, comad) MCFG_DEVICE_REMOVE("view2_0") MCFG_GFXDECODE_MODIFY("gfxdecode", expro02_noview2) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fantasia, comad_noview2 ) +MACHINE_CONFIG_DERIVED(expro02_state::fantasia, comad_noview2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(10000000) MCFG_CPU_PROGRAM_MAP(comad_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( supmodel, comad_noview2 ) +MACHINE_CONFIG_DERIVED(expro02_state::supmodel, comad_noview2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(supmodel_map) MCFG_OKIM6295_REPLACE("oki", 1584000, PIN7_HIGH) // clock frequency & pin 7 not verified @@ -966,17 +975,17 @@ static MACHINE_CONFIG_DERIVED( supmodel, comad_noview2 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( smissw, comad_noview2 ) // 951127 PCB, 12 & 16 clocks +MACHINE_CONFIG_DERIVED(expro02_state::smissw, comad_noview2) // 951127 PCB, 12 & 16 clocks MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(smissw_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fantsia2, comad_noview2 ) +MACHINE_CONFIG_DERIVED(expro02_state::fantsia2, comad_noview2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(fantsia2_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( galhustl, comad_noview2 ) +MACHINE_CONFIG_DERIVED(expro02_state::galhustl, comad_noview2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(galhustl_map) MCFG_OKIM6295_REPLACE("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified @@ -987,7 +996,7 @@ static MACHINE_CONFIG_DERIVED( galhustl, comad_noview2 ) MCFG_SCREEN_UPDATE_DRIVER(expro02_state, screen_update_zipzap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zipzap, comad_noview2 ) +MACHINE_CONFIG_DERIVED(expro02_state::zipzap, comad_noview2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(zipzap_map) diff --git a/src/mame/drivers/exprraid.cpp b/src/mame/drivers/exprraid.cpp index 374b0ff7401..37dce931848 100644 --- a/src/mame/drivers/exprraid.cpp +++ b/src/mame/drivers/exprraid.cpp @@ -487,7 +487,7 @@ void exprraid_state::machine_reset() } -static MACHINE_CONFIG_START( exprraid ) +MACHINE_CONFIG_START(exprraid_state::exprraid) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", DECO16, XTAL_12MHz / 8) @@ -527,7 +527,7 @@ static MACHINE_CONFIG_START( exprraid ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( exprboot, exprraid ) +MACHINE_CONFIG_DERIVED(exprraid_state::exprboot, exprraid) MCFG_CPU_REPLACE("maincpu", M6502, 1500000) /* 1.5 MHz ??? */ MCFG_CPU_PROGRAM_MAP(master_map) diff --git a/src/mame/drivers/exterm.cpp b/src/mame/drivers/exterm.cpp index d99cc694f23..9a05256cef0 100644 --- a/src/mame/drivers/exterm.cpp +++ b/src/mame/drivers/exterm.cpp @@ -382,7 +382,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( exterm ) +MACHINE_CONFIG_START(exterm_state::exterm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS34010, 40000000) diff --git a/src/mame/drivers/extrema.cpp b/src/mame/drivers/extrema.cpp index 77ee3833237..c2c0c1b2d46 100644 --- a/src/mame/drivers/extrema.cpp +++ b/src/mame/drivers/extrema.cpp @@ -24,6 +24,7 @@ public: m_maincpu(*this, "maincpu") { } required_device m_maincpu; + void extrema(machine_config &config); }; @@ -43,7 +44,7 @@ static INPUT_PORTS_START( extrema ) INPUT_PORTS_END -static MACHINE_CONFIG_START( extrema ) +MACHINE_CONFIG_START(extrema_state::extrema) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 6000000) MCFG_CPU_PROGRAM_MAP(extrema_map) diff --git a/src/mame/drivers/exzisus.cpp b/src/mame/drivers/exzisus.cpp index 5d96882f4e6..09a7661c2e1 100644 --- a/src/mame/drivers/exzisus.cpp +++ b/src/mame/drivers/exzisus.cpp @@ -225,7 +225,7 @@ GFXDECODE_END /* All clocks are unconfirmed */ -static MACHINE_CONFIG_START( exzisus ) +MACHINE_CONFIG_START(exzisus_state::exzisus) /* basic machine hardware */ MCFG_CPU_ADD("cpua", Z80, 6000000) diff --git a/src/mame/drivers/ez2d.cpp b/src/mame/drivers/ez2d.cpp index 4544a93b866..e806f96bed3 100644 --- a/src/mame/drivers/ez2d.cpp +++ b/src/mame/drivers/ez2d.cpp @@ -56,6 +56,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void ez2d(machine_config &config); }; void ez2d_state::video_start() @@ -82,7 +83,7 @@ void ez2d_state::machine_reset() { } -static MACHINE_CONFIG_START( ez2d ) +MACHINE_CONFIG_START(ez2d_state::ez2d) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM3, 100000000) // actually a Celeron at 533 MHz diff --git a/src/mame/drivers/f-32.cpp b/src/mame/drivers/f-32.cpp index be7877c3d89..28d63bac00c 100644 --- a/src/mame/drivers/f-32.cpp +++ b/src/mame/drivers/f-32.cpp @@ -52,6 +52,8 @@ public: DECLARE_READ32_MEMBER(f32_input_port_1_r); uint32_t screen_update_mosaicf2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void mosaicf2(machine_config &config); + void royalpk2(machine_config &config); }; @@ -156,7 +158,7 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( mosaicf2 ) +MACHINE_CONFIG_START(mosaicf2_state::mosaicf2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", E132XN, XTAL_20MHz*4) /* 4x internal multiplier */ @@ -232,7 +234,7 @@ static ADDRESS_MAP_START( royalpk2_io, AS_IO, 32, mosaicf2_state ) AM_RANGE(0x6a00, 0x6a03) AM_WRITE_PORT("EEPROMOUT") ADDRESS_MAP_END -static MACHINE_CONFIG_START( royalpk2 ) +MACHINE_CONFIG_START(mosaicf2_state::royalpk2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", GMS30C2132, XTAL_50MHz) diff --git a/src/mame/drivers/f1gp.cpp b/src/mame/drivers/f1gp.cpp index f49529d541c..8fe2278ea6b 100644 --- a/src/mame/drivers/f1gp.cpp +++ b/src/mame/drivers/f1gp.cpp @@ -384,7 +384,7 @@ MACHINE_RESET_MEMBER(f1gp_state,f1gp) m_scroll[1] = 0; } -static MACHINE_CONFIG_START( f1gp ) +MACHINE_CONFIG_START(f1gp_state::f1gp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */ @@ -460,7 +460,7 @@ static MACHINE_CONFIG_START( f1gp ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( f1gpb ) +MACHINE_CONFIG_START(f1gp_state::f1gpb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,10000000) /* 10 MHz ??? */ @@ -510,7 +510,7 @@ static MACHINE_CONFIG_START( f1gpb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( f1gp2, f1gp ) +MACHINE_CONFIG_DERIVED(f1gp_state::f1gp2, f1gp) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/famibox.cpp b/src/mame/drivers/famibox.cpp index 8df471a3a9f..ca81eda27c8 100644 --- a/src/mame/drivers/famibox.cpp +++ b/src/mame/drivers/famibox.cpp @@ -119,6 +119,7 @@ public: void famicombox_bankswitch(uint8_t bank); void famicombox_reset(); void ppu_irq(int *ppu_regs); + void famibox(machine_config &config); }; /****************************************************** @@ -544,7 +545,7 @@ void famibox_state::machine_start() m_coins = 0; } -static MACHINE_CONFIG_START( famibox ) +MACHINE_CONFIG_START(famibox_state::famibox) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK) MCFG_CPU_PROGRAM_MAP(famibox_map) diff --git a/src/mame/drivers/fantland.cpp b/src/mame/drivers/fantland.cpp index 0bdeb8a64d1..36061b647ab 100644 --- a/src/mame/drivers/fantland.cpp +++ b/src/mame/drivers/fantland.cpp @@ -839,7 +839,7 @@ INTERRUPT_GEN_MEMBER(fantland_state::fantland_sound_irq) device.execute().set_input_line_and_vector(0, HOLD_LINE, 0x80 / 4); } -static MACHINE_CONFIG_START( fantland ) +MACHINE_CONFIG_START(fantland_state::fantland) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, 8000000) // ? @@ -890,7 +890,7 @@ WRITE_LINE_MEMBER(fantland_state::galaxygn_sound_irq) m_audiocpu->set_input_line_and_vector(0, state ? ASSERT_LINE : CLEAR_LINE, 0x80/4); } -static MACHINE_CONFIG_START( galaxygn ) +MACHINE_CONFIG_START(fantland_state::galaxygn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, 8000000) // ? @@ -972,7 +972,7 @@ MACHINE_RESET_MEMBER(fantland_state,borntofi) borntofi_adpcm_stop(m_msm4, 3); } -static MACHINE_CONFIG_START( borntofi ) +MACHINE_CONFIG_START(fantland_state::borntofi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2] @@ -1026,7 +1026,7 @@ static MACHINE_CONFIG_START( borntofi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wheelrun ) +MACHINE_CONFIG_START(fantland_state::wheelrun) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V20, XTAL_18MHz/2) // D701080C-8 (V20) diff --git a/src/mame/drivers/fanucs15.cpp b/src/mame/drivers/fanucs15.cpp index ea3cac1c0e1..f69e22eca1f 100644 --- a/src/mame/drivers/fanucs15.cpp +++ b/src/mame/drivers/fanucs15.cpp @@ -324,6 +324,7 @@ public: required_device m_gfxcpu; required_device m_convcpu; + void fanucs15(machine_config &config); private: virtual void machine_reset() override; }; @@ -359,7 +360,7 @@ void fanucs15_state::machine_reset() { } -static MACHINE_CONFIG_START( fanucs15 ) +MACHINE_CONFIG_START(fanucs15_state::fanucs15) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68020, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(maincpu_mem) diff --git a/src/mame/drivers/fanucspmg.cpp b/src/mame/drivers/fanucspmg.cpp index 607f450f808..2ced1cbd649 100644 --- a/src/mame/drivers/fanucspmg.cpp +++ b/src/mame/drivers/fanucspmg.cpp @@ -636,6 +636,8 @@ public: uint8_t m_vram[24576]; uint8_t m_video_ctrl; + void fanucspmgm(machine_config &config); + void fanucspmg(machine_config &config); private: virtual void machine_reset() override; int32_t m_vram_bank; @@ -955,7 +957,7 @@ FLOPPY_FORMATS_MEMBER( fanucspmg_state::floppy_formats ) FLOPPY_IMD_FORMAT FLOPPY_FORMATS_END -static MACHINE_CONFIG_START( fanucspmg ) +MACHINE_CONFIG_START(fanucspmg_state::fanucspmg) /* basic machine hardware */ MCFG_CPU_ADD(MAINCPU_TAG, I8086, XTAL_15MHz/3) MCFG_CPU_PROGRAM_MAP(maincpu_mem) @@ -1021,7 +1023,7 @@ static MACHINE_CONFIG_START( fanucspmg ) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(fanucspmg_state, vsync_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fanucspmgm, fanucspmg ) +MACHINE_CONFIG_DERIVED(fanucspmg_state::fanucspmgm, fanucspmg) MCFG_DEVICE_REMOVE( CRTC_TAG ) MCFG_MC6845_ADD( CRTC_TAG, HD6845, SCREEN_TAG, XTAL_8MHz/2) diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp index 7c3ff57cf7f..76e1c0a7a59 100644 --- a/src/mame/drivers/fastfred.cpp +++ b/src/mame/drivers/fastfred.cpp @@ -626,7 +626,7 @@ INTERRUPT_GEN_MEMBER(fastfred_state::sound_timer_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( fastfred ) +MACHINE_CONFIG_START(fastfred_state::fastfred) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12_432MHz/4) /* 3.108 MHz; xtal from pcb pics, divider not verified */ @@ -676,7 +676,7 @@ static MACHINE_CONFIG_START( fastfred ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jumpcoas, fastfred ) +MACHINE_CONFIG_DERIVED(fastfred_state::jumpcoas, fastfred) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -692,7 +692,7 @@ static MACHINE_CONFIG_DERIVED( jumpcoas, fastfred ) MCFG_DEVICE_REMOVE("ay8910.2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( imago, fastfred ) +MACHINE_CONFIG_DERIVED(fastfred_state::imago, fastfred) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/fastinvaders.cpp b/src/mame/drivers/fastinvaders.cpp index bfef16dc5d2..1809f3d8c02 100644 --- a/src/mame/drivers/fastinvaders.cpp +++ b/src/mame/drivers/fastinvaders.cpp @@ -113,6 +113,9 @@ public: DECLARE_DRIVER_INIT(fi6845); + void fastinvaders(machine_config &config); + void fastinvaders_8275(machine_config &config); + void fastinvaders_6845(machine_config &config); }; @@ -631,7 +634,7 @@ static GFXDECODE_START( fastinvaders ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( fastinvaders ) +MACHINE_CONFIG_START(fastinvaders_state::fastinvaders) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, 6144100/2 ) // 6144100 Xtal /2 internaly @@ -670,7 +673,7 @@ MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", fastinvaders_state, scanline_timer, // TODO MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fastinvaders_8275, fastinvaders ) +MACHINE_CONFIG_DERIVED(fastinvaders_state::fastinvaders_8275, fastinvaders) MCFG_CPU_MODIFY("maincpu" ) // guess MCFG_CPU_IO_MAP(fastinvaders_8275_io) @@ -680,7 +683,7 @@ static MACHINE_CONFIG_DERIVED( fastinvaders_8275, fastinvaders ) // MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma8257",i8257_device, dreq2_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fastinvaders_6845, fastinvaders ) +MACHINE_CONFIG_DERIVED(fastinvaders_state::fastinvaders_6845, fastinvaders) MCFG_CPU_MODIFY("maincpu" ) // guess MCFG_CPU_IO_MAP(fastinvaders_6845_io) diff --git a/src/mame/drivers/fastlane.cpp b/src/mame/drivers/fastlane.cpp index 3de535c972c..9a01470c642 100644 --- a/src/mame/drivers/fastlane.cpp +++ b/src/mame/drivers/fastlane.cpp @@ -198,7 +198,7 @@ void fastlane_state::machine_start() membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x4000); } -static MACHINE_CONFIG_START( fastlane ) +MACHINE_CONFIG_START(fastlane_state::fastlane) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309, XTAL_24MHz/2) // 3MHz(XTAL_24MHz/8) internally diff --git a/src/mame/drivers/fb01.cpp b/src/mame/drivers/fb01.cpp index a9545ac87a9..3a4732ce656 100644 --- a/src/mame/drivers/fb01.cpp +++ b/src/mame/drivers/fb01.cpp @@ -49,6 +49,7 @@ public: DECLARE_PALETTE_INIT(fb01); HD44780_PIXEL_UPDATE(fb01_pixel_update); + void fb01(machine_config &config); private: required_device m_maincpu; required_device m_upd71051; @@ -172,7 +173,7 @@ PALETTE_INIT_MEMBER(fb01_state, fb01) } -static MACHINE_CONFIG_START( fb01 ) +MACHINE_CONFIG_START(fb01_state::fb01) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) MCFG_CPU_PROGRAM_MAP(fb01_mem) diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp index ee988633979..d1f7e161746 100644 --- a/src/mame/drivers/fc100.cpp +++ b/src/mame/drivers/fc100.cpp @@ -84,6 +84,7 @@ public: { return m_p_chargen[(ch * 16 + line) & 0xfff]; } + void fc100(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -506,7 +507,7 @@ DRIVER_INIT_MEMBER( fc100_state, fc100 ) membank("bankr")->configure_entry(1, &ram[0]); } -static MACHINE_CONFIG_START( fc100 ) +MACHINE_CONFIG_START(fc100_state::fc100) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_7_15909MHz/2) MCFG_CPU_PROGRAM_MAP(fc100_mem) diff --git a/src/mame/drivers/fccpu20.cpp b/src/mame/drivers/fccpu20.cpp index 14228243ea7..07a10e8b217 100644 --- a/src/mame/drivers/fccpu20.cpp +++ b/src/mame/drivers/fccpu20.cpp @@ -104,6 +104,13 @@ cpu20_state(const machine_config &mconfig, device_type type, const char *tag) DECLARE_DRIVER_INIT(cpu21ya) { LOGSETUP("%s\n", FUNCNAME); } DECLARE_DRIVER_INIT(cpu21b) { LOGSETUP("%s\n", FUNCNAME); } DECLARE_DRIVER_INIT(cpu21yb) { LOGSETUP("%s\n", FUNCNAME); } + void cpu21(machine_config &config); + void cpu20(machine_config &config); + void cpu21yb(machine_config &config); + void cpu21s(machine_config &config); + void cpu21b(machine_config &config); + void cpu21ya(machine_config &config); + void cpu21a(machine_config &config); }; /* Input ports */ @@ -140,37 +147,37 @@ static SLOT_INTERFACE_START(cpu21yb_vme_cards) SLOT_INTERFACE_END /* Machine configurations */ -MACHINE_CONFIG_START (cpu20) +MACHINE_CONFIG_START(cpu20_state::cpu20) MCFG_VME_DEVICE_ADD("vme") MCFG_VME_SLOT_ADD ("vme", 1, cpu20_vme_cards, "fccpu20") MACHINE_CONFIG_END -MACHINE_CONFIG_START (cpu21s) +MACHINE_CONFIG_START(cpu20_state::cpu21s) MCFG_VME_DEVICE_ADD("vme") MCFG_VME_SLOT_ADD ("vme", 1, cpu21s_vme_cards, "fccpu21s") MACHINE_CONFIG_END -MACHINE_CONFIG_START (cpu21) +MACHINE_CONFIG_START(cpu20_state::cpu21) MCFG_VME_DEVICE_ADD("vme") MCFG_VME_SLOT_ADD ("vme", 1, cpu21_vme_cards, "fccpu21") MACHINE_CONFIG_END -MACHINE_CONFIG_START (cpu21a) +MACHINE_CONFIG_START(cpu20_state::cpu21a) MCFG_VME_DEVICE_ADD("vme") MCFG_VME_SLOT_ADD ("vme", 1, cpu21a_vme_cards, "fccpu21a") MACHINE_CONFIG_END -MACHINE_CONFIG_START (cpu21ya) +MACHINE_CONFIG_START(cpu20_state::cpu21ya) MCFG_VME_DEVICE_ADD("vme") MCFG_VME_SLOT_ADD ("vme", 1, cpu21ya_vme_cards, "fccpu21ya") MACHINE_CONFIG_END -MACHINE_CONFIG_START (cpu21b) +MACHINE_CONFIG_START(cpu20_state::cpu21b) MCFG_VME_DEVICE_ADD("vme") MCFG_VME_SLOT_ADD ("vme", 1, cpu21b_vme_cards, "fccpu21b") MACHINE_CONFIG_END -MACHINE_CONFIG_START (cpu21yb) +MACHINE_CONFIG_START(cpu20_state::cpu21yb) MCFG_VME_DEVICE_ADD("vme") MCFG_VME_SLOT_ADD ("vme", 1, cpu21yb_vme_cards, "fccpu21yb") MACHINE_CONFIG_END diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp index bbcf9280765..5894850520b 100644 --- a/src/mame/drivers/fccpu30.cpp +++ b/src/mame/drivers/fccpu30.cpp @@ -292,6 +292,16 @@ cpu30_state(const machine_config &mconfig, device_type type, const char *tag) DECLARE_DRIVER_INIT(cpu30lite4); DECLARE_DRIVER_INIT(cpu30lite8); DECLARE_DRIVER_INIT(cpu33); + void cpu30(machine_config &config); + void cpu30x(machine_config &config); + void cpu30zbe(machine_config &config); + void cpu30be8(machine_config &config); + void cpu30za(machine_config &config); + void cpu30lite4(machine_config &config); + void cpu30xa(machine_config &config); + void cpu33(machine_config &config); + void cpu30lite8(machine_config &config); + void cpu30be16(machine_config &config); protected: private: @@ -643,7 +653,7 @@ SLOT_INTERFACE_END /* * Machine configuration */ -static MACHINE_CONFIG_START (cpu30) +MACHINE_CONFIG_START(cpu30_state::cpu30) /* basic machine hardware */ MCFG_CPU_ADD ("maincpu", M68030, XTAL_25MHz) MCFG_CPU_PROGRAM_MAP (cpu30_mem) @@ -748,7 +758,7 @@ static MACHINE_CONFIG_START (cpu30) MACHINE_CONFIG_END /* SYS68K/CPU-30X Part No.1 01300: 16.7 MHz 68030 based CPU board with 68882 FPCP, DMAC, 1 Mbyte Dual Ported RAM capacity and VMEPROM. */ -static MACHINE_CONFIG_DERIVED( cpu30x, cpu30 ) +MACHINE_CONFIG_DERIVED(cpu30_state::cpu30x, cpu30) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL_16_777216MHz) /* 16.7 MHz from description, crystal needs verification */ @@ -761,13 +771,13 @@ static MACHINE_CONFIG_DERIVED( cpu30x, cpu30 ) MACHINE_CONFIG_END /* SYS68K/CPU-30XA Part No.1 01301: 20.0 MHz 68030 based CPU board with 68882 FPCP, DMAC, 1 Mbyte Dual Ported RAM capacity and VMEPROM. Documentation included.*/ -static MACHINE_CONFIG_DERIVED( cpu30xa, cpu30x ) +MACHINE_CONFIG_DERIVED(cpu30_state::cpu30xa, cpu30x) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL_20MHz) /* 20.0 MHz from description, crystal needs verification */ MACHINE_CONFIG_END /* SYS68K/CPU-30ZA Part No.1 01302: 20.0 MHz 68030 based CPU board with 68882 FPCP, DMAC, 4 Mbyte Dual Ported RAM capacity and VMEPROM. Documentation included.*/ -static MACHINE_CONFIG_DERIVED( cpu30za, cpu30xa ) +MACHINE_CONFIG_DERIVED(cpu30_state::cpu30za, cpu30xa) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL_20MHz) /* 20.0 MHz from description, crystal needs verification */ @@ -778,7 +788,7 @@ static MACHINE_CONFIG_DERIVED( cpu30za, cpu30xa ) MACHINE_CONFIG_END /* SYS68K/CPU-30ZBE 68030/68882 CPU, 25 MHz, 4 Mbyte shared DRAM, 4 Mbyte Flash, SCSI, Ethernet, Floppy disk, 4 serial I/O ports, 32-bit VMEbus interface */ -static MACHINE_CONFIG_DERIVED( cpu30zbe, cpu30za ) +MACHINE_CONFIG_DERIVED(cpu30_state::cpu30zbe, cpu30za) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL_25MHz) /* 25.0 MHz from description, crystal needs verification */ @@ -789,7 +799,7 @@ static MACHINE_CONFIG_DERIVED( cpu30zbe, cpu30za ) MACHINE_CONFIG_END /* SYS68K/CPU-33 */ -static MACHINE_CONFIG_DERIVED( cpu33, cpu30zbe ) +MACHINE_CONFIG_DERIVED(cpu30_state::cpu33, cpu30zbe) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL_25MHz) /* 25.0 MHz from description, crystal needs verification */ @@ -800,7 +810,7 @@ static MACHINE_CONFIG_DERIVED( cpu33, cpu30zbe ) MACHINE_CONFIG_END /* SYS68K/CPU-30BE/8 68030/68882 CPU, 25 MHz, 8 Mbyte shared DRAM, 4 Mbyte Flash, SCSI, Ethernet, Floppy disk, 4 serial I/O ports, 32-bit VMEbus interface, VMEPROM firmware*/ -static MACHINE_CONFIG_DERIVED( cpu30be8, cpu30zbe ) +MACHINE_CONFIG_DERIVED(cpu30_state::cpu30be8, cpu30zbe) // dual ported ram MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("8M") @@ -808,7 +818,7 @@ static MACHINE_CONFIG_DERIVED( cpu30be8, cpu30zbe ) MACHINE_CONFIG_END /* SYS68K/CPU-30BE/16 68030/68882 CPU, 25 MHz, 16 Mbyte shared DRAM, 4 Mbyte Flash, SCSI, Ethernet, Floppy disk, 4 serial I/O ports, 32-bit VMEbus interface, VMEPROM firmware*/ -static MACHINE_CONFIG_DERIVED( cpu30be16, cpu30zbe ) +MACHINE_CONFIG_DERIVED(cpu30_state::cpu30be16, cpu30zbe) // dual ported ram MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("16M") @@ -816,7 +826,7 @@ static MACHINE_CONFIG_DERIVED( cpu30be16, cpu30zbe ) MACHINE_CONFIG_END /* SYS68K/CPU-30Lite/4 68030 CPU, 25 MHz, 4 Mbyte shared DRAM, 4 Mbyte Flash, 4 serial ports, 32-bit VMEbus interface, VMEPROM firmware. */ -static MACHINE_CONFIG_DERIVED( cpu30lite4, cpu30zbe ) +MACHINE_CONFIG_DERIVED(cpu30_state::cpu30lite4, cpu30zbe) // Enable these when added to main config // MCFG_DEVICE_REMOVE("fpu") // MCFG_DEVICE_REMOVE("scsi") @@ -829,7 +839,7 @@ static MACHINE_CONFIG_DERIVED( cpu30lite4, cpu30zbe ) MACHINE_CONFIG_END /* SYS68K/CPU-30Lite/8 68030 CPU, 25 MHz, 4 Mbyte shared DRAM, 8 Mbyte Flash, 4 serial ports, 32-bit VMEbus interface, VMEPROM firmware. */ -static MACHINE_CONFIG_DERIVED( cpu30lite8, cpu30lite4 ) +MACHINE_CONFIG_DERIVED(cpu30_state::cpu30lite8, cpu30lite4) // dual ported ram MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("8M") diff --git a/src/mame/drivers/fcombat.cpp b/src/mame/drivers/fcombat.cpp index c39e71b8380..acc4faa24fd 100644 --- a/src/mame/drivers/fcombat.cpp +++ b/src/mame/drivers/fcombat.cpp @@ -286,7 +286,7 @@ void fcombat_state::machine_reset() m_ty = 0; } -static MACHINE_CONFIG_START( fcombat ) +MACHINE_CONFIG_START(fcombat_state::fcombat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 10000000/3) diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp index bdcdc2163cd..91cd312d159 100644 --- a/src/mame/drivers/fcrash.cpp +++ b/src/mame/drivers/fcrash.cpp @@ -1559,7 +1559,7 @@ MACHINE_RESET_MEMBER(cps_state,fcrash) m_sample_select2 = 0; } -static MACHINE_CONFIG_START( fcrash ) +MACHINE_CONFIG_START(cps_state::fcrash) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) @@ -1616,7 +1616,7 @@ static MACHINE_CONFIG_START( fcrash ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cawingbl, fcrash ) +MACHINE_CONFIG_DERIVED(cps_state::cawingbl, fcrash) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, irq6_line_hold) /* needed to write to scroll values */ @@ -1624,7 +1624,7 @@ static MACHINE_CONFIG_DERIVED( cawingbl, fcrash ) MCFG_MACHINE_START_OVERRIDE(cps_state, cawingbl) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( kodb ) +MACHINE_CONFIG_START(cps_state::kodb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) @@ -1667,7 +1667,7 @@ static MACHINE_CONFIG_START( kodb ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sf2mdt ) +MACHINE_CONFIG_START(cps_state::sf2mdt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) @@ -1716,12 +1716,12 @@ static MACHINE_CONFIG_START( sf2mdt ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sf2b, sf2mdt) +MACHINE_CONFIG_DERIVED(cps_state::sf2b, sf2mdt) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sf2b_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( knightsb ) +MACHINE_CONFIG_START(cps_state::knightsb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 24000000 / 2) @@ -2104,7 +2104,7 @@ MACHINE_START_MEMBER(cps_state, dinopic) m_sprite_x_offset = 0; } -static MACHINE_CONFIG_START( dinopic ) +MACHINE_CONFIG_START(cps_state::dinopic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) @@ -2265,7 +2265,7 @@ DRIVER_INIT_MEMBER(cps_state, dinopic) // sound cpu is (239 V 249521 VC5006 KABUKI DL-030P-110V) - recycled Kabuki Z80 from genuine Capcom HW? // 3x8 dsws -static MACHINE_CONFIG_START( sgyxz ) +MACHINE_CONFIG_START(cps_state::sgyxz) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) MCFG_CPU_PROGRAM_MAP(sgyxz_map) @@ -2359,7 +2359,7 @@ MACHINE_START_MEMBER(cps_state, punipic) m_sprite_x_offset = 0; } -static MACHINE_CONFIG_START( punipic ) +MACHINE_CONFIG_START(cps_state::punipic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) @@ -2555,7 +2555,7 @@ DRIVER_INIT_MEMBER(cps_state, punipic3) // ************************************************************************* SF2M1 -static MACHINE_CONFIG_START( sf2m1 ) +MACHINE_CONFIG_START(cps_state::sf2m1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz ) @@ -2889,7 +2889,7 @@ MACHINE_START_MEMBER(cps_state, slampic) m_sprite_x_offset = 0; } -static MACHINE_CONFIG_START( slampic ) +MACHINE_CONFIG_START(cps_state::slampic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) @@ -2991,7 +2991,7 @@ static ADDRESS_MAP_START( varthb_map, AS_PROGRAM, 16, cps_state ) AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_SHARE("mainram") ADDRESS_MAP_END -static MACHINE_CONFIG_START( varthb ) +MACHINE_CONFIG_START(cps_state::varthb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) diff --git a/src/mame/drivers/feversoc.cpp b/src/mame/drivers/feversoc.cpp index 990d72702e4..ddd9dd00bc2 100644 --- a/src/mame/drivers/feversoc.cpp +++ b/src/mame/drivers/feversoc.cpp @@ -114,6 +114,7 @@ public: required_device m_hopper; required_device m_gfxdecode; required_device m_palette; + void feversoc(machine_config &config); }; @@ -273,7 +274,7 @@ WRITE16_MEMBER(feversoc_state::feversoc_irq_ack) m_maincpu->set_input_line(8, CLEAR_LINE); } -static MACHINE_CONFIG_START( feversoc ) +MACHINE_CONFIG_START(feversoc_state::feversoc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",SH2,MASTER_CLOCK) diff --git a/src/mame/drivers/fgoal.cpp b/src/mame/drivers/fgoal.cpp index 70a654ef039..307a9400c51 100644 --- a/src/mame/drivers/fgoal.cpp +++ b/src/mame/drivers/fgoal.cpp @@ -364,7 +364,7 @@ void fgoal_state::machine_reset() m_prev_coin = 0; } -static MACHINE_CONFIG_START( fgoal ) +MACHINE_CONFIG_START(fgoal_state::fgoal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 10065000 / 10) /* ? */ diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp index 220ed625ad6..a0ca78633a7 100644 --- a/src/mame/drivers/fidel6502.cpp +++ b/src/mame/drivers/fidel6502.cpp @@ -541,6 +541,31 @@ public: DECLARE_WRITE8_MEMBER(chesster_control_w); DECLARE_WRITE8_MEMBER(kishon_control_w); DECLARE_DRIVER_INIT(chesster); + void chesster(machine_config &config); + void su9(machine_config &config); + void sc12b(machine_config &config); + void sc9b(machine_config &config); + void csc(machine_config &config); + void fexcelv(machine_config &config); + void fexcelb(machine_config &config); + void kishon(machine_config &config); + void fphantom(machine_config &config); + void fexcel4(machine_config &config); + void eag(machine_config &config); + void playmatic(machine_config &config); + void fdes2000d(machine_config &config); + void rsc(machine_config &config); + void fdes2100d(machine_config &config); + void fdes2100(machine_config &config); + void fdes2000(machine_config &config); + void eas(machine_config &config); + void fexcelp(machine_config &config); + void sc9d(machine_config &config); + void sc12(machine_config &config); + void granits(machine_config &config); + void sc9c(machine_config &config); + void fexcel(machine_config &config); + void fexceld(machine_config &config); }; @@ -1550,7 +1575,7 @@ INPUT_PORTS_END Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( rsc ) +MACHINE_CONFIG_START(fidel6502_state::rsc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1800000) // measured approx 1.81MHz @@ -1578,7 +1603,7 @@ static MACHINE_CONFIG_START( rsc ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( csc ) +MACHINE_CONFIG_START(fidel6502_state::csc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_3_9MHz/2) // from 3.9MHz resonator @@ -1614,7 +1639,7 @@ static MACHINE_CONFIG_START( csc ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( su9, csc ) +MACHINE_CONFIG_DERIVED(fidel6502_state::su9, csc) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1623,7 +1648,7 @@ static MACHINE_CONFIG_DERIVED( su9, csc ) MCFG_DEFAULT_LAYOUT(layout_fidel_su9) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( eas ) +MACHINE_CONFIG_START(fidel6502_state::eas) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R65C02, XTAL_3MHz) @@ -1658,7 +1683,7 @@ static MACHINE_CONFIG_START( eas ) MCFG_SOFTWARE_LIST_ADD("cart_list", "fidel_scc") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( eag, eas ) +MACHINE_CONFIG_DERIVED(fidel6502_state::eag, eas) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", R65C02, XTAL_5MHz) // R65C02P4 @@ -1668,7 +1693,7 @@ static MACHINE_CONFIG_DERIVED( eag, eas ) MCFG_DEFAULT_LAYOUT(layout_fidel_eag) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sc9d ) +MACHINE_CONFIG_START(fidel6502_state::sc9d) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_3_9MHz/2) // R6502AP, 3.9MHz resonator @@ -1693,20 +1718,20 @@ static MACHINE_CONFIG_START( sc9d ) MCFG_SOFTWARE_LIST_ADD("cart_list", "fidel_scc") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sc9b, sc9d ) +MACHINE_CONFIG_DERIVED(fidel6502_state::sc9b, sc9d) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", M6502, 1500000) // from ceramic resonator "681 JSA", measured MCFG_CPU_PROGRAM_MAP(sc9_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sc9c, sc9b ) +MACHINE_CONFIG_DERIVED(fidel6502_state::sc9c, sc9b) /* basic machine hardware */ MCFG_MACHINE_RESET_OVERRIDE(fidel6502_state, sc9c) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( playmatic, sc9b ) +MACHINE_CONFIG_DERIVED(fidel6502_state::playmatic, sc9b) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1715,7 +1740,7 @@ static MACHINE_CONFIG_DERIVED( playmatic, sc9b ) MCFG_DEFAULT_LAYOUT(layout_fidel_playmatic) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sc12 ) +MACHINE_CONFIG_START(fidel6502_state::sc12) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R65C02, XTAL_3MHz) // R65C02P3 @@ -1748,7 +1773,7 @@ static MACHINE_CONFIG_START( sc12 ) MCFG_SOFTWARE_LIST_ADD("cart_list", "fidel_scc") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sc12b, sc12 ) +MACHINE_CONFIG_DERIVED(fidel6502_state::sc12b, sc12) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1765,7 +1790,7 @@ static MACHINE_CONFIG_DERIVED( sc12b, sc12 ) MCFG_TIMER_DRIVER_ADD_PERIODIC("dummy_timer", fidel6502_state, dummy, attotime::from_hz(XTAL_4MHz)) // MCFG_QUANTUM_PERFECT_CPU("maincpu") didn't work MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fexcel ) +MACHINE_CONFIG_START(fidel6502_state::fexcel) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65SC02, XTAL_12MHz/4) // G65SC102P-3, 12.0M ceramic resonator @@ -1784,35 +1809,35 @@ static MACHINE_CONFIG_START( fexcel ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fexcel4, fexcel ) +MACHINE_CONFIG_DERIVED(fidel6502_state::fexcel4, fexcel) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", R65C02, XTAL_4MHz) // R65C02P4 MCFG_CPU_PROGRAM_MAP(fexcel_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fexcelb, fexcel ) +MACHINE_CONFIG_DERIVED(fidel6502_state::fexcelb, fexcel) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(fexcelb_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fexcelp, fexcel ) +MACHINE_CONFIG_DERIVED(fidel6502_state::fexcelp, fexcel) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", R65C02, XTAL_5MHz) // R65C02P4 MCFG_CPU_PROGRAM_MAP(fexcelp_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( granits, fexcelp ) +MACHINE_CONFIG_DERIVED(fidel6502_state::granits, fexcelp) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL_8MHz) // overclocked MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fdes2100, fexcel ) +MACHINE_CONFIG_DERIVED(fidel6502_state::fdes2100, fexcel) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", M65C02, XTAL_5MHz) // WDC 65C02 @@ -1828,14 +1853,14 @@ static MACHINE_CONFIG_DERIVED( fdes2100, fexcel ) MCFG_DEFAULT_LAYOUT(layout_fidel_des) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fdes2000, fdes2100 ) +MACHINE_CONFIG_DERIVED(fidel6502_state::fdes2000, fdes2100) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", R65C02, XTAL_3MHz) // RP65C02G MCFG_CPU_PROGRAM_MAP(fexcelp_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fexcelv, fexcelb ) +MACHINE_CONFIG_DERIVED(fidel6502_state::fexcelv, fexcelb) /* sound hardware */ MCFG_SOUND_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz @@ -1843,13 +1868,13 @@ static MACHINE_CONFIG_DERIVED( fexcelv, fexcelb ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fexceld, fexcelb ) +MACHINE_CONFIG_DERIVED(fidel6502_state::fexceld, fexcelb) /* basic machine hardware */ MCFG_DEFAULT_LAYOUT(layout_fidel_exd) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fdes2100d ) +MACHINE_CONFIG_START(fidel6502_state::fdes2100d) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65C02, XTAL_6MHz) // W65C02P-6 @@ -1868,14 +1893,14 @@ static MACHINE_CONFIG_START( fdes2100d ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fdes2000d, fdes2100d ) +MACHINE_CONFIG_DERIVED(fidel6502_state::fdes2000d, fdes2100d) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", R65C02, XTAL_3MHz) // R65C02P3 MCFG_CPU_PROGRAM_MAP(fdesdis_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fphantom ) +MACHINE_CONFIG_START(fidel6502_state::fphantom) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R65C02, XTAL_4_9152MHz) // R65C02P4 @@ -1894,7 +1919,7 @@ static MACHINE_CONFIG_START( fphantom ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( chesster ) +MACHINE_CONFIG_START(fidel6502_state::chesster) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R65C02, XTAL_5MHz) // RP65C02G @@ -1914,7 +1939,7 @@ static MACHINE_CONFIG_START( chesster ) MCFG_SOUND_ROUTE_EX(0, "dac8", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac8", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kishon, chesster ) +MACHINE_CONFIG_DERIVED(fidel6502_state::kishon, chesster) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp index a985aaa9f03..f2c5d48ab5d 100644 --- a/src/mame/drivers/fidel68k.cpp +++ b/src/mame/drivers/fidel68k.cpp @@ -222,6 +222,17 @@ public: DECLARE_WRITE8_MEMBER(eag_7seg_w); DECLARE_WRITE8_MEMBER(eag_mux_w); DECLARE_READ8_MEMBER(eag_input2_r); + void fccpu1_eprom_sockets(machine_config &config); + void eag(machine_config &config); + void fex68km2(machine_config &config); + void eagv10(machine_config &config); + void fdes2265(machine_config &config); + void eagv7(machine_config &config); + void eagv9(machine_config &config); + void fdes2325(machine_config &config); + void fex68km3(machine_config &config); + void eagv11(machine_config &config); + void fex68k(machine_config &config); }; @@ -529,7 +540,7 @@ INPUT_PORTS_END Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( fex68k ) +MACHINE_CONFIG_START(fidel68k_state::fex68k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) // HD68HC000P12 @@ -548,14 +559,14 @@ static MACHINE_CONFIG_START( fex68k ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fex68km2, fex68k ) +MACHINE_CONFIG_DERIVED(fidel68k_state::fex68km2, fex68k) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(fex68km2_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fex68km3, fex68k ) +MACHINE_CONFIG_DERIVED(fidel68k_state::fex68km3, fex68k) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -563,7 +574,7 @@ static MACHINE_CONFIG_DERIVED( fex68km3, fex68k ) MCFG_CPU_PROGRAM_MAP(fex68km3_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fdes2265 ) +MACHINE_CONFIG_START(fidel68k_state::fdes2265) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // MC68HC000P12F @@ -582,7 +593,7 @@ static MACHINE_CONFIG_START( fdes2265 ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fdes2325, fdes2265 ) +MACHINE_CONFIG_DERIVED(fidel68k_state::fdes2325, fdes2265) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", M68EC020, XTAL_20MHz) // MC68EC020RP25 @@ -591,7 +602,7 @@ static MACHINE_CONFIG_DERIVED( fdes2325, fdes2265 ) MCFG_DEFAULT_LAYOUT(layout_fidel_desdis_68kg) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( eag ) +MACHINE_CONFIG_START(fidel68k_state::eag) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -622,7 +633,7 @@ static MACHINE_CONFIG_START( eag ) MCFG_SOFTWARE_LIST_ADD("cart_list", "fidel_scc") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( eagv7, eag ) +MACHINE_CONFIG_DERIVED(fidel68k_state::eagv7, eag) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", M68020, XTAL_20MHz) @@ -631,21 +642,21 @@ static MACHINE_CONFIG_DERIVED( eagv7, eag ) MCFG_RAM_REMOVE("ram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( eagv9, eagv7 ) +MACHINE_CONFIG_DERIVED(fidel68k_state::eagv9, eagv7) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", M68030, XTAL_32MHz) MCFG_CPU_PROGRAM_MAP(eagv7_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( eagv10, eagv7 ) +MACHINE_CONFIG_DERIVED(fidel68k_state::eagv10, eagv7) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", M68040, XTAL_25MHz) MCFG_CPU_PROGRAM_MAP(eagv11_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( eagv11, eagv7 ) +MACHINE_CONFIG_DERIVED(fidel68k_state::eagv11, eagv7) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", M68EC040, XTAL_36MHz*2*2) // wrong! should be M68EC060 @ 72MHz diff --git a/src/mame/drivers/fidelmcs48.cpp b/src/mame/drivers/fidelmcs48.cpp index 67d67158180..ecde293e8fb 100644 --- a/src/mame/drivers/fidelmcs48.cpp +++ b/src/mame/drivers/fidelmcs48.cpp @@ -48,6 +48,7 @@ public: DECLARE_READ8_MEMBER(sc6_input_r); DECLARE_READ_LINE_MEMBER(sc6_input6_r); DECLARE_READ_LINE_MEMBER(sc6_input7_r); + void sc6(machine_config &config); }; @@ -144,7 +145,7 @@ INPUT_PORTS_END Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( sc6 ) +MACHINE_CONFIG_START(fidelmcs48_state::sc6) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8040, XTAL_11MHz) diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index b85022c7c0f..9a82ec8ab45 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -581,6 +581,13 @@ public: DECLARE_WRITE8_MEMBER(dsc_control_w); DECLARE_WRITE8_MEMBER(dsc_select_w); DECLARE_READ8_MEMBER(dsc_input_r); + void bcc(machine_config &config); + void scc(machine_config &config); + void dsc(machine_config &config); + void vcc(machine_config &config); + void cc10(machine_config &config); + void vsc(machine_config &config); + void vbrc(machine_config &config); }; @@ -1631,7 +1638,7 @@ INPUT_PORTS_END Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( bcc ) +MACHINE_CONFIG_START(fidelz80_state::bcc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) @@ -1648,7 +1655,7 @@ static MACHINE_CONFIG_START( bcc ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( scc ) +MACHINE_CONFIG_START(fidelz80_state::scc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_9MHz) @@ -1665,7 +1672,7 @@ static MACHINE_CONFIG_START( scc ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cc10 ) +MACHINE_CONFIG_START(fidelz80_state::cc10) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) @@ -1691,7 +1698,7 @@ static MACHINE_CONFIG_START( cc10 ) MCFG_TIMER_DRIVER_ADD("beeper_off", fidelz80_state, beeper_off_callback) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vcc ) +MACHINE_CONFIG_START(fidelz80_state::vcc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) @@ -1719,7 +1726,7 @@ static MACHINE_CONFIG_START( vcc ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vsc ) +MACHINE_CONFIG_START(fidelz80_state::vsc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_9MHz) // 3.9MHz resonator @@ -1747,7 +1754,7 @@ static MACHINE_CONFIG_START( vsc ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vbrc ) +MACHINE_CONFIG_START(fidelz80_state::vbrc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz/2) @@ -1775,7 +1782,7 @@ static MACHINE_CONFIG_START( vbrc ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dsc ) +MACHINE_CONFIG_START(fidelz80_state::dsc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_9MHz) // 3.9MHz resonator diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp index 1475eb8c3d8..d1219bc83da 100644 --- a/src/mame/drivers/finalizr.cpp +++ b/src/mame/drivers/finalizr.cpp @@ -260,7 +260,7 @@ void finalizr_state::machine_reset() m_irq_enable = 0; } -static MACHINE_CONFIG_START( finalizr ) +MACHINE_CONFIG_START(finalizr_state::finalizr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI1, XTAL_18_432MHz/6) /* ??? */ diff --git a/src/mame/drivers/fireball.cpp b/src/mame/drivers/fireball.cpp index 8361ce1c5b8..d4db2ed78e8 100644 --- a/src/mame/drivers/fireball.cpp +++ b/src/mame/drivers/fireball.cpp @@ -76,6 +76,7 @@ public: DECLARE_WRITE8_MEMBER(p3_w); TIMER_DEVICE_CALLBACK_MEMBER(int_0); + void fireball(machine_config &config); protected: // devices @@ -493,7 +494,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( fireball_state::int_0 ) *************************/ -static MACHINE_CONFIG_START( fireball ) +MACHINE_CONFIG_START(fireball_state::fireball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8031, CPU_CLK) // MCFG_CPU_PROGRAM_MAP(fireball_map) diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp index d65f87b101c..112985d0711 100644 --- a/src/mame/drivers/firebeat.cpp +++ b/src/mame/drivers/firebeat.cpp @@ -281,6 +281,10 @@ public: DECLARE_WRITE_LINE_MEMBER(midi_uart_ch1_irq_callback); DECLARE_WRITE_LINE_MEMBER(gcu0_interrupt); DECLARE_WRITE_LINE_MEMBER(gcu1_interrupt); + static void cdrom_config(device_t *device); + void firebeat2(machine_config &config); + void firebeat(machine_config &config); + void firebeat_spu(machine_config &config); }; @@ -1269,17 +1273,18 @@ WRITE_LINE_MEMBER( firebeat_state::ata_interrupt ) m_maincpu->set_input_line(INPUT_LINE_IRQ4, state); } -static MACHINE_CONFIG_START( cdrom_config ) - MCFG_DEVICE_MODIFY("cdda") +void firebeat_state::cdrom_config(device_t *device) +{ + device = device->subdevice("cdda"); MCFG_SOUND_ROUTE(0, "^^^^lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "^^^^rspeaker", 1.0) -MACHINE_CONFIG_END +} static SLOT_INTERFACE_START(firebeat_ata_devices) SLOT_INTERFACE("cdrom", ATAPI_FIXED_CDROM) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( firebeat ) +MACHINE_CONFIG_START(firebeat_state::firebeat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC403GCX, XTAL_64MHz) @@ -1339,7 +1344,7 @@ static MACHINE_CONFIG_START( firebeat ) MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(DEVICE_SELF_OWNER, firebeat_state, midi_uart_ch1_irq_callback)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( firebeat2 ) +MACHINE_CONFIG_START(firebeat_state::firebeat2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC403GCX, XTAL_64MHz) @@ -1409,7 +1414,7 @@ static MACHINE_CONFIG_START( firebeat2 ) MCFG_MIDI_KBD_ADD("kbd1", DEVWRITELINE("duart_midi:chan1", ins8250_uart_device, rx_w), 31250) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( firebeat_spu, firebeat ) +MACHINE_CONFIG_DERIVED(firebeat_state::firebeat_spu, firebeat) /* basic machine hardware */ MCFG_CPU_ADD("audiocpu", M68000, 16000000) diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp index 07ed8cf4b65..d4fb5d59983 100644 --- a/src/mame/drivers/firefox.cpp +++ b/src/mame/drivers/firefox.cpp @@ -127,6 +127,7 @@ public: required_device m_palette; required_device m_soundlatch; required_device m_soundlatch2; + void firefox(machine_config &config); }; @@ -721,7 +722,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( firefox ) +MACHINE_CONFIG_START(firefox_state::firefox) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MASTER_XTAL/8) // 68B09E diff --git a/src/mame/drivers/firetrap.cpp b/src/mame/drivers/firetrap.cpp index 4f830782208..2df33c8b80d 100644 --- a/src/mame/drivers/firetrap.cpp +++ b/src/mame/drivers/firetrap.cpp @@ -611,7 +611,7 @@ void firetrap_state::machine_reset() m_coin_command_pending = 0; } -static MACHINE_CONFIG_START( firetrap ) +MACHINE_CONFIG_START(firetrap_state::firetrap) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz @@ -659,7 +659,7 @@ static MACHINE_CONFIG_START( firetrap ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( firetrapbl ) +MACHINE_CONFIG_START(firetrap_state::firetrapbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz diff --git a/src/mame/drivers/firetrk.cpp b/src/mame/drivers/firetrk.cpp index 1d8828cf533..29dc702af24 100644 --- a/src/mame/drivers/firetrk.cpp +++ b/src/mame/drivers/firetrk.cpp @@ -850,7 +850,7 @@ static GFXDECODE_START( montecar ) GFXDECODE_END -static MACHINE_CONFIG_START( firetrk ) +MACHINE_CONFIG_START(firetrk_state::firetrk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, MASTER_CLOCK/12) /* 750Khz during service mode */ @@ -881,7 +881,7 @@ static MACHINE_CONFIG_START( firetrk ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( superbug, firetrk ) +MACHINE_CONFIG_DERIVED(firetrk_state::superbug, firetrk) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -905,7 +905,7 @@ static MACHINE_CONFIG_DERIVED( superbug, firetrk ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( montecar, firetrk ) +MACHINE_CONFIG_DERIVED(firetrk_state::montecar, firetrk) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/fitfight.cpp b/src/mame/drivers/fitfight.cpp index 461e9b621be..4d3fe1e4c10 100644 --- a/src/mame/drivers/fitfight.cpp +++ b/src/mame/drivers/fitfight.cpp @@ -722,7 +722,7 @@ void fitfight_state::machine_reset() m_fof_700000_data = 0; } -static MACHINE_CONFIG_START( fitfight ) +MACHINE_CONFIG_START(fitfight_state::fitfight) MCFG_CPU_ADD("maincpu",M68000, 12000000) MCFG_CPU_PROGRAM_MAP(fitfight_main_map) @@ -758,7 +758,7 @@ static MACHINE_CONFIG_START( fitfight ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bbprot ) +MACHINE_CONFIG_START(fitfight_state::bbprot) MCFG_CPU_ADD("maincpu",M68000, 12000000) MCFG_CPU_PROGRAM_MAP(bbprot_main_map) diff --git a/src/mame/drivers/fk1.cpp b/src/mame/drivers/fk1.cpp index d62889c9878..947e3deb46c 100644 --- a/src/mame/drivers/fk1.cpp +++ b/src/mame/drivers/fk1.cpp @@ -62,6 +62,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(keyboard_callback); TIMER_DEVICE_CALLBACK_MEMBER(vsync_callback); IRQ_CALLBACK_MEMBER(fk1_irq_callback); + void fk1(machine_config &config); }; @@ -405,7 +406,7 @@ uint32_t fk1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c return 0; } -static MACHINE_CONFIG_START( fk1 ) +MACHINE_CONFIG_START(fk1_state::fk1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(fk1_mem) diff --git a/src/mame/drivers/flicker.cpp b/src/mame/drivers/flicker.cpp index ea8b3d2e713..b9298bb3a5f 100644 --- a/src/mame/drivers/flicker.cpp +++ b/src/mame/drivers/flicker.cpp @@ -69,6 +69,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(test_changed); + void flicker(machine_config &config); protected: virtual void driver_start() override; @@ -379,7 +380,7 @@ void flicker_state::driver_start() } -static MACHINE_CONFIG_START(flicker) +MACHINE_CONFIG_START(flicker_state::flicker) // basic machine hardware MCFG_CPU_ADD("maincpu", I4004, XTAL_5MHz / 8) MCFG_I4004_ROM_MAP(flicker_rom) diff --git a/src/mame/drivers/flipjack.cpp b/src/mame/drivers/flipjack.cpp index cbd9408b1d2..df51dc883fa 100644 --- a/src/mame/drivers/flipjack.cpp +++ b/src/mame/drivers/flipjack.cpp @@ -133,6 +133,7 @@ public: virtual void machine_start() override; DECLARE_PALETTE_INIT(flipjack); uint32_t screen_update_flipjack(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void flipjack(machine_config &config); }; @@ -435,7 +436,7 @@ void flipjack_state::machine_start() } -static MACHINE_CONFIG_START( flipjack ) +MACHINE_CONFIG_START(flipjack_state::flipjack) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4) diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp index 648315c417a..cde7bcb833f 100644 --- a/src/mame/drivers/flkatck.cpp +++ b/src/mame/drivers/flkatck.cpp @@ -208,7 +208,7 @@ void flkatck_state::machine_reset() m_flipscreen = 0; } -static MACHINE_CONFIG_START( flkatck ) +MACHINE_CONFIG_START(flkatck_state::flkatck) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP, 24/8 MHz */ diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp index ec690358c79..44b35dbceaf 100644 --- a/src/mame/drivers/flower.cpp +++ b/src/mame/drivers/flower.cpp @@ -120,6 +120,7 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void flower(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -486,7 +487,7 @@ INTERRUPT_GEN_MEMBER(flower_state::slave_vblank_irq) } -static MACHINE_CONFIG_START( flower ) +MACHINE_CONFIG_START(flower_state::flower) MCFG_CPU_ADD("mastercpu",Z80,MASTER_CLOCK/4) MCFG_CPU_PROGRAM_MAP(shared_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", flower_state, master_vblank_irq) diff --git a/src/mame/drivers/flstory.cpp b/src/mame/drivers/flstory.cpp index f0552f7569e..67fc220ec36 100644 --- a/src/mame/drivers/flstory.cpp +++ b/src/mame/drivers/flstory.cpp @@ -726,7 +726,7 @@ MACHINE_RESET_MEMBER(flstory_state,flstory) m_from_mcu = 0; } -static MACHINE_CONFIG_START( flstory ) +MACHINE_CONFIG_START(flstory_state::flstory) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_10_733MHz/2) /* verified on pcb */ @@ -797,7 +797,7 @@ static MACHINE_CONFIG_START( flstory ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( onna34ro ) +MACHINE_CONFIG_START(flstory_state::onna34ro) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_10_733MHz/2) /* ??? */ @@ -866,14 +866,14 @@ static MACHINE_CONFIG_START( onna34ro ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( onna34ro_mcu, onna34ro ) +MACHINE_CONFIG_DERIVED(flstory_state::onna34ro_mcu, onna34ro) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(onna34ro_mcu_map) MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL_18_432MHz/6) /* ? */ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( victnine ) +MACHINE_CONFIG_START(flstory_state::victnine) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* 4 MHz */ @@ -946,7 +946,7 @@ static MACHINE_CONFIG_START( victnine ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rumba ) +MACHINE_CONFIG_START(flstory_state::rumba) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* verified on pcb */ diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp index d04bec5c1b5..d7bd51a20df 100644 --- a/src/mame/drivers/flyball.cpp +++ b/src/mame/drivers/flyball.cpp @@ -97,6 +97,7 @@ public: TIMER_CALLBACK_MEMBER(joystick_callback); TIMER_CALLBACK_MEMBER(quarter_callback); + void flyball(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -449,7 +450,7 @@ void flyball_state::machine_reset() } -static MACHINE_CONFIG_START( flyball ) +MACHINE_CONFIG_START(flyball_state::flyball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp index 1ac5530a42e..35864848645 100644 --- a/src/mame/drivers/fm7.cpp +++ b/src/mame/drivers/fm7.cpp @@ -2055,7 +2055,7 @@ MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(8) \ MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000) -static MACHINE_CONFIG_START( fm7 ) +MACHINE_CONFIG_START(fm7_state::fm7) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_16_128MHz / 2) MCFG_CPU_PROGRAM_MAP(fm7_mem) @@ -2110,7 +2110,7 @@ static MACHINE_CONFIG_START( fm7 ) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fm8 ) +MACHINE_CONFIG_START(fm7_state::fm8) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_4_9152MHz) // 1.2MHz 68A09 MCFG_CPU_PROGRAM_MAP(fm8_mem) @@ -2158,7 +2158,7 @@ static MACHINE_CONFIG_START( fm8 ) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fm77av ) +MACHINE_CONFIG_START(fm7_state::fm77av) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_16_128MHz / 8) MCFG_CPU_PROGRAM_MAP(fm77av_mem) @@ -2234,7 +2234,7 @@ static MACHINE_CONFIG_START( fm77av ) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fm11 ) +MACHINE_CONFIG_START(fm7_state::fm11) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, 2000000) // 2MHz 68B09E MCFG_CPU_PROGRAM_MAP(fm11_mem) @@ -2303,7 +2303,7 @@ static MACHINE_CONFIG_START( fm11 ) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fm16beta ) +MACHINE_CONFIG_START(fm7_state::fm16beta) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, 8000000) // 8MHz i8086 MCFG_CPU_PROGRAM_MAP(fm16_mem) diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp index a480ffaa506..75694320f83 100644 --- a/src/mame/drivers/fmtowns.cpp +++ b/src/mame/drivers/fmtowns.cpp @@ -2799,7 +2799,7 @@ static GFXDECODE_START( towns ) GFXDECODE_ENTRY( "user", 0x180000, fnt_chars_16x16, 0, 16 ) GFXDECODE_END -static MACHINE_CONFIG_START( towns_base ) +MACHINE_CONFIG_START(towns_state::towns_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I386, 16000000) MCFG_CPU_PROGRAM_MAP(towns_mem) @@ -2920,12 +2920,12 @@ static MACHINE_CONFIG_START( towns_base ) MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,16M,32M,64M,96M") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( towns ) +MACHINE_CONFIG_START(towns_state::towns) MCFG_FRAGMENT_ADD(towns_base) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( townsux ) +MACHINE_CONFIG_START(towns16_state::townsux) MCFG_FRAGMENT_ADD(towns_base) MCFG_CPU_REPLACE("maincpu",I386SX, 16000000) @@ -2941,7 +2941,7 @@ static MACHINE_CONFIG_START( townsux ) MCFG_NVRAM_ADD_0FILL("nvram16") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( townssj, towns ) +MACHINE_CONFIG_DERIVED(towns_state::townssj, towns) MCFG_CPU_REPLACE("maincpu",PENTIUM, 66000000) MCFG_CPU_PROGRAM_MAP(towns_mem) @@ -2954,7 +2954,7 @@ static MACHINE_CONFIG_DERIVED( townssj, towns ) MCFG_RAM_EXTRA_OPTIONS("40M,72M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( townshr, towns ) +MACHINE_CONFIG_DERIVED(towns_state::townshr, towns) MCFG_CPU_REPLACE("maincpu",I486, 20000000) MCFG_CPU_PROGRAM_MAP(towns_mem) MCFG_CPU_IO_MAP(towns_io) @@ -2966,7 +2966,7 @@ static MACHINE_CONFIG_DERIVED( townshr, towns ) MCFG_RAM_EXTRA_OPTIONS("12M,20M,28M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( townsftv, towns ) +MACHINE_CONFIG_DERIVED(towns_state::townsftv, towns) MCFG_CPU_REPLACE("maincpu",I486, 33000000) MCFG_CPU_PROGRAM_MAP(towns_mem) MCFG_CPU_IO_MAP(towns_io) @@ -2978,7 +2978,7 @@ static MACHINE_CONFIG_DERIVED( townsftv, towns ) MCFG_RAM_EXTRA_OPTIONS("32M,68M") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( marty ) +MACHINE_CONFIG_START(marty_state::marty) MCFG_FRAGMENT_ADD(towns_base) MCFG_CPU_REPLACE("maincpu",I386SX, 16000000) diff --git a/src/mame/drivers/fontwriter.cpp b/src/mame/drivers/fontwriter.cpp index 7e6410457db..a3173193cdb 100644 --- a/src/mame/drivers/fontwriter.cpp +++ b/src/mame/drivers/fontwriter.cpp @@ -43,6 +43,7 @@ public: m_vbl ^= 0xff; return m_vbl; } + void fontwriter(machine_config &config); protected: // devices @@ -86,7 +87,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( fontwriter ) INPUT_PORTS_END -static MACHINE_CONFIG_START( fontwriter ) +MACHINE_CONFIG_START(fontwriter_state::fontwriter) MCFG_CPU_ADD("maincpu", M37720S1, XTAL_16MHz) /* M37720S1 @ 16MHz - main CPU */ MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/foodf.cpp b/src/mame/drivers/foodf.cpp index ec09b5f7673..60b260ab9ac 100644 --- a/src/mame/drivers/foodf.cpp +++ b/src/mame/drivers/foodf.cpp @@ -335,7 +335,7 @@ READ8_MEMBER(foodf_state::pot_r) * *************************************/ -static MACHINE_CONFIG_START( foodf ) +MACHINE_CONFIG_START(foodf_state::foodf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2) diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp index be6da049d7e..466f85532b5 100644 --- a/src/mame/drivers/force68k.cpp +++ b/src/mame/drivers/force68k.cpp @@ -202,6 +202,8 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER (exp1_load) { return force68k_load_cart(image, m_cart); } DECLARE_READ16_MEMBER (read16_rom); + void fccpu1_eprom_sockets(machine_config &config); + void fccpu1(machine_config &config); private: required_device m_maincpu; required_device m_rtc; @@ -494,7 +496,7 @@ void force68k_state::write_acia_clocks(int id, int state) */ // Implementation of static 2 x 64K EPROM in sockets J10/J11 as 16 bit wide cartridge for easier // software handling. TODO: make configurable according to table above. -static MACHINE_CONFIG_START( fccpu1_eprom_sockets ) +MACHINE_CONFIG_START(force68k_state::fccpu1_eprom_sockets) MCFG_GENERIC_CARTSLOT_ADD("exp_rom1", generic_plain_slot, "fccpu1_cart") MCFG_GENERIC_EXTENSIONS("bin,rom") MCFG_GENERIC_WIDTH(GENERIC_ROM16_WIDTH) @@ -532,7 +534,7 @@ SLOT_INTERFACE_END /* * Machine configuration */ -static MACHINE_CONFIG_START (fccpu1) +MACHINE_CONFIG_START(force68k_state::fccpu1) /* basic machine hardware */ MCFG_CPU_ADD ("maincpu", M68000, XTAL_16MHz / 2) MCFG_CPU_PROGRAM_MAP (force68k_mem) @@ -605,27 +607,27 @@ MACHINE_CONFIG_END * CPU-6 family is device and adressmap compatible with CPU-1 but with additions * such as an optional 68881 FPU */ -static MACHINE_CONFIG_START (fccpu6) +MACHINE_CONFIG_START (force68k_state::fccpu6) MCFG_CPU_ADD ("maincpu", M68000, XTAL_8MHz) /* Jumper B10 Mode B */ MCFG_CPU_PROGRAM_MAP (force68k_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_START (fccpu6a) +MACHINE_CONFIG_START (force68k_state::fccpu6a) MCFG_CPU_ADD ("maincpu", M68000, XTAL_12_5MHz) /* Jumper B10 Mode A */ MCFG_CPU_PROGRAM_MAP (force68k_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_START (fccpu6v) +MACHINE_CONFIG_START (force68k_state::fccpu6v) MCFG_CPU_ADD ("maincpu", M68010, XTAL_8MHz) /* Jumper B10 Mode B */ MCFG_CPU_PROGRAM_MAP (force68k_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_START (fccpu6va) +MACHINE_CONFIG_START (force68k_state::fccpu6va) MCFG_CPU_ADD ("maincpu", M68010, XTAL_12_5MHz) /* Jumper B10 Mode A */ MCFG_CPU_PROGRAM_MAP (force68k_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_START (fccpu6vb) +MACHINE_CONFIG_START (force68k_state::fccpu6vb) MCFG_CPU_ADD ("maincpu", M68010, XTAL_12_5MHz) /* Jumper B10 Mode A */ MCFG_CPU_PROGRAM_MAP (force68k_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/forte2.cpp b/src/mame/drivers/forte2.cpp index bbf52182675..cbbd0fa2762 100644 --- a/src/mame/drivers/forte2.cpp +++ b/src/mame/drivers/forte2.cpp @@ -61,6 +61,7 @@ public: DECLARE_DRIVER_INIT(pesadelo); virtual void machine_start() override; virtual void machine_reset() override; + void pesadelo(machine_config &config); }; @@ -117,7 +118,7 @@ void forte2_state::machine_start() } -static MACHINE_CONFIG_START( pesadelo ) +MACHINE_CONFIG_START(forte2_state::pesadelo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) diff --git a/src/mame/drivers/fortecar.cpp b/src/mame/drivers/fortecar.cpp index 6302322c6e5..1ba3dc8310d 100644 --- a/src/mame/drivers/fortecar.cpp +++ b/src/mame/drivers/fortecar.cpp @@ -357,6 +357,7 @@ public: required_device m_eeprom; required_device m_gfxdecode; required_device m_palette; + void fortecar(machine_config &config); }; @@ -672,7 +673,7 @@ void fortecar_state::machine_reset() * Machine Drivers * ***********************************/ -static MACHINE_CONFIG_START( fortecar ) +MACHINE_CONFIG_START(fortecar_state::fortecar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* 3 MHz, measured */ MCFG_CPU_PROGRAM_MAP(fortecar_map) diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp index e841528204a..12d1a11baec 100644 --- a/src/mame/drivers/fp1100.cpp +++ b/src/mame/drivers/fp1100.cpp @@ -91,6 +91,7 @@ public: MC6845_UPDATE_ROW(crtc_update_row); TIMER_DEVICE_CALLBACK_MEMBER(timer_c); required_device m_palette; + void fp1100(machine_config &config); private: uint8_t m_irq_mask; uint8_t m_main_latch; @@ -625,7 +626,7 @@ DRIVER_INIT_MEMBER( fp1100_state, fp1100 ) membank("bankw0")->configure_entry(0, &wram[0x0000]); } -static MACHINE_CONFIG_START( fp1100 ) +MACHINE_CONFIG_START(fp1100_state::fp1100) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/fp200.cpp b/src/mame/drivers/fp200.cpp index 798d6b3ccae..18e4eec9518 100644 --- a/src/mame/drivers/fp200.cpp +++ b/src/mame/drivers/fp200.cpp @@ -68,6 +68,7 @@ public: DECLARE_READ_LINE_MEMBER(sid_r); DECLARE_PALETTE_INIT(fp200); + void fp200(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -579,7 +580,7 @@ READ_LINE_MEMBER( fp200_state::sid_r ) return (ioport("KEYMOD")->read() >> m_keyb_mux) & 1; } -static MACHINE_CONFIG_START( fp200 ) +MACHINE_CONFIG_START(fp200_state::fp200) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A,MAIN_CLOCK) diff --git a/src/mame/drivers/fp6000.cpp b/src/mame/drivers/fp6000.cpp index 529bf34ea79..a40e2e3dd30 100644 --- a/src/mame/drivers/fp6000.cpp +++ b/src/mame/drivers/fp6000.cpp @@ -62,6 +62,7 @@ public: required_devicem_crtc; required_device m_gfxdecode; required_device m_palette; + void fp6000(machine_config &config); }; void fp6000_state::video_start() @@ -289,7 +290,7 @@ void fp6000_state::machine_reset() { } -static MACHINE_CONFIG_START( fp6000 ) +MACHINE_CONFIG_START(fp6000_state::fp6000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, 16000000/2) MCFG_CPU_PROGRAM_MAP(fp6000_map) diff --git a/src/mame/drivers/freekick.cpp b/src/mame/drivers/freekick.cpp index 54583850a29..6be0afa5a0d 100644 --- a/src/mame/drivers/freekick.cpp +++ b/src/mame/drivers/freekick.cpp @@ -717,7 +717,7 @@ MACHINE_RESET_MEMBER(freekick_state,oigas) m_cnt = 0; } -static MACHINE_CONFIG_START( omega ) +MACHINE_CONFIG_START(freekick_state::omega) MCFG_CPU_ADD("maincpu", MC8123, XTAL_18_432MHz/6) // unknown divisor MCFG_CPU_PROGRAM_MAP(omega_map) MCFG_CPU_IO_MAP(omega_io_map) @@ -757,7 +757,7 @@ static MACHINE_CONFIG_START( omega ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( base ) +MACHINE_CONFIG_START(freekick_state::base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) @@ -795,7 +795,7 @@ static MACHINE_CONFIG_START( base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pbillrd, base ) +MACHINE_CONFIG_DERIVED(freekick_state::pbillrd, base) MCFG_DEVICE_MODIFY("outlatch") // 10K MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(freekick_state, flipscreen_x_w)) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(freekick_state, flipscreen_y_w)) @@ -805,7 +805,7 @@ static MACHINE_CONFIG_DERIVED( pbillrd, base ) MCFG_MACHINE_RESET_OVERRIDE(freekick_state,freekick) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pbillrdm, pbillrd ) +MACHINE_CONFIG_DERIVED(freekick_state::pbillrdm, pbillrd) MCFG_CPU_REPLACE("maincpu", MC8123, XTAL_12MHz/4) MCFG_CPU_PROGRAM_MAP(pbillrd_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) @@ -813,7 +813,7 @@ static MACHINE_CONFIG_DERIVED( pbillrdm, pbillrd ) MCFG_CPU_VBLANK_INT_DRIVER("screen", freekick_state, freekick_irqgen) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( freekick, base ) +MACHINE_CONFIG_DERIVED(freekick_state::freekick, base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -842,7 +842,7 @@ static MACHINE_CONFIG_DERIVED( freekick, base ) MCFG_SCREEN_UPDATE_DRIVER(freekick_state, screen_update_freekick) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gigas, base ) +MACHINE_CONFIG_DERIVED(freekick_state::gigas, base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -862,7 +862,7 @@ static MACHINE_CONFIG_DERIVED( gigas, base ) MCFG_SCREEN_UPDATE_DRIVER(freekick_state, screen_update_gigas) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gigasm, base ) +MACHINE_CONFIG_DERIVED(freekick_state::gigasm, base) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", MC8123, XTAL_12MHz/4) @@ -884,7 +884,7 @@ static MACHINE_CONFIG_DERIVED( gigasm, base ) MCFG_SCREEN_UPDATE_DRIVER(freekick_state, screen_update_gigas) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( oigas, gigas ) +MACHINE_CONFIG_DERIVED(freekick_state::oigas, gigas) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/fresh.cpp b/src/mame/drivers/fresh.cpp index 63b79a4ab21..f7993913513 100644 --- a/src/mame/drivers/fresh.cpp +++ b/src/mame/drivers/fresh.cpp @@ -101,6 +101,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void fresh(machine_config &config); }; @@ -590,7 +591,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(fresh_state::fake_scanline) } -static MACHINE_CONFIG_START( fresh ) +MACHINE_CONFIG_START(fresh_state::fresh) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 24000000/2 ) diff --git a/src/mame/drivers/fromanc2.cpp b/src/mame/drivers/fromanc2.cpp index 8d25246ecf5..d4ed8f4fd01 100644 --- a/src/mame/drivers/fromanc2.cpp +++ b/src/mame/drivers/fromanc2.cpp @@ -506,7 +506,7 @@ void fromanc2_state::machine_reset() m_datalatch_2l = 0; } -static MACHINE_CONFIG_START( fromanc2 ) +MACHINE_CONFIG_START(fromanc2_state::fromanc2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */ @@ -566,7 +566,7 @@ static MACHINE_CONFIG_START( fromanc2 ) MCFG_SOUND_ROUTE(2, "mono", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fromancr ) +MACHINE_CONFIG_START(fromanc2_state::fromancr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */ @@ -626,7 +626,7 @@ static MACHINE_CONFIG_START( fromancr ) MCFG_SOUND_ROUTE(2, "mono", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fromanc4 ) +MACHINE_CONFIG_START(fromanc2_state::fromanc4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16.00 MHz */ diff --git a/src/mame/drivers/fromance.cpp b/src/mame/drivers/fromance.cpp index 8d35849e7e9..d4cc48c5f70 100644 --- a/src/mame/drivers/fromance.cpp +++ b/src/mame/drivers/fromance.cpp @@ -893,7 +893,7 @@ MACHINE_RESET_MEMBER(fromance_state,fromance) m_flipscreen = 0; } -static MACHINE_CONFIG_START( nekkyoku ) +MACHINE_CONFIG_START(fromance_state::nekkyoku) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */ @@ -939,7 +939,7 @@ static MACHINE_CONFIG_START( nekkyoku ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( idolmj ) +MACHINE_CONFIG_START(fromance_state::idolmj) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2) /* 6.00 Mhz ? */ @@ -985,7 +985,7 @@ static MACHINE_CONFIG_START( idolmj ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fromance ) +MACHINE_CONFIG_START(fromance_state::fromance) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2) /* 6.00 Mhz ? */ diff --git a/src/mame/drivers/fruitpc.cpp b/src/mame/drivers/fruitpc.cpp index eba2c395d02..2d3ad2160a9 100644 --- a/src/mame/drivers/fruitpc.cpp +++ b/src/mame/drivers/fruitpc.cpp @@ -43,6 +43,8 @@ public: DECLARE_READ8_MEMBER(fruit_inp_r); DECLARE_WRITE8_MEMBER(dma8237_1_dack_w); + static void fruitpc_sb_conf(device_t *device); + void fruitpc(machine_config &config); }; READ8_MEMBER(fruitpc_state::fruit_inp_r) @@ -117,12 +119,13 @@ static DEVICE_INPUT_DEFAULTS_START( fruitpc_sb_def ) DEVICE_INPUT_DEFAULTS("CONFIG", 0x03, 0x01) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( fruitpc_sb_conf ) - MCFG_DEVICE_MODIFY("pc_joy") +void fruitpc_state::fruitpc_sb_conf(device_t *device) +{ + device = device->subdevice("pc_joy"); MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, nullptr, true) // remove joystick -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_START( fruitpc ) +MACHINE_CONFIG_START(fruitpc_state::fruitpc) MCFG_CPU_ADD("maincpu", I486, 66000000) // ST STPCD0166BTC3 66 MHz 486 CPU MCFG_CPU_PROGRAM_MAP(fruitpc_map) MCFG_CPU_IO_MAP(fruitpc_io) diff --git a/src/mame/drivers/ft68m.cpp b/src/mame/drivers/ft68m.cpp index 674136abb9c..59844352437 100644 --- a/src/mame/drivers/ft68m.cpp +++ b/src/mame/drivers/ft68m.cpp @@ -31,6 +31,7 @@ public: DECLARE_READ16_MEMBER(switches_r); + void ft68m(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -78,7 +79,7 @@ void ft68m_state::machine_reset() m_maincpu->reset(); } -static MACHINE_CONFIG_START( ft68m ) +MACHINE_CONFIG_START(ft68m_state::ft68m) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_19_6608MHz / 2) diff --git a/src/mame/drivers/fungames.cpp b/src/mame/drivers/fungames.cpp index 910513d7ae3..55f36a616dc 100644 --- a/src/mame/drivers/fungames.cpp +++ b/src/mame/drivers/fungames.cpp @@ -50,6 +50,7 @@ public: required_device m_maincpu; required_device m_video; + void fungames(machine_config &config); protected: // driver_device overrides @@ -90,7 +91,7 @@ void fungames_state::video_start() { } -static MACHINE_CONFIG_START( fungames ) +MACHINE_CONFIG_START(fungames_state::fungames) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/funkball.cpp b/src/mame/drivers/funkball.cpp index 4a098e8ae35..5c4c5454564 100644 --- a/src/mame/drivers/funkball.cpp +++ b/src/mame/drivers/funkball.cpp @@ -138,6 +138,7 @@ public: DECLARE_WRITE8_MEMBER(io20_w); virtual void machine_start() override; virtual void machine_reset() override; + void funkball(machine_config &config); }; void funkball_state::video_start() @@ -764,7 +765,7 @@ void funkball_state::machine_reset() m_voodoo_pci_regs.base_addr = 0xff000000; } -static MACHINE_CONFIG_START( funkball ) +MACHINE_CONFIG_START(funkball_state::funkball) MCFG_CPU_ADD("maincpu", MEDIAGX, 66666666*3.5) // 66,6 MHz x 3.5 MCFG_CPU_PROGRAM_MAP(funkball_map) MCFG_CPU_IO_MAP(funkball_io) diff --git a/src/mame/drivers/funkybee.cpp b/src/mame/drivers/funkybee.cpp index 5ac5f5bf1dd..742379aa598 100644 --- a/src/mame/drivers/funkybee.cpp +++ b/src/mame/drivers/funkybee.cpp @@ -283,7 +283,7 @@ void funkybee_state::machine_start() m_gfx_bank = 0; } -static MACHINE_CONFIG_START( funkybee ) +MACHINE_CONFIG_START(funkybee_state::funkybee) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */ diff --git a/src/mame/drivers/funkyjet.cpp b/src/mame/drivers/funkyjet.cpp index ef3a853e4f6..7f0fbb4dc6a 100644 --- a/src/mame/drivers/funkyjet.cpp +++ b/src/mame/drivers/funkyjet.cpp @@ -310,7 +310,7 @@ void funkyjet_state::machine_start() { } -static MACHINE_CONFIG_START( funkyjet ) +MACHINE_CONFIG_START(funkyjet_state::funkyjet) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* 28 MHz crystal */ diff --git a/src/mame/drivers/funtech.cpp b/src/mame/drivers/funtech.cpp index e780b38df9f..57e0a41ea55 100644 --- a/src/mame/drivers/funtech.cpp +++ b/src/mame/drivers/funtech.cpp @@ -94,6 +94,7 @@ public: required_device m_maincpu; required_device m_hopper; required_device m_gfxdecode; + void funtech(machine_config &config); }; @@ -484,7 +485,7 @@ void fun_tech_corp_state::machine_reset() { } -static MACHINE_CONFIG_START( funtech ) +MACHINE_CONFIG_START(fun_tech_corp_state::funtech) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */ diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp index aeb9a93439b..b7ed29568b9 100644 --- a/src/mame/drivers/funworld.cpp +++ b/src/mame/drivers/funworld.cpp @@ -3054,7 +3054,7 @@ MACHINE_RESET_MEMBER(funworld_state, lunapark) * Machine Drivers * **************************/ -static MACHINE_CONFIG_START( fw1stpal ) +MACHINE_CONFIG_START(funworld_state::fw1stpal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65SC02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(funworld_map) @@ -3101,7 +3101,7 @@ static MACHINE_CONFIG_START( fw1stpal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fw2ndpal, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::fw2ndpal, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(funworld_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) @@ -3110,7 +3110,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( funquiz, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::funquiz, fw1stpal) // MCFG_FRAGMENT_ADD(fw2ndpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(funquiz_map) @@ -3124,7 +3124,7 @@ static MACHINE_CONFIG_DERIVED( funquiz, fw1stpal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( magicrd2, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::magicrd2, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(magicrd2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) @@ -3143,42 +3143,42 @@ static MACHINE_CONFIG_DERIVED( magicrd2, fw1stpal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( royalcd1, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::royalcd1, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* (G65SC02P in pro version) 2MHz */ MCFG_CPU_PROGRAM_MAP(magicrd2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( royalcd2, fw2ndpal ) +MACHINE_CONFIG_DERIVED(funworld_state::royalcd2, fw2ndpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(magicrd2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cuoreuno, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::cuoreuno, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(cuoreuno_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( saloon, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::saloon, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(saloon_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( witchryl, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::witchryl, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(witchryl_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lunapark, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::lunapark, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(lunapark_map) // mirrored video RAM (4000/5000 to 6000/7000). MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) @@ -3187,14 +3187,14 @@ static MACHINE_CONFIG_DERIVED( lunapark, fw1stpal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( chinatow, fw2ndpal ) +MACHINE_CONFIG_DERIVED(funworld_state::chinatow, fw2ndpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(chinatow_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) MCFG_VIDEO_START_OVERRIDE(funworld_state, chinatow) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rcdino4, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::rcdino4, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(chinatow_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) @@ -3202,7 +3202,7 @@ static MACHINE_CONFIG_DERIVED( rcdino4, fw1stpal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( intrgmes, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::intrgmes, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(intergames_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) @@ -3210,7 +3210,7 @@ static MACHINE_CONFIG_DERIVED( intrgmes, fw1stpal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fw_a7_11, fw1stpal ) +MACHINE_CONFIG_DERIVED(funworld_state::fw_a7_11, fw1stpal) MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(fw_a7_11_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", funworld_state, nmi_line_pulse) diff --git a/src/mame/drivers/funybubl.cpp b/src/mame/drivers/funybubl.cpp index 66e89082315..ca05ee6ccd5 100644 --- a/src/mame/drivers/funybubl.cpp +++ b/src/mame/drivers/funybubl.cpp @@ -216,7 +216,7 @@ void funybubl_state::machine_start() } -static MACHINE_CONFIG_START( funybubl ) +MACHINE_CONFIG_START(funybubl_state::funybubl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz?? */ diff --git a/src/mame/drivers/fuukifg2.cpp b/src/mame/drivers/fuukifg2.cpp index a8330e2935d..b8f798cb486 100644 --- a/src/mame/drivers/fuukifg2.cpp +++ b/src/mame/drivers/fuukifg2.cpp @@ -438,7 +438,7 @@ void fuuki16_state::machine_reset() } -static MACHINE_CONFIG_START( fuuki16 ) +MACHINE_CONFIG_START(fuuki16_state::fuuki16) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2) /* 16 MHz */ diff --git a/src/mame/drivers/fuukifg3.cpp b/src/mame/drivers/fuukifg3.cpp index 4d524b7bbd0..3384825e2dc 100644 --- a/src/mame/drivers/fuukifg3.cpp +++ b/src/mame/drivers/fuukifg3.cpp @@ -546,7 +546,7 @@ void fuuki32_state::machine_reset() } -static MACHINE_CONFIG_START(fuuki32) +MACHINE_CONFIG_START(fuuki32_state::fuuki32) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, CPU_CLOCK) /* 20MHz verified */ diff --git a/src/mame/drivers/g627.cpp b/src/mame/drivers/g627.cpp index 3c6576f272f..df35b6a2b9f 100644 --- a/src/mame/drivers/g627.cpp +++ b/src/mame/drivers/g627.cpp @@ -67,6 +67,7 @@ public: DECLARE_WRITE8_MEMBER(portc_w); DECLARE_WRITE8_MEMBER(disp_w); DECLARE_WRITE8_MEMBER(lamp_w); + void g627(machine_config &config); private: uint8_t m_seg[6]; uint8_t m_portc; @@ -286,7 +287,7 @@ WRITE8_MEMBER( g627_state::lamp_w ) } } -static MACHINE_CONFIG_START( g627 ) +MACHINE_CONFIG_START(g627_state::g627) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 14138000/8) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp index 0a904df0d11..ab5bc1733ec 100644 --- a/src/mame/drivers/gaelco.cpp +++ b/src/mame/drivers/gaelco.cpp @@ -566,7 +566,7 @@ void gaelco_state::machine_start() membank("okibank")->configure_entries(0, 16, memregion("oki")->base(), 0x10000); } -static MACHINE_CONFIG_START( bigkarnk ) +MACHINE_CONFIG_START(gaelco_state::bigkarnk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* MC68000P10, 10 MHz */ @@ -612,7 +612,7 @@ static MACHINE_CONFIG_START( bigkarnk ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( maniacsq ) +MACHINE_CONFIG_START(gaelco_state::maniacsq) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2 ) /* verified on pcb */ @@ -642,7 +642,7 @@ static MACHINE_CONFIG_START( maniacsq ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( squash ) +MACHINE_CONFIG_START(gaelco_state::squash) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2 ) /* verified on pcb */ @@ -681,7 +681,7 @@ static MACHINE_CONFIG_START( squash ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( thoop ) +MACHINE_CONFIG_START(gaelco_state::thoop) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2 ) /* verified on pcb */ diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp index 53445437e4b..325e295100e 100644 --- a/src/mame/drivers/gaelco2.cpp +++ b/src/mame/drivers/gaelco2.cpp @@ -176,7 +176,7 @@ static INPUT_PORTS_START( maniacsq ) PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END -static MACHINE_CONFIG_START( maniacsq ) +MACHINE_CONFIG_START(gaelco2_state::maniacsq) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_26MHz / 2) /* 13 MHz? */ MCFG_CPU_PROGRAM_MAP(maniacsq_map) @@ -209,7 +209,7 @@ static MACHINE_CONFIG_START( maniacsq ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maniacsq_d5002fp, maniacsq ) +MACHINE_CONFIG_DERIVED(gaelco2_state::maniacsq_d5002fp, maniacsq) MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) /* ? */ MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map) MACHINE_CONFIG_END @@ -443,7 +443,7 @@ ROM_START( play2000a ) ROM_LOAD( "palce16v8h.u29", 0x0000, 0x0117, BAD_DUMP CRC(4a0a6f39) SHA1(57351e471649391c9abf110828fe2f128fe84eee) ) ROM_END -static MACHINE_CONFIG_START( play2000 ) +MACHINE_CONFIG_START(gaelco2_state::play2000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz) /* or from the 34MHz? (34MHz drives the CG-1V-149 PLD?) */ MCFG_CPU_PROGRAM_MAP(play2000_map) @@ -540,7 +540,7 @@ static INPUT_PORTS_START( bang ) PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, -6.0 / 240, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2) INPUT_PORTS_END -static MACHINE_CONFIG_START( bang ) +MACHINE_CONFIG_START(bang_state::bang) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_30MHz / 2) /* 15 MHz */ MCFG_CPU_PROGRAM_MAP(bang_map) @@ -787,7 +787,7 @@ static INPUT_PORTS_START( alighunt ) PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END -static MACHINE_CONFIG_START( alighunt ) +MACHINE_CONFIG_START(gaelco2_state::alighunt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz */ MCFG_CPU_PROGRAM_MAP(alighunt_map) @@ -820,7 +820,7 @@ static MACHINE_CONFIG_START( alighunt ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( alighunt_d5002fp, alighunt ) +MACHINE_CONFIG_DERIVED(gaelco2_state::alighunt_d5002fp, alighunt) MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) /* 12 MHz */ MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map) MACHINE_CONFIG_END @@ -1084,7 +1084,7 @@ static INPUT_PORTS_START( touchgo ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE4 ) PORT_TOGGLE INPUT_PORTS_END -static MACHINE_CONFIG_START( touchgo ) +MACHINE_CONFIG_START(gaelco2_state::touchgo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2) /* 16 MHz */ MCFG_CPU_PROGRAM_MAP(touchgo_map) @@ -1133,7 +1133,7 @@ static MACHINE_CONFIG_START( touchgo ) MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( touchgo_d5002fp, touchgo ) +MACHINE_CONFIG_DERIVED(gaelco2_state::touchgo_d5002fp, touchgo) MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_40MHz / 4) /* 10MHz? - Not verified */ MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map) MACHINE_CONFIG_END @@ -1330,7 +1330,7 @@ static INPUT_PORTS_START( snowboar ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) INPUT_PORTS_END -static MACHINE_CONFIG_START( snowboar ) +MACHINE_CONFIG_START(gaelco2_state::snowboar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_30MHz / 2) /* 15 MHz */ MCFG_CPU_PROGRAM_MAP(snowboar_map) @@ -1573,7 +1573,7 @@ static INPUT_PORTS_START( wrally2 ) PORT_BIT( 0xff, 0x8A, IPT_PADDLE_V ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) PORT_REVERSE PORT_NAME("P2 Wheel") INPUT_PORTS_END -static MACHINE_CONFIG_START( wrally2 ) +MACHINE_CONFIG_START(wrally2_state::wrally2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_26MHz / 2) /* 13 MHz */ MCFG_CPU_PROGRAM_MAP(wrally2_map) @@ -1742,22 +1742,22 @@ ROM_START( wrally2 ) A little less obvious is why the older dump had the following startup code, which appears to have been partially patched out - 0200: mov sp,#$70 - 0203: mov a,pcon - 0205: anl a,#$20 - 0207: jnz $0203 - 0209: nop - 020A: nop - 020B: nop - 020C: mov dptr,#$FC01 + 0200: mov sp,#$70 + 0203: mov a,pcon + 0205: anl a,#$20 + 0207: jnz $0203 + 0209: nop + 020A: nop + 020B: nop + 020C: mov dptr,#$FC01 while the newer dump has this - 0200: mov sp,#$70 - 0203: mov mcon,#$68 - 0206: mov i2cfg,#$00 - 0209: mov crcr,#$80 - 020C: mov dptr,#$FC01 + 0200: mov sp,#$70 + 0203: mov mcon,#$68 + 0206: mov i2cfg,#$00 + 0209: mov crcr,#$80 + 020C: mov dptr,#$FC01 either way the 2nd dump is in much better state, so we're using that. */ diff --git a/src/mame/drivers/gaelco3d.cpp b/src/mame/drivers/gaelco3d.cpp index 4bba9e013bb..586dea81d5d 100644 --- a/src/mame/drivers/gaelco3d.cpp +++ b/src/mame/drivers/gaelco3d.cpp @@ -906,7 +906,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( gaelco3d ) +MACHINE_CONFIG_START(gaelco3d_state::gaelco3d) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 15000000) @@ -983,7 +983,7 @@ static MACHINE_CONFIG_START( gaelco3d ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gaelco3d2, gaelco3d ) +MACHINE_CONFIG_DERIVED(gaelco3d_state::gaelco3d2, gaelco3d) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", M68EC020, 25000000) @@ -996,7 +996,7 @@ static MACHINE_CONFIG_DERIVED( gaelco3d2, gaelco3d ) MCFG_MACHINE_RESET_OVERRIDE(gaelco3d_state,gaelco3d2) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( footbpow, gaelco3d2 ) +MACHINE_CONFIG_DERIVED(gaelco3d_state::footbpow, gaelco3d2) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(gaelco3d_state, fp_analog_clock_w)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/gaelcopc.cpp b/src/mame/drivers/gaelcopc.cpp index 90e5459f576..316410f22ee 100644 --- a/src/mame/drivers/gaelcopc.cpp +++ b/src/mame/drivers/gaelcopc.cpp @@ -39,6 +39,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void gaelcopc(machine_config &config); protected: // devices @@ -66,7 +67,7 @@ static INPUT_PORTS_START( gaelcopc ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gaelcopc ) +MACHINE_CONFIG_START(gaelcopc_state::gaelcopc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM, 2000000000) /* Pentium4? */ MCFG_CPU_PROGRAM_MAP(gaelcopc_map) diff --git a/src/mame/drivers/gaiden.cpp b/src/mame/drivers/gaiden.cpp index 69c24573b63..c9bfbb8380e 100644 --- a/src/mame/drivers/gaiden.cpp +++ b/src/mame/drivers/gaiden.cpp @@ -741,7 +741,7 @@ static GFXDECODE_START( drgnbowl ) GFXDECODE_END -static MACHINE_CONFIG_START( shadoww ) +MACHINE_CONFIG_START(gaiden_state::shadoww) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 18432000/2) /* 9.216 MHz */ @@ -805,7 +805,7 @@ static MACHINE_CONFIG_START( shadoww ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( raiga, shadoww ) +MACHINE_CONFIG_DERIVED(gaiden_state::raiga, shadoww) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(gaiden_state, screen_update_raiga) @@ -814,7 +814,7 @@ static MACHINE_CONFIG_DERIVED( raiga, shadoww ) MCFG_GFXDECODE_MODIFY("gfxdecode", raiga) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( drgnbowl ) +MACHINE_CONFIG_START(gaiden_state::drgnbowl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 20000000/2) /* 10 MHz */ @@ -970,7 +970,7 @@ static ADDRESS_MAP_START( mastninj_map, AS_PROGRAM, 16, gaiden_state ) AM_RANGE(0x07e000, 0x07e001) AM_WRITE8(drgnbowl_irq_ack_w, 0xff00) ADDRESS_MAP_END -static MACHINE_CONFIG_START( mastninj ) +MACHINE_CONFIG_START(gaiden_state::mastninj) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz? */ diff --git a/src/mame/drivers/gal3.cpp b/src/mame/drivers/gal3.cpp index 568d0462e8b..9be4714cca6 100644 --- a/src/mame/drivers/gal3.cpp +++ b/src/mame/drivers/gal3.cpp @@ -166,6 +166,7 @@ public: DECLARE_VIDEO_START(gal3); uint32_t screen_update_gal3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void update_palette( ); + void gal3(machine_config &config); }; @@ -593,7 +594,7 @@ static GFXDECODE_START( namcos21 ) GFXDECODE_ENTRY( "obj_board1", 0x000000, tile_layout, 0x000, 0x20 ) GFXDECODE_END -static MACHINE_CONFIG_START( gal3 ) +MACHINE_CONFIG_START(gal3_state::gal3) MCFG_CPU_ADD("maincpu", M68020, 49152000/2) MCFG_CPU_PROGRAM_MAP(cpu_mst_map) MCFG_CPU_VBLANK_INT_DRIVER("lscreen", gal3_state, irq1_line_hold) diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp index b90d89a8119..0a1b8f44b1b 100644 --- a/src/mame/drivers/galaga.cpp +++ b/src/mame/drivers/galaga.cpp @@ -1558,7 +1558,7 @@ INTERRUPT_GEN_MEMBER(galaga_state::sub_vblank_irq) device.execute().set_input_line(0, ASSERT_LINE); } -static MACHINE_CONFIG_START( bosco ) +MACHINE_CONFIG_START(bosco_state::bosco) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */ @@ -1656,7 +1656,7 @@ static MACHINE_CONFIG_START( bosco ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( galaga ) +MACHINE_CONFIG_START(galaga_state::galaga) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */ @@ -1732,7 +1732,7 @@ static MACHINE_CONFIG_START( galaga ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( galagab, galaga ) +MACHINE_CONFIG_DERIVED(galaga_state::galagab, galaga) /* basic machine hardware */ @@ -1752,7 +1752,7 @@ static MACHINE_CONFIG_DERIVED( galagab, galaga ) MCFG_DEVICE_REMOVE("discrete") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gatsbee, galaga ) +MACHINE_CONFIG_DERIVED(galaga_state::gatsbee, galaga) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(gatsbee_main_map) @@ -1760,7 +1760,7 @@ static MACHINE_CONFIG_DERIVED( gatsbee, galaga ) MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(galaga_state, gatsbee_bank_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( xevious ) +MACHINE_CONFIG_START(xevious_state::xevious) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */ @@ -1836,7 +1836,7 @@ static MACHINE_CONFIG_START( xevious ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( battles, xevious ) +MACHINE_CONFIG_DERIVED(xevious_state::battles, xevious) /* basic machine hardware */ @@ -1867,7 +1867,7 @@ static MACHINE_CONFIG_DERIVED( battles, xevious ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( digdug ) +MACHINE_CONFIG_START(digdug_state::digdug) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */ @@ -1949,7 +1949,7 @@ static MACHINE_CONFIG_START( digdug ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dzigzag, digdug ) +MACHINE_CONFIG_DERIVED(digdug_state::dzigzag, digdug) /* basic machine hardware */ diff --git a/src/mame/drivers/galastrm.cpp b/src/mame/drivers/galastrm.cpp index b6dd127ef72..3a6b55ac1b1 100644 --- a/src/mame/drivers/galastrm.cpp +++ b/src/mame/drivers/galastrm.cpp @@ -233,7 +233,7 @@ GFXDECODE_END /***************************************************************************/ -static MACHINE_CONFIG_START( galastrm ) +MACHINE_CONFIG_START(galastrm_state::galastrm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */ MCFG_CPU_PROGRAM_MAP(galastrm_map) diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp index 093a0c2fe65..8360dc7ebc5 100644 --- a/src/mame/drivers/galaxi.cpp +++ b/src/mame/drivers/galaxi.cpp @@ -110,6 +110,9 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void galaxi(machine_config &config); + void lastfour(machine_config &config); + void magjoker(machine_config &config); }; @@ -445,7 +448,7 @@ void galaxi_state::machine_reset() Machine Drivers ***************************************************************************/ -static MACHINE_CONFIG_START( galaxi ) +MACHINE_CONFIG_START(galaxi_state::galaxi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) @@ -475,7 +478,7 @@ static MACHINE_CONFIG_START( galaxi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( magjoker, galaxi ) +MACHINE_CONFIG_DERIVED(galaxi_state::magjoker, galaxi) /* sound hardware */ MCFG_SOUND_MODIFY("oki") @@ -486,7 +489,7 @@ static MACHINE_CONFIG_DERIVED( magjoker, galaxi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lastfour, galaxi ) +MACHINE_CONFIG_DERIVED(galaxi_state::lastfour, galaxi) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/galaxia.cpp b/src/mame/drivers/galaxia.cpp index 14c629e8a34..cc7a28247da 100644 --- a/src/mame/drivers/galaxia.cpp +++ b/src/mame/drivers/galaxia.cpp @@ -284,7 +284,7 @@ static GFXDECODE_START( astrowar ) GFXDECODE_END -static MACHINE_CONFIG_START( galaxia ) +MACHINE_CONFIG_START(galaxia_state::galaxia) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, XTAL_14_31818MHz/8) @@ -328,7 +328,7 @@ static MACHINE_CONFIG_START( galaxia ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( astrowar ) +MACHINE_CONFIG_START(galaxia_state::astrowar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, XTAL_14_31818MHz/8) diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index 2a1972a75fc..77ff80f7cef 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -5681,7 +5681,7 @@ DISCRETE_SOUND_END * *************************************/ -static MACHINE_CONFIG_START( galaxian_base ) +MACHINE_CONFIG_START(galaxian_state::galaxian_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, GALAXIAN_PIXEL_CLOCK/3/2) @@ -5707,7 +5707,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( konami_base, galaxian_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::konami_base, galaxian_base) MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) @@ -5723,7 +5723,7 @@ static MACHINE_CONFIG_DERIVED( konami_base, galaxian_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( konami_sound_1x_ay8910 ) +MACHINE_CONFIG_START(galaxian_state::konami_sound_1x_ay8910) /* 2nd CPU to drive sound */ MCFG_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8) @@ -5748,7 +5748,7 @@ static MACHINE_CONFIG_START( konami_sound_1x_ay8910 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( konami_sound_2x_ay8910 ) +MACHINE_CONFIG_START(galaxian_state::konami_sound_2x_ay8910) /* 2nd CPU to drive sound */ MCFG_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8) @@ -5780,7 +5780,7 @@ static MACHINE_CONFIG_START( konami_sound_2x_ay8910 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( scramble_base, konami_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::scramble_base, konami_base) MCFG_FRAGMENT_ADD(konami_sound_2x_ay8910) /* blinking frequency is determined by 555 counter with Ra=100k, Rb=10k, C=10uF */ @@ -5795,24 +5795,24 @@ MACHINE_CONFIG_END * *************************************/ -static MACHINE_CONFIG_DERIVED( galaxian, galaxian_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::galaxian, galaxian_base) MCFG_FRAGMENT_ADD(galaxian_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spactrai, galaxian ) +MACHINE_CONFIG_DERIVED(galaxian_state::spactrai, galaxian) /* strange memory map with RAM in the middle of ROM, there's a large block on the ROM board */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(spactrai_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pacmanbl, galaxian ) +MACHINE_CONFIG_DERIVED(galaxian_state::pacmanbl, galaxian) /* separate tile/sprite ROMs */ MCFG_GFXDECODE_MODIFY("gfxdecode", pacmanbl) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tenspot, galaxian ) +MACHINE_CONFIG_DERIVED(galaxian_state::tenspot, galaxian) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxian_state, fakechange_interrupt_gen) @@ -5826,7 +5826,7 @@ static MACHINE_CONFIG_DERIVED( tenspot, galaxian ) MCFG_GFXDECODE_MODIFY("gfxdecode", tenspot) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zigzag, galaxian_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::zigzag, galaxian_base) /* separate tile/sprite ROMs */ MCFG_GFXDECODE_MODIFY("gfxdecode", pacmanbl) @@ -5841,7 +5841,7 @@ static MACHINE_CONFIG_DERIVED( zigzag, galaxian_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gmgalax, galaxian ) +MACHINE_CONFIG_DERIVED(galaxian_state::gmgalax, galaxian) /* banked video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gmgalax) @@ -5851,7 +5851,7 @@ static MACHINE_CONFIG_DERIVED( gmgalax, galaxian ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mooncrst, galaxian_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::mooncrst, galaxian_base) /* alternate memory map */ MCFG_CPU_MODIFY("maincpu") @@ -5860,13 +5860,13 @@ static MACHINE_CONFIG_DERIVED( mooncrst, galaxian_base ) MCFG_FRAGMENT_ADD(mooncrst_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( moonqsr, mooncrst ) +MACHINE_CONFIG_DERIVED(galaxian_state::moonqsr, mooncrst) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(moonqsr_decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fantastc, galaxian_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::fantastc, galaxian_base) /* alternate memory map */ MCFG_CPU_MODIFY("maincpu") @@ -5894,7 +5894,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(galaxian_state::timefgtr_scanline) } } -static MACHINE_CONFIG_DERIVED( timefgtr, galaxian_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::timefgtr, galaxian_base) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galaxian_state, timefgtr_scanline, "screen", 0, 1) @@ -5911,7 +5911,7 @@ static MACHINE_CONFIG_DERIVED( timefgtr, galaxian_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jumpbug, galaxian_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::jumpbug, galaxian_base) MCFG_DEVICE_REMOVE("watchdog") @@ -5925,7 +5925,7 @@ static MACHINE_CONFIG_DERIVED( jumpbug, galaxian_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( checkman, mooncrst ) +MACHINE_CONFIG_DERIVED(galaxian_state::checkman, mooncrst) /* basic machine hardware */ MCFG_CPU_ADD("audiocpu", Z80, 1620000) /* 1.62 MHz */ @@ -5941,7 +5941,7 @@ static MACHINE_CONFIG_DERIVED( checkman, mooncrst ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( checkmaj, galaxian_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::checkmaj, galaxian_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -5962,7 +5962,7 @@ static MACHINE_CONFIG_DERIVED( checkmaj, galaxian_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mshuttle, galaxian_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::mshuttle, galaxian_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -5975,7 +5975,7 @@ static MACHINE_CONFIG_DERIVED( mshuttle, galaxian_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kingball, mooncrst ) +MACHINE_CONFIG_DERIVED(galaxian_state::kingball, mooncrst) /* basic machine hardware */ MCFG_CPU_ADD("audiocpu", Z80,5000000/2) @@ -5991,7 +5991,7 @@ static MACHINE_CONFIG_DERIVED( kingball, mooncrst ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( frogger, konami_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::frogger, konami_base) MCFG_FRAGMENT_ADD(konami_sound_1x_ay8910) /* alternate memory map */ @@ -6000,7 +6000,7 @@ static MACHINE_CONFIG_DERIVED( frogger, konami_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( froggermc, galaxian_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::froggermc, galaxian_base) MCFG_FRAGMENT_ADD(konami_sound_1x_ay8910) /* alternate memory map */ @@ -6012,7 +6012,7 @@ static MACHINE_CONFIG_DERIVED( froggermc, galaxian_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( froggers, konami_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::froggers, konami_base) MCFG_FRAGMENT_ADD(konami_sound_1x_ay8910) /* alternate memory map */ @@ -6021,7 +6021,7 @@ static MACHINE_CONFIG_DERIVED( froggers, konami_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( frogf, konami_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::frogf, konami_base) MCFG_FRAGMENT_ADD(konami_sound_1x_ay8910) /* alternate memory map */ @@ -6030,7 +6030,7 @@ static MACHINE_CONFIG_DERIVED( frogf, konami_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( turtles, konami_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::turtles, konami_base) MCFG_FRAGMENT_ADD(konami_sound_2x_ay8910) /* alternate memory map */ @@ -6038,7 +6038,7 @@ static MACHINE_CONFIG_DERIVED( turtles, konami_base ) MCFG_CPU_PROGRAM_MAP(turtles_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( amigo2, galaxian_base ) // bootleg has no i8255s +MACHINE_CONFIG_DERIVED(galaxian_state::amigo2, galaxian_base) // bootleg has no i8255s /* alternate memory map */ MCFG_CPU_MODIFY("maincpu") @@ -6047,7 +6047,7 @@ static MACHINE_CONFIG_DERIVED( amigo2, galaxian_base ) // bootleg has no i8255s MCFG_FRAGMENT_ADD(konami_sound_2x_ay8910) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( turpins, turtles ) +MACHINE_CONFIG_DERIVED(galaxian_state::turpins, turtles) // the ROMs came from a blister, so there aren't PCB infos available. Chip types and clocks are guessed. @@ -6060,7 +6060,7 @@ static MACHINE_CONFIG_DERIVED( turpins, turtles ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( theend, konami_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::theend, konami_base) MCFG_FRAGMENT_ADD(konami_sound_2x_ay8910) /* alternate memory map */ @@ -6072,7 +6072,7 @@ static MACHINE_CONFIG_DERIVED( theend, konami_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( scramble, scramble_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::scramble, scramble_base) /* alternate memory map */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(theend_map) @@ -6083,7 +6083,7 @@ static MACHINE_CONFIG_DERIVED( scramble, scramble_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( explorer, galaxian_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::explorer, galaxian_base) /* alternate memory map */ MCFG_CPU_MODIFY("maincpu") @@ -6106,7 +6106,7 @@ static MACHINE_CONFIG_DERIVED( explorer, galaxian_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( takeoff, explorer ) // takeoff shares the same main map as explorer, but uses only one AY8912 for sound. +MACHINE_CONFIG_DERIVED(galaxian_state::takeoff, explorer) // takeoff shares the same main map as explorer, but uses only one AY8912 for sound. MCFG_SOUND_MODIFY("maincpu") MCFG_DEVICE_CLOCK(XTAL_12MHz / 8) // XTAL verified, divider not verified @@ -6126,7 +6126,7 @@ static MACHINE_CONFIG_DERIVED( takeoff, explorer ) // takeoff shares the same ma MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( scorpion, scramble_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::scorpion, scramble_base) /* alternate memory map */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(theend_map) @@ -6146,7 +6146,7 @@ static MACHINE_CONFIG_DERIVED( scorpion, scramble_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sfx, scramble_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::sfx, scramble_base) MCFG_DEVICE_REMOVE("watchdog") /* alternate memory map */ @@ -6175,7 +6175,7 @@ static MACHINE_CONFIG_DERIVED( sfx, scramble_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( monsterz, sfx ) +MACHINE_CONFIG_DERIVED(galaxian_state::monsterz, sfx) /* alternate memory map */ MCFG_CPU_MODIFY("maincpu") @@ -6191,13 +6191,13 @@ static MACHINE_CONFIG_DERIVED( monsterz, sfx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( scobra, scramble_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::scobra, scramble_base) /* alternate memory map */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(scobra_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( anteatergg, galaxian ) +MACHINE_CONFIG_DERIVED(galaxian_state::anteatergg, galaxian) /* alternate memory map */ MCFG_CPU_MODIFY("maincpu") @@ -6252,7 +6252,7 @@ Silkscreened label: "10041" */ -static MACHINE_CONFIG_DERIVED( quaak, konami_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::quaak, konami_base) MCFG_FRAGMENT_ADD(konami_sound_2x_ay8910) MCFG_DEVICE_MODIFY("8910.0") @@ -6263,7 +6263,7 @@ static MACHINE_CONFIG_DERIVED( quaak, konami_base ) MCFG_CPU_PROGRAM_MAP(scobra_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( froggeram, konami_base ) +MACHINE_CONFIG_DERIVED(galaxian_state::froggeram, konami_base) MCFG_FRAGMENT_ADD(konami_sound_2x_ay8910) MCFG_DEVICE_MODIFY("8910.0") @@ -6275,7 +6275,7 @@ static MACHINE_CONFIG_DERIVED( froggeram, konami_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( anteater, scobra ) +MACHINE_CONFIG_DERIVED(galaxian_state::anteater, scobra) /* quiet down the sounds */ MCFG_SOUND_MODIFY("konami") @@ -6284,7 +6284,7 @@ static MACHINE_CONFIG_DERIVED( anteater, scobra ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( anteateruk, anteater ) +MACHINE_CONFIG_DERIVED(galaxian_state::anteateruk, anteater) /* strange memory map, maybe a kind of protection */ MCFG_CPU_MODIFY("maincpu") @@ -6292,7 +6292,7 @@ static MACHINE_CONFIG_DERIVED( anteateruk, anteater ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( anteaterg, anteater ) +MACHINE_CONFIG_DERIVED(galaxian_state::anteaterg, anteater) /* strange memory map, maybe a kind of protection */ MCFG_CPU_MODIFY("maincpu") @@ -6300,7 +6300,7 @@ static MACHINE_CONFIG_DERIVED( anteaterg, anteater ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( moonwar, scobra ) +MACHINE_CONFIG_DERIVED(galaxian_state::moonwar, scobra) MCFG_DEVICE_MODIFY("ppi8255_0") MCFG_I8255_OUT_PORTC_CB(WRITE8(galaxian_state, moonwar_port_select_w)) diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp index bab7cd3ab44..4c65babc7b9 100644 --- a/src/mame/drivers/galaxold.cpp +++ b/src/mame/drivers/galaxold.cpp @@ -2219,7 +2219,7 @@ static GFXDECODE_START( _4in1 ) GFXDECODE_END -static MACHINE_CONFIG_START( galaxold_base ) +MACHINE_CONFIG_START(galaxold_state::galaxold_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */ @@ -2254,7 +2254,7 @@ static MACHINE_CONFIG_START( galaxold_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( galaxian, galaxold_base ) +MACHINE_CONFIG_DERIVED(galaxold_state::galaxian, galaxold_base) /* basic machine hardware */ @@ -2263,7 +2263,7 @@ static MACHINE_CONFIG_DERIVED( galaxian, galaxold_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mooncrst, galaxold_base ) +MACHINE_CONFIG_DERIVED(galaxold_state::mooncrst, galaxold_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2282,7 +2282,7 @@ MACHINE_CONFIG_END // but neither of the games we have (froggerv and hustlerb3) make use of either. There are a number // of unpopulated positions on the game board which presumably can be populated with code for the // 2nd Z80. -static MACHINE_CONFIG_DERIVED( videotron, galaxian ) +MACHINE_CONFIG_DERIVED(galaxold_state::videotron, galaxian) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2293,14 +2293,14 @@ static MACHINE_CONFIG_DERIVED( videotron, galaxian ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( porter, mooncrst ) +MACHINE_CONFIG_DERIVED(galaxold_state::porter, mooncrst) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(galaxold_state, pisces) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( scramblb, galaxian ) +MACHINE_CONFIG_DERIVED(galaxold_state::scramblb, galaxian) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2315,7 +2315,7 @@ static MACHINE_CONFIG_DERIVED( scramblb, galaxian ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( scramb2, galaxian ) +MACHINE_CONFIG_DERIVED(galaxold_state::scramb2, galaxian) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2330,7 +2330,7 @@ static MACHINE_CONFIG_DERIVED( scramb2, galaxian ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( scrambler, galaxian ) +MACHINE_CONFIG_DERIVED(galaxold_state::scrambler, galaxian) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2345,7 +2345,7 @@ static MACHINE_CONFIG_DERIVED( scrambler, galaxian ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( guttang, galaxian ) +MACHINE_CONFIG_DERIVED(galaxold_state::guttang, galaxian) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2361,7 +2361,7 @@ static MACHINE_CONFIG_DERIVED( guttang, galaxian ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( 4in1, galaxian ) +MACHINE_CONFIG_DERIVED(galaxold_state::_4in1, galaxian) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2374,7 +2374,7 @@ static MACHINE_CONFIG_DERIVED( 4in1, galaxian ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bagmanmc, mooncrst ) +MACHINE_CONFIG_DERIVED(galaxold_state::bagmanmc, mooncrst) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2387,7 +2387,7 @@ static MACHINE_CONFIG_DERIVED( bagmanmc, mooncrst ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dkongjrm, mooncrst ) +MACHINE_CONFIG_DERIVED(galaxold_state::dkongjrm, mooncrst) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2398,7 +2398,7 @@ static MACHINE_CONFIG_DERIVED( dkongjrm, mooncrst ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dkongjrmc, mooncrst ) +MACHINE_CONFIG_DERIVED(galaxold_state::dkongjrmc, mooncrst) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(dkongjrmc_map) @@ -2406,7 +2406,7 @@ static MACHINE_CONFIG_DERIVED( dkongjrmc, mooncrst ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rockclim, mooncrst ) +MACHINE_CONFIG_DERIVED(galaxold_state::rockclim, mooncrst) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2424,7 +2424,7 @@ static MACHINE_CONFIG_DERIVED( rockclim, mooncrst ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ozon1, galaxold_base ) +MACHINE_CONFIG_DERIVED(galaxold_state::ozon1, galaxold_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2445,7 +2445,7 @@ static MACHINE_CONFIG_DERIVED( ozon1, galaxold_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( drivfrcg ) +MACHINE_CONFIG_START(galaxold_state::drivfrcg) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/6) @@ -2477,7 +2477,7 @@ static MACHINE_CONFIG_START( drivfrcg ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bongo, galaxold_base ) +MACHINE_CONFIG_DERIVED(galaxold_state::bongo, galaxold_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2496,7 +2496,7 @@ static MACHINE_CONFIG_DERIVED( bongo, galaxold_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hunchbkg, galaxold_base ) +MACHINE_CONFIG_DERIVED(galaxold_state::hunchbkg, galaxold_base) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", S2650, PIXEL_CLOCK / 4) @@ -2515,7 +2515,7 @@ static MACHINE_CONFIG_DERIVED( hunchbkg, galaxold_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spcwarp, hunchbkg ) +MACHINE_CONFIG_DERIVED(galaxold_state::spcwarp, hunchbkg) /* hunchbkg, but with a different memory map */ /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2523,7 +2523,7 @@ static MACHINE_CONFIG_DERIVED( spcwarp, hunchbkg ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tazzmang, galaxian ) +MACHINE_CONFIG_DERIVED(galaxold_state::tazzmang, galaxian) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2531,7 +2531,7 @@ static MACHINE_CONFIG_DERIVED( tazzmang, galaxian ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( racknrol ) +MACHINE_CONFIG_START(galaxold_state::racknrol) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, PIXEL_CLOCK/2) @@ -2559,7 +2559,7 @@ static MACHINE_CONFIG_START( racknrol ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hexpoola ) +MACHINE_CONFIG_START(galaxold_state::hexpoola) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, PIXEL_CLOCK/2) @@ -2587,7 +2587,7 @@ static MACHINE_CONFIG_START( hexpoola ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ckongg, galaxian ) +MACHINE_CONFIG_DERIVED(galaxold_state::ckongg, galaxian) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2599,7 +2599,7 @@ static MACHINE_CONFIG_DERIVED( ckongg, galaxian ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ckongmc, mooncrst ) +MACHINE_CONFIG_DERIVED(galaxold_state::ckongmc, mooncrst) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2611,7 +2611,7 @@ static MACHINE_CONFIG_DERIVED( ckongmc, mooncrst ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bullsdrtg, hexpoola ) +MACHINE_CONFIG_DERIVED(galaxold_state::bullsdrtg, hexpoola) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_DATA_MAP(bullsdrtg_data_map) @@ -3533,7 +3533,7 @@ GAME( 1982, ckongis, ckong, ckongg, ckonggx, galaxold_state, ckonggx, GAME( 1981, scramblb, scramble, scramblb, scramblb, galaxold_state, 0, ROT90, "bootleg", "Scramble (bootleg on Galaxian hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) GAME( 1981, scramb2, scramble, scramb2, scramb2, galaxold_state, 0, ROT90, "bootleg", "Scramble (bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) GAME( 1981, scrambler, scramble, scrambler, scrambler, galaxold_state, 0, ROT90, "bootleg (Reben S.A.)", "Scramble (Reben S.A. Spanish bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) -GAME( 1981, 4in1, 0, 4in1, 4in1, galaxold_state, 4in1, ROT90, "Armenia / Food and Fun", "4 Fun in 1", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 1981, 4in1, 0, _4in1, 4in1, galaxold_state, 4in1, ROT90, "Armenia / Food and Fun", "4 Fun in 1", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1982, bagmanmc, bagman, bagmanmc, bagmanmc, galaxold_state, 0, ROT90, "bootleg", "Bagman (bootleg on Moon Cresta hardware, set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) GAME( 1984, bagmanm2, bagman, bagmanmc, bagmanmc, galaxold_state, 0, ROT90, "bootleg (GIB)", "Bagman (bootleg on Moon Cresta hardware, set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) GAME( 1982, dkongjrm, dkongjr, dkongjrm, dkongjrm, galaxold_state, 0, ROT90, "bootleg", "Donkey Kong Jr. (bootleg on Moon Cresta hardware, set 1)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/galaxy.cpp b/src/mame/drivers/galaxy.cpp index dc9794d77cf..bc6f93ab70c 100644 --- a/src/mame/drivers/galaxy.cpp +++ b/src/mame/drivers/galaxy.cpp @@ -172,7 +172,7 @@ static GFXDECODE_START( galaxy ) GFXDECODE_END -static MACHINE_CONFIG_START( galaxy ) +MACHINE_CONFIG_START(galaxy_state::galaxy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL / 2) MCFG_CPU_PROGRAM_MAP(galaxy_mem) @@ -214,7 +214,7 @@ static MACHINE_CONFIG_START( galaxy ) MCFG_RAM_EXTRA_OPTIONS("2K,22K,38K,54K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( galaxyp ) +MACHINE_CONFIG_START(galaxy_state::galaxyp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL / 2) MCFG_CPU_PROGRAM_MAP(galaxyp_mem) diff --git a/src/mame/drivers/galeb.cpp b/src/mame/drivers/galeb.cpp index 4c5d2350640..5712dfa87ba 100644 --- a/src/mame/drivers/galeb.cpp +++ b/src/mame/drivers/galeb.cpp @@ -163,7 +163,7 @@ static INPUT_PORTS_START( galeb ) INPUT_PORTS_END /* Machine driver */ -static MACHINE_CONFIG_START( galeb ) +MACHINE_CONFIG_START(galeb_state::galeb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1000000) MCFG_CPU_PROGRAM_MAP(galeb_mem) diff --git a/src/mame/drivers/galgame.cpp b/src/mame/drivers/galgame.cpp index 8e71c8b0589..21c91b9618f 100644 --- a/src/mame/drivers/galgame.cpp +++ b/src/mame/drivers/galgame.cpp @@ -56,6 +56,7 @@ public: IRQ_CALLBACK_MEMBER(galaxygame_irq_callback); required_device m_maincpu; required_device m_palette; + void galaxygame(machine_config &config); }; /************************************* @@ -318,7 +319,7 @@ void galaxygame_state::machine_reset() m_interrupt = 0; } -static MACHINE_CONFIG_START( galaxygame ) +MACHINE_CONFIG_START(galaxygame_state::galaxygame) MCFG_CPU_ADD("maincpu", T11, 3000000 ) MCFG_CPU_PROGRAM_MAP(galaxygame_map) diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp index 0e4c4dd719c..0dc3c79e3bd 100644 --- a/src/mame/drivers/galgames.cpp +++ b/src/mame/drivers/galgames.cpp @@ -157,7 +157,7 @@ protected: DEFINE_DEVICE_TYPE(GALGAMES_BIOS_CART, galgames_bios_cart_device, "galgames_bios_cart", "Galaxy Games BIOS Cartridge") -MACHINE_CONFIG_MEMBER( galgames_bios_cart_device::device_add_mconfig ) +MACHINE_CONFIG_START(galgames_bios_cart_device::device_add_mconfig) MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom") MACHINE_CONFIG_END @@ -183,7 +183,7 @@ protected: DEFINE_DEVICE_TYPE(GALGAMES_STARPAK2_CART, galgames_starpak2_cart_device, "starpak2_cart", "Galaxy Games StarPak 2 Cartridge") -MACHINE_CONFIG_MEMBER( galgames_starpak2_cart_device::device_add_mconfig ) +MACHINE_CONFIG_START(galgames_starpak2_cart_device::device_add_mconfig) MCFG_CPU_ADD("pic", PIC16C56, XTAL_4MHz) // !! PIC12C508 !! 4MHz internal RC oscillator (selected by the configuration word) MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r)) MCFG_PIC16C5x_WRITE_B_CB(WRITE8(galgames_cart_device, int_pic_data_w)) @@ -214,7 +214,7 @@ protected: DEFINE_DEVICE_TYPE(GALGAMES_STARPAK3_CART, galgames_starpak3_cart_device, "starpak3_cart", "Galaxy Games StarPak 3 Cartridge") -MACHINE_CONFIG_MEMBER( galgames_starpak3_cart_device::device_add_mconfig ) +MACHINE_CONFIG_START(galgames_starpak3_cart_device::device_add_mconfig) MCFG_CPU_ADD("pic", PIC16C56, XTAL_4MHz) MCFG_PIC16C5x_WRITE_A_CB(WRITE8(galgames_cart_device, int_pic_bank_w)) MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r)) @@ -748,6 +748,10 @@ public: DECLARE_READ16_MEMBER(fpga_status_r); DECLARE_WRITE16_MEMBER(outputs_w); + void galgames_base(machine_config &config); + void galgbios(machine_config &config); + void galgame2(machine_config &config); + void galgame3(machine_config &config); protected: required_device m_maincpu; required_device m_screen; @@ -967,7 +971,7 @@ int galgames_compute_addr(uint16_t reg_low, uint16_t reg_mid, uint16_t reg_high) return reg_low | (reg_mid << 16); } -static MACHINE_CONFIG_START( galgames_base ) +MACHINE_CONFIG_START(galgames_state::galgames_base) MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) MCFG_CPU_PROGRAM_MAP(galgames_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galgames_state, scanline_interrupt, "screen", 0, 1) @@ -999,21 +1003,21 @@ static MACHINE_CONFIG_START( galgames_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( galgbios, galgames_base ) +MACHINE_CONFIG_DERIVED(galgames_state::galgbios, galgames_base) MCFG_GALGAMES_EMPTY_CART_ADD("cart1", 1) MCFG_GALGAMES_EMPTY_CART_ADD("cart2", 2) MCFG_GALGAMES_EMPTY_CART_ADD("cart3", 3) MCFG_GALGAMES_EMPTY_CART_ADD("cart4", 4) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( galgame2, galgames_base ) +MACHINE_CONFIG_DERIVED(galgames_state::galgame2, galgames_base) MCFG_GALGAMES_STARPAK2_CART_ADD("cart1", 1) MCFG_GALGAMES_EMPTY_CART_ADD("cart2", 2) MCFG_GALGAMES_EMPTY_CART_ADD("cart3", 3) MCFG_GALGAMES_EMPTY_CART_ADD("cart4", 4) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( galgame3, galgames_base ) +MACHINE_CONFIG_DERIVED(galgames_state::galgame3, galgames_base) MCFG_GALGAMES_STARPAK3_CART_ADD("cart1", 1) MCFG_GALGAMES_EMPTY_CART_ADD("cart2", 2) MCFG_GALGAMES_EMPTY_CART_ADD("cart3", 3) diff --git a/src/mame/drivers/galivan.cpp b/src/mame/drivers/galivan.cpp index 0a9ce0d9447..fed4b77b427 100644 --- a/src/mame/drivers/galivan.cpp +++ b/src/mame/drivers/galivan.cpp @@ -418,7 +418,7 @@ MACHINE_RESET_MEMBER(galivan_state,ninjemak) m_ninjemak_dispdisable = 0; } -static MACHINE_CONFIG_START( galivan ) +MACHINE_CONFIG_START(galivan_state::galivan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz? */ @@ -468,7 +468,7 @@ static MACHINE_CONFIG_START( galivan ) MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ninjemak ) +MACHINE_CONFIG_START(galivan_state::ninjemak) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz? */ @@ -521,7 +521,7 @@ static MACHINE_CONFIG_START( ninjemak ) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(youmab, ninjemak) +MACHINE_CONFIG_DERIVED(galivan_state::youmab, ninjemak) MCFG_DEVICE_REMOVE("nb1414m4") MACHINE_CONFIG_END diff --git a/src/mame/drivers/galpani2.cpp b/src/mame/drivers/galpani2.cpp index 0caf5eb790f..cf4cf1803ed 100644 --- a/src/mame/drivers/galpani2.cpp +++ b/src/mame/drivers/galpani2.cpp @@ -619,7 +619,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(galpani2_state::galpani2_interrupt2) m_subcpu->set_input_line(3, HOLD_LINE); } -static MACHINE_CONFIG_START( galpani2 ) +MACHINE_CONFIG_START(galpani2_state::galpani2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_27MHz/2) /* Confirmed on galpani2i PCB */ diff --git a/src/mame/drivers/galpani3.cpp b/src/mame/drivers/galpani3.cpp index fc60db1d9e3..5593a207201 100644 --- a/src/mame/drivers/galpani3.cpp +++ b/src/mame/drivers/galpani3.cpp @@ -123,6 +123,7 @@ public: uint32_t screen_update_galpani3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(galpani3_vblank); int gp3_is_alpha_pen(int pen); + void galpani3(machine_config &config); }; @@ -502,7 +503,7 @@ static ADDRESS_MAP_START( galpani3_map, AS_PROGRAM, 16, galpani3_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( galpani3 ) +MACHINE_CONFIG_START(galpani3_state::galpani3) MCFG_CPU_ADD("maincpu", M68000, XTAL_28_63636MHz/2) // Confirmed from PCB MCFG_CPU_PROGRAM_MAP(galpani3_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galpani3_state, galpani3_vblank, "screen", 0, 1) diff --git a/src/mame/drivers/galpanic.cpp b/src/mame/drivers/galpanic.cpp index fe40c58fc03..8e4c3b9baa2 100644 --- a/src/mame/drivers/galpanic.cpp +++ b/src/mame/drivers/galpanic.cpp @@ -229,7 +229,7 @@ static GFXDECODE_START( galpanic ) GFXDECODE_END -static MACHINE_CONFIG_START( galpanic ) +MACHINE_CONFIG_START(galpanic_state::galpanic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */ @@ -266,7 +266,7 @@ static MACHINE_CONFIG_START( galpanic ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( galpanica, galpanic ) +MACHINE_CONFIG_DERIVED(galpanic_state::galpanica, galpanic) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(galpanica_map) diff --git a/src/mame/drivers/galspnbl.cpp b/src/mame/drivers/galspnbl.cpp index cedc5820fe4..84a6768b003 100644 --- a/src/mame/drivers/galspnbl.cpp +++ b/src/mame/drivers/galspnbl.cpp @@ -212,7 +212,7 @@ void galspnbl_state::machine_start() { } -static MACHINE_CONFIG_START( galspnbl ) +MACHINE_CONFIG_START(galspnbl_state::galspnbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* 12 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */ diff --git a/src/mame/drivers/gamate.cpp b/src/mame/drivers/gamate.cpp index 6aad71d332c..daebfed3840 100644 --- a/src/mame/drivers/gamate.cpp +++ b/src/mame/drivers/gamate.cpp @@ -51,6 +51,7 @@ public: TIMER_CALLBACK_MEMBER(gamate_timer); TIMER_CALLBACK_MEMBER(gamate_timer2); + void gamate(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -175,7 +176,7 @@ TIMER_CALLBACK_MEMBER(gamate_state::gamate_timer2) timer2->reset(m_maincpu->cycles_to_attotime(32768/2)); } -static MACHINE_CONFIG_START( gamate ) +MACHINE_CONFIG_START(gamate_state::gamate) MCFG_CPU_ADD("maincpu", M6502, 4433000/2) // NCR 65CX02 MCFG_CPU_PROGRAM_MAP(gamate_mem) diff --git a/src/mame/drivers/gambl186.cpp b/src/mame/drivers/gambl186.cpp index 0334298b544..6076a6a8a6a 100644 --- a/src/mame/drivers/gambl186.cpp +++ b/src/mame/drivers/gambl186.cpp @@ -79,6 +79,7 @@ public: DECLARE_WRITE16_MEMBER(comms_w); DECLARE_WRITE16_MEMBER(data_bank_w); DECLARE_WRITE16_MEMBER(upd_w); + void gambl186(machine_config &config); }; void gambl186_state::machine_start() @@ -465,14 +466,19 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( gambl186 ) +MACHINE_CONFIG_START(gambl186_state::gambl186) MCFG_CPU_ADD("maincpu", I80186, XTAL_40MHz) MCFG_CPU_PROGRAM_MAP(gambl186_map) MCFG_CPU_IO_MAP(gambl186_io) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_FRAGMENT_ADD( pcvideo_cirrus_gd5428 ) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update) + + MCFG_PALETTE_ADD("palette", 0x100) + MCFG_DEVICE_ADD("vga", CIRRUS_GD5428, 0) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gamecom.cpp b/src/mame/drivers/gamecom.cpp index 5a3763bfbca..5542e53683c 100644 --- a/src/mame/drivers/gamecom.cpp +++ b/src/mame/drivers/gamecom.cpp @@ -247,7 +247,7 @@ INTERRUPT_GEN_MEMBER(gamecom_state::gamecom_interrupt) m_maincpu->set_input_line(sm8500_cpu_device::LCDC_INT, ASSERT_LINE ); } -static MACHINE_CONFIG_START( gamecom ) +MACHINE_CONFIG_START(gamecom_state::gamecom) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", SM8500, XTAL_11_0592MHz/2 ) /* actually it's an sm8521 microcontroller containing an sm8500 cpu */ MCFG_CPU_PROGRAM_MAP( gamecom_mem_map) diff --git a/src/mame/drivers/gamecstl.cpp b/src/mame/drivers/gamecstl.cpp index c0a335ddb20..52d2b715ff6 100644 --- a/src/mame/drivers/gamecstl.cpp +++ b/src/mame/drivers/gamecstl.cpp @@ -99,6 +99,7 @@ public: uint32_t screen_update_gamecstl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_char(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx, int ch, int att, int x, int y); void intel82439tx_init(); + void gamecstl(machine_config &config); }; @@ -428,7 +429,7 @@ void gamecstl_state::machine_reset() membank("bank1")->set_base(memregion("bios")->base() + 0x30000); } -static MACHINE_CONFIG_START( gamecstl ) +MACHINE_CONFIG_START(gamecstl_state::gamecstl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM3, 200000000) MCFG_CPU_PROGRAM_MAP(gamecstl_map) diff --git a/src/mame/drivers/gamecube.cpp b/src/mame/drivers/gamecube.cpp index f43ea095476..187f95f7d0c 100644 --- a/src/mame/drivers/gamecube.cpp +++ b/src/mame/drivers/gamecube.cpp @@ -25,6 +25,7 @@ public: m_cpu(*this, "maincpu") { } + void gc(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -139,7 +140,7 @@ void gamecube_state::machine_reset() // MACHINE DEFINITIONS //************************************************************************** -static MACHINE_CONFIG_START( gc ) +MACHINE_CONFIG_START(gamecube_state::gc) MCFG_CPU_ADD("maincpu", PPC603, 485000000 / 100) // 485 MHz IBM "Gekko" (750CXe/750FX based) MCFG_CPU_PROGRAM_MAP(ppc_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/gameking.cpp b/src/mame/drivers/gameking.cpp index 3ea039eaa36..81b72b609d7 100644 --- a/src/mame/drivers/gameking.cpp +++ b/src/mame/drivers/gameking.cpp @@ -69,6 +69,9 @@ public: uint8_t bank8000_cart; //34 bit 7; bits 0,1,.. a15,a16,.. uint8_t res2[0x4c]; }; + void gameking(machine_config &config); + void gameking3(machine_config &config); + void gameking1(machine_config &config); protected: required_device m_maincpu; required_device m_cart; @@ -276,7 +279,7 @@ INTERRUPT_GEN_MEMBER(gameking_state::gameking_frame_int) // guess to get over bi } -static MACHINE_CONFIG_START( gameking ) +MACHINE_CONFIG_START(gameking_state::gameking) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R65C02, 6000000) MCFG_CPU_PROGRAM_MAP(gameking_mem) @@ -299,11 +302,11 @@ static MACHINE_CONFIG_START( gameking ) MCFG_GENERIC_LOAD(gameking_state, gameking_cart) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gameking1, gameking ) +MACHINE_CONFIG_DERIVED(gameking_state::gameking1, gameking) MCFG_SOFTWARE_LIST_ADD("cart_list", "gameking") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gameking3, gameking ) +MACHINE_CONFIG_DERIVED(gameking_state::gameking3, gameking) MCFG_SOFTWARE_LIST_ADD("cart_list", "gameking") MCFG_SOFTWARE_LIST_ADD("cart_list_3", "gameking3") MACHINE_CONFIG_END diff --git a/src/mame/drivers/gameplan.cpp b/src/mame/drivers/gameplan.cpp index 4cf8aabac2a..58d41bd3b43 100644 --- a/src/mame/drivers/gameplan.cpp +++ b/src/mame/drivers/gameplan.cpp @@ -956,7 +956,7 @@ MACHINE_RESET_MEMBER(gameplan_state,gameplan) m_video_data = 0; } -static MACHINE_CONFIG_START( gameplan ) +MACHINE_CONFIG_START(gameplan_state::gameplan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, GAMEPLAN_MAIN_CPU_CLOCK) @@ -1005,7 +1005,7 @@ static MACHINE_CONFIG_START( gameplan ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( leprechn, gameplan ) +MACHINE_CONFIG_DERIVED(gameplan_state::leprechn, gameplan) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(LEPRECHAUN_MAIN_CPU_CLOCK) diff --git a/src/mame/drivers/gamepock.cpp b/src/mame/drivers/gamepock.cpp index 2db060cf319..0f8428aafe4 100644 --- a/src/mame/drivers/gamepock.cpp +++ b/src/mame/drivers/gamepock.cpp @@ -41,7 +41,7 @@ static INPUT_PORTS_START( gamepock ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gamepock ) +MACHINE_CONFIG_START(gamepock_state::gamepock) MCFG_CPU_ADD("maincpu", UPD78C06, XTAL_6MHz) /* uPD78C06AG */ MCFG_CPU_PROGRAM_MAP( gamepock_mem) MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(gamepock_state, port_a_w)) diff --git a/src/mame/drivers/gammagic.cpp b/src/mame/drivers/gammagic.cpp index 0bb6a173b03..02e20d25178 100644 --- a/src/mame/drivers/gammagic.cpp +++ b/src/mame/drivers/gammagic.cpp @@ -45,6 +45,7 @@ public: : pcat_base_state(mconfig, type, tag) { } virtual void machine_start() override; + void gammagic(machine_config &config); }; // Memory is mostly handled by the chipset @@ -122,7 +123,7 @@ void gammagic_state::machine_start() { } -static MACHINE_CONFIG_START( gammagic ) +MACHINE_CONFIG_START(gammagic_state::gammagic) MCFG_CPU_ADD("maincpu", PENTIUM, 133000000) // Intel Pentium 133 MCFG_CPU_PROGRAM_MAP(gammagic_map) MCFG_CPU_IO_MAP(gammagic_io) diff --git a/src/mame/drivers/gamtor.cpp b/src/mame/drivers/gamtor.cpp index 9c0b05891c4..d8aab9ce691 100644 --- a/src/mame/drivers/gamtor.cpp +++ b/src/mame/drivers/gamtor.cpp @@ -43,6 +43,7 @@ public: DECLARE_WRITE32_MEMBER(gamtor_unk_w); DECLARE_DRIVER_INIT(gaminator); required_device m_maincpu; + void gaminator(machine_config &config); }; WRITE32_MEMBER(gaminator_state::gamtor_unk_w) @@ -77,13 +78,18 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( gaminator ) +MACHINE_CONFIG_START(gaminator_state::gaminator) MCFG_CPU_ADD("maincpu", MCF5206E, 40000000) /* definitely Coldfire, model / clock uncertain */ MCFG_CPU_PROGRAM_MAP(gaminator_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", gaminator_state, irq6_line_hold) // irq6 seems to be needed to get past the ROM checking MCFG_MCF5206E_PERIPHERAL_ADD("maincpu_onboard") - MCFG_FRAGMENT_ADD( pcvideo_gamtor_vga ) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_UPDATE_DEVICE("vga", gamtor_vga_device, screen_update) + + MCFG_PALETTE_ADD("palette", 0x100) + MCFG_DEVICE_ADD("vga", GAMTOR_VGA, 0) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* unknown sound */ diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp index 11be3b01a98..a8b3978601d 100644 --- a/src/mame/drivers/gaplus.cpp +++ b/src/mame/drivers/gaplus.cpp @@ -512,7 +512,7 @@ void gaplus_state::machine_start() } -static MACHINE_CONFIG_START( gaplus ) +MACHINE_CONFIG_START(gaplus_state::gaplus) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_24_576MHz/16) /* 1.536 MHz */ @@ -581,7 +581,7 @@ static MACHINE_CONFIG_START( gaplus ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gaplusd, gaplus ) +MACHINE_CONFIG_DERIVED(gaplus_state::gaplusd, gaplus) MCFG_DEVICE_REPLACE("namcoio_1", NAMCO_58XX, 0) MCFG_NAMCO58XX_IN_0_CB(IOPORT("COINS")) @@ -596,7 +596,7 @@ static MACHINE_CONFIG_DERIVED( gaplusd, gaplus ) MCFG_NAMCO56XX_IN_3_CB(IOPORT("DSWA_LOW")) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gapluso, gaplusd ) +MACHINE_CONFIG_DERIVED(gaplus_state::gapluso, gaplusd) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/gatron.cpp b/src/mame/drivers/gatron.cpp index 659dda32ff0..5779c889e76 100644 --- a/src/mame/drivers/gatron.cpp +++ b/src/mame/drivers/gatron.cpp @@ -563,7 +563,7 @@ GFXDECODE_END * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( gat ) +MACHINE_CONFIG_START(gatron_state::gat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/24) /* 666.66 kHz, guess */ diff --git a/src/mame/drivers/gauntlet.cpp b/src/mame/drivers/gauntlet.cpp index 8870b348d28..b8cc42b03d5 100644 --- a/src/mame/drivers/gauntlet.cpp +++ b/src/mame/drivers/gauntlet.cpp @@ -486,7 +486,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( gauntlet_base ) +MACHINE_CONFIG_START(gauntlet_state::gauntlet_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2) @@ -551,22 +551,22 @@ static MACHINE_CONFIG_START( gauntlet_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gauntlet, gauntlet_base ) +MACHINE_CONFIG_DERIVED(gauntlet_state::gauntlet, gauntlet_base) MCFG_SLAPSTIC_ADD("slapstic", 104) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gaunt2p, gauntlet_base ) +MACHINE_CONFIG_DERIVED(gauntlet_state::gaunt2p, gauntlet_base) MCFG_SLAPSTIC_ADD("slapstic", 107) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gauntlet2, gauntlet_base ) +MACHINE_CONFIG_DERIVED(gauntlet_state::gauntlet2, gauntlet_base) MCFG_SLAPSTIC_ADD("slapstic", 106) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vindctr2, gauntlet_base ) +MACHINE_CONFIG_DERIVED(gauntlet_state::vindctr2, gauntlet_base) MCFG_SLAPSTIC_ADD("slapstic", 118) MACHINE_CONFIG_END diff --git a/src/mame/drivers/gb.cpp b/src/mame/drivers/gb.cpp index 7b4f8e9c9c8..f4fef62b62c 100644 --- a/src/mame/drivers/gb.cpp +++ b/src/mame/drivers/gb.cpp @@ -604,7 +604,7 @@ PALETTE_INIT_MEMBER(megaduck_state, megaduck) } -static MACHINE_CONFIG_START( gameboy ) +MACHINE_CONFIG_START(gb_state::gameboy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", LR35902, XTAL_4_194304Mhz) @@ -644,7 +644,7 @@ static MACHINE_CONFIG_START( gameboy ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( supergb ) +MACHINE_CONFIG_START(gb_state::supergb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", LR35902, 4295454) /* 4.295454 MHz, derived from SNES xtal */ MCFG_CPU_PROGRAM_MAP(sgb_map) @@ -685,7 +685,7 @@ static MACHINE_CONFIG_START( supergb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( supergb2, gameboy ) +MACHINE_CONFIG_DERIVED(gb_state::supergb2, gameboy) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sgb_map) @@ -709,7 +709,7 @@ static MACHINE_CONFIG_DERIVED( supergb2, gameboy ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gbpocket, gameboy ) +MACHINE_CONFIG_DERIVED(gb_state::gbpocket, gameboy) /* video hardware */ MCFG_PALETTE_MODIFY("palette") @@ -719,7 +719,7 @@ static MACHINE_CONFIG_DERIVED( gbpocket, gameboy ) MCFG_MGB_PPU_ADD("ppu", "maincpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gbcolor ) +MACHINE_CONFIG_START(gb_state::gbcolor) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", LR35902, XTAL_4_194304Mhz) // todo XTAL_8_388MHz @@ -765,7 +765,7 @@ static MACHINE_CONFIG_START( gbcolor ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("gb_list","gameboy") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( megaduck ) +MACHINE_CONFIG_START(megaduck_state::megaduck) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", LR35902, XTAL_4_194304Mhz) /* 4.194304 MHz */ diff --git a/src/mame/drivers/gba.cpp b/src/mame/drivers/gba.cpp index c257febd8e0..ce33b878bc5 100644 --- a/src/mame/drivers/gba.cpp +++ b/src/mame/drivers/gba.cpp @@ -1428,7 +1428,7 @@ static SLOT_INTERFACE_START(gba_cart) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( gbadv ) +MACHINE_CONFIG_START(gba_state::gbadv) MCFG_CPU_ADD("maincpu", ARM7, XTAL_16_777216MHz) MCFG_CPU_PROGRAM_MAP(gba_map) diff --git a/src/mame/drivers/gberet.cpp b/src/mame/drivers/gberet.cpp index cf6b5edf565..d047d931ec0 100644 --- a/src/mame/drivers/gberet.cpp +++ b/src/mame/drivers/gberet.cpp @@ -405,7 +405,7 @@ MACHINE_RESET_MEMBER(gberet_state,gberet) m_spritebank = 0; } -static MACHINE_CONFIG_START( gberet ) +MACHINE_CONFIG_START(gberet_state::gberet) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) // X1S (generated by a custom IC) @@ -438,14 +438,14 @@ static MACHINE_CONFIG_START( gberet ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mrgoemon, gberet ) +MACHINE_CONFIG_DERIVED(gberet_state::mrgoemon, gberet) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mrgoemon_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gberetb ) +MACHINE_CONFIG_START(gberet_state::gberetb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz/4) // divider guessed diff --git a/src/mame/drivers/gcpinbal.cpp b/src/mame/drivers/gcpinbal.cpp index 18955d6f38e..a20bac9ead2 100644 --- a/src/mame/drivers/gcpinbal.cpp +++ b/src/mame/drivers/gcpinbal.cpp @@ -449,7 +449,7 @@ void gcpinbal_state::machine_reset() m_msm_bank = 0; } -static MACHINE_CONFIG_START( gcpinbal ) +MACHINE_CONFIG_START(gcpinbal_state::gcpinbal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16 MHz */ diff --git a/src/mame/drivers/gei.cpp b/src/mame/drivers/gei.cpp index 504967604c4..6334fae3d30 100644 --- a/src/mame/drivers/gei.cpp +++ b/src/mame/drivers/gei.cpp @@ -118,6 +118,16 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); + void findout(machine_config &config); + void suprpokr(machine_config &config); + void gselect(machine_config &config); + void amuse1(machine_config &config); + void gepoker(machine_config &config); + void jokpokera(machine_config &config); + void quizvid(machine_config &config); + void getrivia(machine_config &config); + void amuse(machine_config &config); + void sprtauth(machine_config &config); protected: virtual void video_start() override; @@ -942,7 +952,7 @@ INTERRUPT_GEN_MEMBER(gei_state::vblank_irq) } -static MACHINE_CONFIG_START( getrivia ) +MACHINE_CONFIG_START(gei_state::getrivia) MCFG_CPU_ADD("maincpu",Z80,4000000) /* 4 MHz */ MCFG_CPU_PROGRAM_MAP(getrivia_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", gei_state, vblank_irq) @@ -979,7 +989,7 @@ static MACHINE_CONFIG_START( getrivia ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( findout, getrivia ) +MACHINE_CONFIG_DERIVED(gei_state::findout, getrivia) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(findout_map) @@ -991,7 +1001,7 @@ static MACHINE_CONFIG_DERIVED( findout, getrivia ) MCFG_I8255_IN_PORTC_CB(READ8(gei_state, portC_r)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quizvid, findout ) +MACHINE_CONFIG_DERIVED(gei_state::quizvid, findout) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(quizvid_map) @@ -1000,7 +1010,7 @@ static MACHINE_CONFIG_DERIVED( quizvid, findout ) MCFG_PALETTE_ADD_3BIT_GRB("palette") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gselect, getrivia ) +MACHINE_CONFIG_DERIVED(gei_state::gselect, getrivia) /* basic machine hardware */ @@ -1024,7 +1034,7 @@ static MACHINE_CONFIG_DERIVED( gselect, getrivia ) MCFG_I8255_OUT_PORTC_CB(WRITE8(gei_state, nmi_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jokpokera, getrivia ) +MACHINE_CONFIG_DERIVED(gei_state::jokpokera, getrivia) /* basic machine hardware */ @@ -1034,7 +1044,7 @@ static MACHINE_CONFIG_DERIVED( jokpokera, getrivia ) MCFG_CPU_PROGRAM_MAP(gselect_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( amuse, getrivia ) +MACHINE_CONFIG_DERIVED(gei_state::amuse, getrivia) /* basic machine hardware */ @@ -1042,7 +1052,7 @@ static MACHINE_CONFIG_DERIVED( amuse, getrivia ) MCFG_CPU_PROGRAM_MAP(amuse_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gepoker, getrivia ) +MACHINE_CONFIG_DERIVED(gei_state::gepoker, getrivia) /* basic machine hardware */ @@ -1050,19 +1060,19 @@ static MACHINE_CONFIG_DERIVED( gepoker, getrivia ) MCFG_CPU_PROGRAM_MAP(gepoker_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( amuse1, getrivia ) +MACHINE_CONFIG_DERIVED(gei_state::amuse1, getrivia) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(amuse1_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( suprpokr, getrivia ) +MACHINE_CONFIG_DERIVED(gei_state::suprpokr, getrivia) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(suprpokr_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sprtauth, getrivia ) +MACHINE_CONFIG_DERIVED(gei_state::sprtauth, getrivia) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sprtauth_map) diff --git a/src/mame/drivers/geneve.cpp b/src/mame/drivers/geneve.cpp index c3eb3314778..d31e63c2518 100644 --- a/src/mame/drivers/geneve.cpp +++ b/src/mame/drivers/geneve.cpp @@ -285,6 +285,7 @@ public: int m_ready_line; int m_ready_line1; + void geneve_60hz(machine_config &config); }; /* @@ -688,7 +689,7 @@ void geneve_state::machine_reset() m_joyport->write_port(0x01); // select Joystick 1 } -static MACHINE_CONFIG_START( geneve_60hz ) +MACHINE_CONFIG_START(geneve_state::geneve_60hz) // basic machine hardware // TMS9995 CPU @ 12.0 MHz MCFG_TMS99xx_ADD("maincpu", TMS9995, 12000000, memmap, crumap) diff --git a/src/mame/drivers/geniusiq.cpp b/src/mame/drivers/geniusiq.cpp index 934e12f6957..6d0f7f1030d 100644 --- a/src/mame/drivers/geniusiq.cpp +++ b/src/mame/drivers/geniusiq.cpp @@ -292,6 +292,8 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER( iq128_cart ); DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( iq128_cart ); + void iqtv512(machine_config &config); + void iq128(machine_config &config); private: uint16_t m_gfx_y; uint16_t m_gfx_x; @@ -321,6 +323,7 @@ public: required_device m_maincpu; virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void gl8008cx(machine_config &config); }; PALETTE_INIT_MEMBER(geniusiq_state, geniusiq) @@ -792,7 +795,7 @@ DEVICE_IMAGE_UNLOAD_MEMBER(geniusiq_state,iq128_cart) } -static MACHINE_CONFIG_START( iq128 ) +MACHINE_CONFIG_START(geniusiq_state::iq128) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // The main crystal is at 32MHz, not sure whats the CPU freq MCFG_CPU_PROGRAM_MAP(geniusiq_mem) @@ -822,13 +825,13 @@ static MACHINE_CONFIG_START( iq128 ) MCFG_SOFTWARE_LIST_ADD("cart_list", "iq128") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( iqtv512, iq128 ) +MACHINE_CONFIG_DERIVED(geniusiq_state::iqtv512, iq128) /* internal flash */ MCFG_DEVICE_REMOVE("flash") MCFG_AMD_29F040_ADD("flash") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gl8008cx ) +MACHINE_CONFIG_START(gl8008cx_state::gl8008cx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // TODO wrong CPU and frequency MCFG_CPU_PROGRAM_MAP(gl8008cx_mem) diff --git a/src/mame/drivers/genpc.cpp b/src/mame/drivers/genpc.cpp index 5d3ac1b84e2..03eea248e8b 100644 --- a/src/mame/drivers/genpc.cpp +++ b/src/mame/drivers/genpc.cpp @@ -23,6 +23,11 @@ public: m_maincpu(*this, "maincpu") { } required_device m_maincpu; + void pcega(machine_config &config); + void pcvga(machine_config &config); + void pccga(machine_config &config); + void pcherc(machine_config &config); + void pcmda(machine_config &config); }; static ADDRESS_MAP_START( pc8_map, AS_PROGRAM, 8, genpc_state ) @@ -43,7 +48,7 @@ static DEVICE_INPUT_DEFAULTS_START(vga) DEVICE_INPUT_DEFAULTS("DSW0",0x30, 0x00) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( pcmda ) +MACHINE_CONFIG_START(genpc_state::pcmda) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, 4772720) MCFG_CPU_PROGRAM_MAP(pc8_map) @@ -72,13 +77,13 @@ static MACHINE_CONFIG_START( pcmda ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pcherc, pcmda ) +MACHINE_CONFIG_DERIVED(genpc_state::pcherc, pcmda) MCFG_DEVICE_MODIFY("isa1") MCFG_DEVICE_SLOT_INTERFACE(pc_isa8_cards, "hercules", false) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pccga, pcmda ) +MACHINE_CONFIG_DERIVED(genpc_state::pccga, pcmda) MCFG_DEVICE_MODIFY("mb") MCFG_DEVICE_INPUT_DEFAULTS(cga) MCFG_DEVICE_MODIFY("isa1") @@ -86,7 +91,7 @@ static MACHINE_CONFIG_DERIVED( pccga, pcmda ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pcega, pccga ) +MACHINE_CONFIG_DERIVED(genpc_state::pcega, pccga) MCFG_DEVICE_MODIFY("isa1") MCFG_DEVICE_SLOT_INTERFACE(pc_isa8_cards, "ega", false) MCFG_DEVICE_MODIFY("mb") @@ -94,7 +99,7 @@ static MACHINE_CONFIG_DERIVED( pcega, pccga ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pcvga, pcega ) +MACHINE_CONFIG_DERIVED(genpc_state::pcvga, pcega) MCFG_DEVICE_MODIFY("isa1") MCFG_DEVICE_SLOT_INTERFACE(pc_isa8_cards, "vga", false) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ggconnie.cpp b/src/mame/drivers/ggconnie.cpp index 67e7d24d83a..97e6add7e0b 100644 --- a/src/mame/drivers/ggconnie.cpp +++ b/src/mame/drivers/ggconnie.cpp @@ -46,6 +46,7 @@ public: DECLARE_WRITE8_MEMBER(lamp_w); DECLARE_WRITE8_MEMBER(output_w); DECLARE_WRITE8_MEMBER(oki_bank_w); + void ggconnie(machine_config &config); }; WRITE8_MEMBER(ggconnie_state::lamp_w) @@ -178,7 +179,7 @@ static INPUT_PORTS_START(ggconnie) PORT_DIPSETTING(0x00, DEF_STR(On) ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ggconnie ) +MACHINE_CONFIG_START(ggconnie_state::ggconnie) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3) MCFG_CPU_PROGRAM_MAP(sgx_mem) diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp index 841bf26ff73..b2e6b473c4b 100644 --- a/src/mame/drivers/ghosteo.cpp +++ b/src/mame/drivers/ghosteo.cpp @@ -132,6 +132,9 @@ public: DECLARE_WRITE_LINE_MEMBER(s3c2410_i2c_scl_w ); DECLARE_READ_LINE_MEMBER(s3c2410_i2c_sda_r ); DECLARE_WRITE_LINE_MEMBER(s3c2410_i2c_sda_w ); + void ghosteo(machine_config &config); + void touryuu(machine_config &config); + void bballoon(machine_config &config); }; @@ -611,7 +614,7 @@ void ghosteo_state::machine_reset() m_maincpu->space(AS_PROGRAM).install_read_handler(0x4d000010, 0x4d000013,read32_delegate(FUNC(ghosteo_state::bballoon_speedup_r), this)); } -static MACHINE_CONFIG_START( ghosteo ) +MACHINE_CONFIG_START(ghosteo_state::ghosteo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM9, 200000000) @@ -660,14 +663,14 @@ static MACHINE_CONFIG_START( ghosteo ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bballoon, ghosteo ) +MACHINE_CONFIG_DERIVED(ghosteo_state::bballoon, ghosteo) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bballoon_map) MCFG_I2CMEM_ADD("i2cmem") MCFG_I2CMEM_DATA_SIZE(256) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( touryuu, ghosteo ) +MACHINE_CONFIG_DERIVED(ghosteo_state::touryuu, ghosteo) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(touryuu_map) MCFG_I2CMEM_ADD("i2cmem") diff --git a/src/mame/drivers/giclassic.cpp b/src/mame/drivers/giclassic.cpp index 137c7eb5f01..912b88e6856 100644 --- a/src/mame/drivers/giclassic.cpp +++ b/src/mame/drivers/giclassic.cpp @@ -80,6 +80,7 @@ public: DECLARE_WRITE16_MEMBER(control_w); DECLARE_READ16_MEMBER(vrom_r); + void giclassic(machine_config &config); private: uint8_t m_control; }; @@ -196,6 +197,7 @@ public: DECLARE_WRITE16_MEMBER(control_w); DECLARE_READ16_MEMBER(control_r); + void giclassvr(machine_config &config); private: uint16 m_control; }; @@ -288,7 +290,7 @@ void giclassicsvr_state::machine_reset() { } -static MACHINE_CONFIG_START( giclassic ) +MACHINE_CONFIG_START(giclassic_state::giclassic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2) // PCB is marked "68000 12 MHz", but only visible osc is 20 MHz @@ -314,7 +316,7 @@ static MACHINE_CONFIG_START( giclassic ) MCFG_K056832_PALETTE("palette") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( giclassvr ) +MACHINE_CONFIG_START(giclassicsvr_state::giclassvr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // unknown speed diff --git a/src/mame/drivers/gijoe.cpp b/src/mame/drivers/gijoe.cpp index 4868d8595e3..44773313ed5 100644 --- a/src/mame/drivers/gijoe.cpp +++ b/src/mame/drivers/gijoe.cpp @@ -289,7 +289,7 @@ void gijoe_state::machine_reset() m_cur_control2 = 0; } -static MACHINE_CONFIG_START( gijoe ) +MACHINE_CONFIG_START(gijoe_state::gijoe) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz Confirmed */ diff --git a/src/mame/drivers/gimix.cpp b/src/mame/drivers/gimix.cpp index be06ff87ecb..7dfe05b2300 100644 --- a/src/mame/drivers/gimix.cpp +++ b/src/mame/drivers/gimix.cpp @@ -115,6 +115,7 @@ public: DECLARE_FLOPPY_FORMATS(floppy_formats); + void gimix(machine_config &config); private: uint8_t m_term_data; uint8_t m_dma_status; @@ -543,7 +544,7 @@ MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE) \ MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(8) \ MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000) -static MACHINE_CONFIG_START( gimix ) +MACHINE_CONFIG_START(gimix_state::gimix) // basic machine hardware MCFG_CPU_ADD("maincpu", MC6809, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(gimix_mem) diff --git a/src/mame/drivers/ginganin.cpp b/src/mame/drivers/ginganin.cpp index ec5da8ce425..81526b7a1ed 100644 --- a/src/mame/drivers/ginganin.cpp +++ b/src/mame/drivers/ginganin.cpp @@ -243,7 +243,7 @@ WRITE_LINE_MEMBER(ginganin_state::ptm_irq) } -static MACHINE_CONFIG_START( ginganin ) +MACHINE_CONFIG_START(ginganin_state::ginganin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MAIN_CLOCK) diff --git a/src/mame/drivers/gizmondo.cpp b/src/mame/drivers/gizmondo.cpp index f7a89a55bdc..b61751ea2ca 100644 --- a/src/mame/drivers/gizmondo.cpp +++ b/src/mame/drivers/gizmondo.cpp @@ -66,6 +66,7 @@ public: DECLARE_WRITE32_MEMBER(s3c2440_gpio_port_w); bitmap_rgb32 m_bitmap; + void gizmondo(machine_config &config); }; @@ -183,7 +184,7 @@ DRIVER_INIT_MEMBER(gizmondo_state,gizmondo) // do nothing } -static MACHINE_CONFIG_START( gizmondo ) +MACHINE_CONFIG_START(gizmondo_state::gizmondo) MCFG_CPU_ADD("maincpu", ARM9, 40000000) MCFG_CPU_PROGRAM_MAP(gizmondo_map) diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp index f663092a6bf..192bd9bbc9a 100644 --- a/src/mame/drivers/gkigt.cpp +++ b/src/mame/drivers/gkigt.cpp @@ -122,6 +122,7 @@ public: DECLARE_WRITE32_MEMBER(clut_w); DECLARE_WRITE32_MEMBER(clut_mask_w); + void igt_gameking(machine_config &config); private: int m_offset, m_r, m_g, m_b, m_state; bool m_bToggle; @@ -234,7 +235,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( igt_gameking ) +MACHINE_CONFIG_START(igt_gameking_state::igt_gameking) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I960, XTAL_24MHz) diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index e77bcdd8560..1c5831f88c9 100644 --- a/src/mame/drivers/gladiatr.cpp +++ b/src/mame/drivers/gladiatr.cpp @@ -933,7 +933,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( ppking ) +MACHINE_CONFIG_START(ppking_state::ppking) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */ @@ -998,7 +998,7 @@ static MACHINE_CONFIG_START( ppking ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gladiatr ) +MACHINE_CONFIG_START(gladiatr_state::gladiatr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */ diff --git a/src/mame/drivers/glasgow.cpp b/src/mame/drivers/glasgow.cpp index cb6afa0011f..91c06194d7e 100644 --- a/src/mame/drivers/glasgow.cpp +++ b/src/mame/drivers/glasgow.cpp @@ -88,6 +88,9 @@ public: DECLARE_MACHINE_START(glasgow); DECLARE_MACHINE_RESET(glasgow); + void glasgow(machine_config &config); + void dallas32(machine_config &config); + void amsterd(machine_config &config); private: uint8_t m_lcd_shift_counter; uint8_t m_led7; @@ -705,7 +708,7 @@ static INPUT_PORTS_START( old_keyboard ) //Glasgow,Dallas INPUT_PORTS_END -static MACHINE_CONFIG_START( glasgow ) +MACHINE_CONFIG_START(glasgow_state::glasgow) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) MCFG_CPU_PROGRAM_MAP(glasgow_mem) @@ -722,13 +725,13 @@ static MACHINE_CONFIG_START( glasgow ) MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", glasgow_state, update_nmi, attotime::from_hz(50)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( amsterd, glasgow ) +MACHINE_CONFIG_DERIVED(glasgow_state::amsterd, glasgow) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(amsterd_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dallas32, glasgow ) +MACHINE_CONFIG_DERIVED(glasgow_state::dallas32, glasgow) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", M68020, 14000000) MCFG_CPU_PROGRAM_MAP(dallas32_mem) diff --git a/src/mame/drivers/glass.cpp b/src/mame/drivers/glass.cpp index d390a8a7792..18224860361 100644 --- a/src/mame/drivers/glass.cpp +++ b/src/mame/drivers/glass.cpp @@ -228,7 +228,7 @@ void glass_state::machine_reset() m_blitter_serial_buffer[i] = 0; } -static MACHINE_CONFIG_START( glass ) +MACHINE_CONFIG_START(glass_state::glass) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz verified on PCB */ @@ -263,7 +263,7 @@ static MACHINE_CONFIG_START( glass ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( glass_ds5002fp, glass ) +MACHINE_CONFIG_DERIVED(glass_state::glass_ds5002fp, glass) MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) /* verified on pcb */ MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/globalfr.cpp b/src/mame/drivers/globalfr.cpp index 705f92e48c6..e5a544f962c 100644 --- a/src/mame/drivers/globalfr.cpp +++ b/src/mame/drivers/globalfr.cpp @@ -37,6 +37,7 @@ public: DECLARE_WRITE16_MEMBER(vfd_w); + void globalfr(machine_config &config); }; /******************************************************************************/ @@ -63,7 +64,7 @@ INPUT_PORTS_END /******************************************************************************/ -static MACHINE_CONFIG_START( globalfr ) +MACHINE_CONFIG_START(globalfr_state::globalfr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M37702S1, 4000000) MCFG_CPU_PROGRAM_MAP(globalfr_map) diff --git a/src/mame/drivers/globalvr.cpp b/src/mame/drivers/globalvr.cpp index 1c55a6e3d0c..e7a3d29021b 100644 --- a/src/mame/drivers/globalvr.cpp +++ b/src/mame/drivers/globalvr.cpp @@ -67,6 +67,7 @@ public: m_maincpu(*this, "maincpu") { } + void globalvr(machine_config &config); protected: // devices @@ -84,7 +85,7 @@ static INPUT_PORTS_START( globalvr ) INPUT_PORTS_END -static MACHINE_CONFIG_START( globalvr ) +MACHINE_CONFIG_START(globalvr_state::globalvr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM, 100000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(globalvr_map) diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp index 7f5b644d30f..2d7fd3f42a6 100644 --- a/src/mame/drivers/gluck2.cpp +++ b/src/mame/drivers/gluck2.cpp @@ -229,6 +229,7 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void gluck2(machine_config &config); }; @@ -477,7 +478,7 @@ GFXDECODE_END * Machine Drivers * *********************************************/ -static MACHINE_CONFIG_START( gluck2 ) +MACHINE_CONFIG_START(gluck2_state::gluck2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* guess */ diff --git a/src/mame/drivers/gmaster.cpp b/src/mame/drivers/gmaster.cpp index 23c568525b5..aae7a696a36 100644 --- a/src/mame/drivers/gmaster.cpp +++ b/src/mame/drivers/gmaster.cpp @@ -43,6 +43,7 @@ public: DECLARE_DRIVER_INIT(gmaster) { memset(&m_video, 0, sizeof(m_video)); memset(m_ram, 0, sizeof(m_ram)); } uint32_t screen_update_gmaster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void gmaster(machine_config &config); private: virtual void machine_start() override; @@ -328,7 +329,7 @@ void gmaster_state::machine_start() } -static MACHINE_CONFIG_START( gmaster ) +MACHINE_CONFIG_START(gmaster_state::gmaster) MCFG_CPU_ADD("maincpu", UPD7810, XTAL_12MHz/2/*?*/) // upd78c11 in the unit MCFG_CPU_PROGRAM_MAP(gmaster_mem) MCFG_UPD7810_PORTA_READ_CB(IOPORT("JOY")) diff --git a/src/mame/drivers/gng.cpp b/src/mame/drivers/gng.cpp index 7e8857f68eb..93b81316222 100644 --- a/src/mame/drivers/gng.cpp +++ b/src/mame/drivers/gng.cpp @@ -385,7 +385,7 @@ void gng_state::machine_reset() } } -static MACHINE_CONFIG_START( gng ) +MACHINE_CONFIG_START(gng_state::gng) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_12MHz/2) /* verified on pcb */ @@ -438,7 +438,7 @@ static MACHINE_CONFIG_START( gng ) MCFG_SOUND_ROUTE(3, "mono", 0.20) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( diamond, gng ) +MACHINE_CONFIG_DERIVED(gng_state::diamond, gng) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(diamond_map) diff --git a/src/mame/drivers/go2000.cpp b/src/mame/drivers/go2000.cpp index 2241cd56978..5b3010505f5 100644 --- a/src/mame/drivers/go2000.cpp +++ b/src/mame/drivers/go2000.cpp @@ -72,6 +72,7 @@ public: virtual void machine_start() override; virtual void video_start() override; uint32_t screen_update_go2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void go2000(machine_config &config); }; @@ -333,7 +334,7 @@ void go2000_state::machine_start() } -static MACHINE_CONFIG_START( go2000 ) +MACHINE_CONFIG_START(go2000_state::go2000) MCFG_CPU_ADD("maincpu", M68000, 10000000) MCFG_CPU_PROGRAM_MAP(go2000_map) diff --git a/src/mame/drivers/goal92.cpp b/src/mame/drivers/goal92.cpp index 23df66f4d3a..938ceda314a 100644 --- a/src/mame/drivers/goal92.cpp +++ b/src/mame/drivers/goal92.cpp @@ -294,7 +294,7 @@ void goal92_state::machine_reset() m_adpcm_toggle = 0; } -static MACHINE_CONFIG_START( goal92 ) +MACHINE_CONFIG_START(goal92_state::goal92) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,12000000) diff --git a/src/mame/drivers/goindol.cpp b/src/mame/drivers/goindol.cpp index 1796b2c9e9c..35415bd0089 100644 --- a/src/mame/drivers/goindol.cpp +++ b/src/mame/drivers/goindol.cpp @@ -233,7 +233,7 @@ void goindol_state::machine_reset() m_prot_toggle = 0; } -static MACHINE_CONFIG_START( goindol ) +MACHINE_CONFIG_START(goindol_state::goindol) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* XTAL confirmed, divisor is not */ diff --git a/src/mame/drivers/gokidetor.cpp b/src/mame/drivers/gokidetor.cpp index 3d2ee790640..ac51e256474 100644 --- a/src/mame/drivers/gokidetor.cpp +++ b/src/mame/drivers/gokidetor.cpp @@ -33,6 +33,7 @@ public: DECLARE_WRITE8_MEMBER(out9_w); DECLARE_WRITE8_MEMBER(ym_porta_w); + void gokidetor(machine_config &config); protected: virtual void machine_start() override; @@ -115,7 +116,7 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, gokidetor_state ) ADDRESS_MAP_END -MACHINE_CONFIG_START( gokidetor ) +MACHINE_CONFIG_START(gokidetor_state::gokidetor) MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) // divider not verified MCFG_CPU_PROGRAM_MAP(main_map) // IRQ from ??? diff --git a/src/mame/drivers/goldngam.cpp b/src/mame/drivers/goldngam.cpp index ab1a3f8df24..63041066079 100644 --- a/src/mame/drivers/goldngam.cpp +++ b/src/mame/drivers/goldngam.cpp @@ -255,6 +255,8 @@ public: DECLARE_PALETTE_INIT(goldngam); uint32_t screen_update_goldngam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void swisspkr(machine_config &config); + void moviecrd(machine_config &config); }; @@ -546,7 +548,7 @@ GFXDECODE_END *************************/ -static MACHINE_CONFIG_START( swisspkr ) +MACHINE_CONFIG_START(goldngam_state::swisspkr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK) @@ -575,7 +577,7 @@ static MACHINE_CONFIG_START( swisspkr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( moviecrd, swisspkr ) +MACHINE_CONFIG_DERIVED(goldngam_state::moviecrd, swisspkr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp index ae900522393..b4fc7ddddb9 100644 --- a/src/mame/drivers/goldnpkr.cpp +++ b/src/mame/drivers/goldnpkr.cpp @@ -1353,6 +1353,18 @@ public: DECLARE_MACHINE_RESET(mondial); uint32_t screen_update_goldnpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void goldnpkr_base(machine_config &config); + void wildcard(machine_config &config); + void wildcrdb(machine_config &config); + void witchcrd(machine_config &config); + void mondial(machine_config &config); + void bchancep(machine_config &config); + void wcfalcon(machine_config &config); + void geniea(machine_config &config); + void genie(machine_config &config); + void pottnpkr(machine_config &config); + void goldnpkr(machine_config &config); + void wcrdxtnd(machine_config &config); protected: required_shared_ptr m_videoram; required_shared_ptr m_colorram; @@ -1391,6 +1403,7 @@ public: DECLARE_WRITE8_MEMBER(mcu_command_w); DECLARE_WRITE8_MEMBER(mcu_portb_w); DECLARE_WRITE8_MEMBER(mcu_portc_w); + void megadpkr(machine_config &config); }; @@ -4253,7 +4266,7 @@ MACHINE_RESET_MEMBER(goldnpkr_state, mondial) * Machine Drivers * *********************************************/ -static MACHINE_CONFIG_START( goldnpkr_base ) +MACHINE_CONFIG_START(goldnpkr_state::goldnpkr_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) @@ -4290,7 +4303,7 @@ static MACHINE_CONFIG_START( goldnpkr_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( goldnpkr, goldnpkr_base ) +MACHINE_CONFIG_DERIVED(goldnpkr_state::goldnpkr, goldnpkr_base) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -4300,7 +4313,7 @@ static MACHINE_CONFIG_DERIVED( goldnpkr, goldnpkr_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pottnpkr, goldnpkr_base ) +MACHINE_CONFIG_DERIVED(goldnpkr_state::pottnpkr, goldnpkr_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4318,7 +4331,7 @@ static MACHINE_CONFIG_DERIVED( pottnpkr, goldnpkr_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( witchcrd, goldnpkr_base ) +MACHINE_CONFIG_DERIVED(goldnpkr_state::witchcrd, goldnpkr_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4340,7 +4353,7 @@ static MACHINE_CONFIG_DERIVED( witchcrd, goldnpkr_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wcfalcon, goldnpkr_base ) +MACHINE_CONFIG_DERIVED(goldnpkr_state::wcfalcon, goldnpkr_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4363,7 +4376,7 @@ static MACHINE_CONFIG_DERIVED( wcfalcon, goldnpkr_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wildcard, goldnpkr_base ) +MACHINE_CONFIG_DERIVED(goldnpkr_state::wildcard, goldnpkr_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4387,7 +4400,7 @@ static MACHINE_CONFIG_DERIVED( wildcard, goldnpkr_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wcrdxtnd, goldnpkr_base ) +MACHINE_CONFIG_DERIVED(goldnpkr_state::wcrdxtnd, goldnpkr_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4411,7 +4424,7 @@ static MACHINE_CONFIG_DERIVED( wcrdxtnd, goldnpkr_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wildcrdb, goldnpkr_base ) +MACHINE_CONFIG_DERIVED(goldnpkr_state::wildcrdb, goldnpkr_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4440,7 +4453,7 @@ static MACHINE_CONFIG_DERIVED( wildcrdb, goldnpkr_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( genie, goldnpkr_base ) +MACHINE_CONFIG_DERIVED(goldnpkr_state::genie, goldnpkr_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4462,7 +4475,7 @@ static MACHINE_CONFIG_DERIVED( genie, goldnpkr_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( geniea, goldnpkr_base ) +MACHINE_CONFIG_DERIVED(goldnpkr_state::geniea, goldnpkr_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4484,7 +4497,7 @@ static MACHINE_CONFIG_DERIVED( geniea, goldnpkr_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mondial, goldnpkr_base ) +MACHINE_CONFIG_DERIVED(goldnpkr_state::mondial, goldnpkr_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4500,7 +4513,7 @@ static MACHINE_CONFIG_DERIVED( mondial, goldnpkr_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bchancep, goldnpkr_base ) +MACHINE_CONFIG_DERIVED(goldnpkr_state::bchancep, goldnpkr_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4647,7 +4660,7 @@ static INPUT_PORTS_START( megadpkr ) INPUT_PORTS_END -static MACHINE_CONFIG_START( megadpkr ) +MACHINE_CONFIG_START(blitz_state::megadpkr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index 5d56ee2cd97..681e2c56e57 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -8059,7 +8059,7 @@ WRITE8_MEMBER(goldstar_state::ay8910_outputb_w) } -static MACHINE_CONFIG_START( goldstar ) +MACHINE_CONFIG_START(goldstar_state::goldstar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8096,7 +8096,7 @@ static MACHINE_CONFIG_START( goldstar ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( goldstbl ) +MACHINE_CONFIG_START(goldstar_state::goldstbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8131,16 +8131,16 @@ static MACHINE_CONFIG_START( goldstbl ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( moonlght, goldstbl ) +MACHINE_CONFIG_DERIVED(goldstar_state::moonlght, goldstbl) MCFG_GFXDECODE_MODIFY("gfxdecode", ml) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( goldfrui, goldstbl ) +MACHINE_CONFIG_DERIVED(goldstar_state::goldfrui, goldstbl) MCFG_GFXDECODE_MODIFY("gfxdecode", goldfrui) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( star100 ) +MACHINE_CONFIG_START(sanghopm_state::star100) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8179,7 +8179,7 @@ static MACHINE_CONFIG_START( star100 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( super9 ) +MACHINE_CONFIG_START(goldstar_state::super9) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8277,7 +8277,7 @@ PALETTE_INIT_MEMBER(goldstar_state, lucky8) } -static MACHINE_CONFIG_START( ncb3 ) +MACHINE_CONFIG_START(cb3_state::ncb3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8326,28 +8326,28 @@ static MACHINE_CONFIG_START( ncb3 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cb3c, ncb3 ) +MACHINE_CONFIG_DERIVED(cb3_state::cb3c, ncb3) MCFG_GFXDECODE_MODIFY("gfxdecode", cb3c) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cb3e, ncb3 ) +MACHINE_CONFIG_DERIVED(cb3_state::cb3e, ncb3) MCFG_GFXDECODE_MODIFY("gfxdecode", cb3e) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( chrygld, ncb3 ) +MACHINE_CONFIG_DERIVED(cb3_state::chrygld, ncb3) MCFG_GFXDECODE_MODIFY("gfxdecode", chry10) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cherrys, ncb3 ) +MACHINE_CONFIG_DERIVED(cb3_state::cherrys, ncb3) MCFG_GFXDECODE_MODIFY("gfxdecode", cherrys) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cm97, ncb3 ) +MACHINE_CONFIG_DERIVED(cb3_state::cm97, ncb3) MCFG_GFXDECODE_MODIFY("gfxdecode", cm97) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wcherry ) +MACHINE_CONFIG_START(goldstar_state::wcherry) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8396,7 +8396,7 @@ static MACHINE_CONFIG_START( wcherry ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cm ) +MACHINE_CONFIG_START(cmaster_state::cm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8438,12 +8438,12 @@ static MACHINE_CONFIG_START( cm ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cmasterc, cm ) +MACHINE_CONFIG_DERIVED(cmaster_state::cmasterc, cm) MCFG_GFXDECODE_MODIFY("gfxdecode", cmasterc) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cmast91 ) +MACHINE_CONFIG_START(goldstar_state::cmast91) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8493,7 +8493,7 @@ INTERRUPT_GEN_MEMBER(wingco_state::masked_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( lucky8 ) +MACHINE_CONFIG_START(wingco_state::lucky8) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8548,7 +8548,7 @@ static MACHINE_CONFIG_START( lucky8 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bingowng ) +MACHINE_CONFIG_START(wingco_state::bingowng) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8602,12 +8602,12 @@ static MACHINE_CONFIG_START( bingowng ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bingownga, bingowng ) +MACHINE_CONFIG_DERIVED(wingco_state::bingownga, bingowng) MCFG_GFXDECODE_MODIFY("gfxdecode", bingownga) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( flam7_w4, lucky8 ) +MACHINE_CONFIG_DERIVED(wingco_state::flam7_w4, lucky8) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(flaming7_map) @@ -8618,7 +8618,7 @@ static MACHINE_CONFIG_DERIVED( flam7_w4, lucky8 ) MCFG_DS2401_ADD("fl7w4_id") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( flaming7, lucky8 ) +MACHINE_CONFIG_DERIVED(wingco_state::flaming7, lucky8) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(flaming7_map) @@ -8632,7 +8632,7 @@ static MACHINE_CONFIG_DERIVED( flaming7, lucky8 ) MCFG_DS2401_ADD("fl7w4_id") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( flam7_tw, lucky8 ) +MACHINE_CONFIG_DERIVED(wingco_state::flam7_tw, lucky8) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(flaming7_map) @@ -8646,7 +8646,7 @@ static MACHINE_CONFIG_DERIVED( flam7_tw, lucky8 ) MCFG_DS2401_ADD("fl7w4_id") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mbstar, lucky8 ) +MACHINE_CONFIG_DERIVED(wingco_state::mbstar, lucky8) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mbstar_map) @@ -8670,7 +8670,7 @@ PALETTE_INIT_MEMBER(wingco_state, magodds) } } -static MACHINE_CONFIG_START( magodds ) +MACHINE_CONFIG_START(wingco_state::magodds) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8725,7 +8725,7 @@ static MACHINE_CONFIG_START( magodds ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( kkotnoli ) +MACHINE_CONFIG_START(goldstar_state::kkotnoli) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8769,7 +8769,7 @@ static MACHINE_CONFIG_START( kkotnoli ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ladylinr ) +MACHINE_CONFIG_START(goldstar_state::ladylinr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8812,7 +8812,7 @@ static MACHINE_CONFIG_START( ladylinr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wcat3 ) +MACHINE_CONFIG_START(wingco_state::wcat3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8869,7 +8869,7 @@ MACHINE_CONFIG_END /* diff with cm machine driver: gfxdecode, OKI & portmap */ -static MACHINE_CONFIG_START( amcoe1 ) +MACHINE_CONFIG_START(cmaster_state::amcoe1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8916,7 +8916,7 @@ MACHINE_CONFIG_END /* diff with cm machine driver: gfxdecode, OKI, portmap & tilemaps rect size/position */ -static MACHINE_CONFIG_DERIVED( amcoe1a, amcoe1 ) +MACHINE_CONFIG_DERIVED(cmaster_state::amcoe1a, amcoe1) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -8925,7 +8925,7 @@ MACHINE_CONFIG_END /* diff with cm machine driver: gfxdecode, AY8910 volume & portmap */ -static MACHINE_CONFIG_START( amcoe2 ) +MACHINE_CONFIG_START(cmaster_state::amcoe2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -8967,7 +8967,7 @@ static MACHINE_CONFIG_START( amcoe2 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00) /* analyzed for clips */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nfm, amcoe2 ) +MACHINE_CONFIG_DERIVED(cmaster_state::nfm, amcoe2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -8983,7 +8983,7 @@ INTERRUPT_GEN_MEMBER(unkch_state::vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( unkch ) +MACHINE_CONFIG_START(unkch_state::unkch) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -9022,7 +9022,7 @@ MACHINE_CONFIG_END // hw unknown - should be somewhat similar to cm -static MACHINE_CONFIG_START( pkrmast ) +MACHINE_CONFIG_START(goldstar_state::pkrmast) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -9055,7 +9055,7 @@ static MACHINE_CONFIG_START( pkrmast ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( megaline ) +MACHINE_CONFIG_START(unkch_state::megaline) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) @@ -9105,7 +9105,7 @@ static MACHINE_CONFIG_START( megaline ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bonusch ) +MACHINE_CONFIG_START(unkch_state::bonusch) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2) diff --git a/src/mame/drivers/gomoku.cpp b/src/mame/drivers/gomoku.cpp index fb41bd94e17..ec636e25fb8 100644 --- a/src/mame/drivers/gomoku.cpp +++ b/src/mame/drivers/gomoku.cpp @@ -121,7 +121,7 @@ static GFXDECODE_START( gomoku ) GFXDECODE_END -static MACHINE_CONFIG_START( gomoku ) +MACHINE_CONFIG_START(gomoku_state::gomoku) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/12) /* 1.536 MHz ? */ MCFG_CPU_PROGRAM_MAP(gomoku_map) diff --git a/src/mame/drivers/good.cpp b/src/mame/drivers/good.cpp index f5043b2005a..35bbde97c87 100644 --- a/src/mame/drivers/good.cpp +++ b/src/mame/drivers/good.cpp @@ -67,6 +67,7 @@ public: uint32_t screen_update_good(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void good(machine_config &config); }; @@ -284,7 +285,7 @@ static GFXDECODE_START( good ) GFXDECODE_END -static MACHINE_CONFIG_START( good ) +MACHINE_CONFIG_START(good_state::good) MCFG_CPU_ADD("maincpu", M68000, 16000000 /2) MCFG_CPU_PROGRAM_MAP(good_map) diff --git a/src/mame/drivers/goodejan.cpp b/src/mame/drivers/goodejan.cpp index 80050f60155..ddceaaa7c2f 100644 --- a/src/mame/drivers/goodejan.cpp +++ b/src/mame/drivers/goodejan.cpp @@ -136,6 +136,8 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri); virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void totmejan(machine_config &config); + void goodejan(machine_config &config); }; /******************************* @@ -630,7 +632,7 @@ WRITE16_MEMBER( goodejan_state::layer_scroll_w ) -static MACHINE_CONFIG_START( goodejan ) +MACHINE_CONFIG_START(goodejan_state::goodejan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30, GOODEJAN_MHZ2/2) @@ -675,7 +677,7 @@ static MACHINE_CONFIG_START( goodejan ) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( totmejan, goodejan ) +MACHINE_CONFIG_DERIVED(goodejan_state::totmejan, goodejan) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(totmejan_io_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/gotcha.cpp b/src/mame/drivers/gotcha.cpp index ba423131407..3a09afe3300 100644 --- a/src/mame/drivers/gotcha.cpp +++ b/src/mame/drivers/gotcha.cpp @@ -262,7 +262,7 @@ void gotcha_state::machine_reset() m_banksel = 0; } -static MACHINE_CONFIG_START( gotcha ) +MACHINE_CONFIG_START(gotcha_state::gotcha) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,14318180) /* 14.31818 MHz */ diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp index df603359dab..5d68fb43851 100644 --- a/src/mame/drivers/gottlieb.cpp +++ b/src/mame/drivers/gottlieb.cpp @@ -672,7 +672,7 @@ static const char *const qbert_knocker_names[] = nullptr /* end of array */ }; -MACHINE_CONFIG_START( qbert_knocker ) +MACHINE_CONFIG_START(gottlieb_state::qbert_knocker) MCFG_SPEAKER_ADD("knocker", 0.0, 0.0, 1.0) MCFG_SOUND_ADD("knocker_sam", SAMPLES, 0) @@ -1764,7 +1764,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( gottlieb_core ) +MACHINE_CONFIG_START(gottlieb_state::gottlieb_core) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, CPU_CLOCK/3) @@ -1789,24 +1789,24 @@ static MACHINE_CONFIG_START( gottlieb_core ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gottlieb1, gottlieb_core ) +MACHINE_CONFIG_DERIVED(gottlieb_state::gottlieb1, gottlieb_core) MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gottlieb2, gottlieb_core ) +MACHINE_CONFIG_DERIVED(gottlieb_state::gottlieb2, gottlieb_core) MCFG_SOUND_ADD("r2sound", GOTTLIEB_SOUND_REV2, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( g2laser, gottlieb_core ) +MACHINE_CONFIG_DERIVED(gottlieb_state::g2laser, gottlieb_core) MCFG_SOUND_ADD("r2sound", GOTTLIEB_SOUND_REV2, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MCFG_LASERDISC_PR8210_ADD("laserdisc") - MCFG_LASERDISC_AUDIO(laserdisc_device::audio_delegate(&gottlieb_state::laserdisc_audio_process, downcast(owner))) + MCFG_LASERDISC_AUDIO(laserdisc_device::audio_delegate(&gottlieb_state::laserdisc_audio_process, this)) MCFG_LASERDISC_OVERLAY_DRIVER(GOTTLIEB_VIDEO_HCOUNT, GOTTLIEB_VIDEO_VCOUNT, gottlieb_state, screen_update_gottlieb) MCFG_LASERDISC_OVERLAY_CLIP(0, GOTTLIEB_VIDEO_HBLANK-1, 0, GOTTLIEB_VIDEO_VBLANK-8) MCFG_LASERDISC_OVERLAY_PALETTE("palette") @@ -1826,13 +1826,13 @@ MACHINE_CONFIG_END *************************************/ -static MACHINE_CONFIG_DERIVED( gottlieb1_votrax, gottlieb_core ) +MACHINE_CONFIG_DERIVED(gottlieb_state::gottlieb1_votrax, gottlieb_core) MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1_VOTRAX, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( reactor, gottlieb1_votrax ) +MACHINE_CONFIG_DERIVED(gottlieb_state::reactor, gottlieb1_votrax) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1842,29 +1842,29 @@ static MACHINE_CONFIG_DERIVED( reactor, gottlieb1_votrax ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( qbert, gottlieb1_votrax ) +MACHINE_CONFIG_DERIVED(gottlieb_state::qbert, gottlieb1_votrax) /* sound hardware */ MCFG_FRAGMENT_ADD(qbert_knocker) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tylz, gottlieb1_votrax ) +MACHINE_CONFIG_DERIVED(gottlieb_state::tylz, gottlieb1_votrax) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( screwloo, gottlieb2 ) +MACHINE_CONFIG_DERIVED(gottlieb_state::screwloo, gottlieb2) MCFG_VIDEO_START_OVERRIDE(gottlieb_state,screwloo) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cobram3, gottlieb_core ) +MACHINE_CONFIG_DERIVED(gottlieb_state::cobram3, gottlieb_core) MCFG_SOUND_ADD("r2sound", GOTTLIEB_SOUND_REV2, 0) MCFG_GOTTLIEB_ENABLE_COBRAM3_MODS() MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MCFG_LASERDISC_PR8210_ADD("laserdisc") - MCFG_LASERDISC_AUDIO(laserdisc_device::audio_delegate(&gottlieb_state::laserdisc_audio_process, downcast(owner))) + MCFG_LASERDISC_AUDIO(laserdisc_device::audio_delegate(&gottlieb_state::laserdisc_audio_process, this)) MCFG_LASERDISC_OVERLAY_DRIVER(GOTTLIEB_VIDEO_HCOUNT, GOTTLIEB_VIDEO_VCOUNT, gottlieb_state, screen_update_gottlieb) MCFG_LASERDISC_OVERLAY_CLIP(0, GOTTLIEB_VIDEO_HBLANK-1, 0, GOTTLIEB_VIDEO_VBLANK-8) MCFG_LASERDISC_OVERLAY_PALETTE("palette") diff --git a/src/mame/drivers/gotya.cpp b/src/mame/drivers/gotya.cpp index ebd89eab829..398d8c1e549 100644 --- a/src/mame/drivers/gotya.cpp +++ b/src/mame/drivers/gotya.cpp @@ -185,7 +185,7 @@ void gotya_state::machine_reset() m_theme_playing = 0; } -static MACHINE_CONFIG_START( gotya ) +MACHINE_CONFIG_START(gotya_state::gotya) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */ diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp index 647c409f5b9..dfbf2011af2 100644 --- a/src/mame/drivers/goupil.cpp +++ b/src/mame/drivers/goupil.cpp @@ -86,6 +86,7 @@ public: uint8_t valkeyb; TIMER_DEVICE_CALLBACK_MEMBER(goupil_scanline); + void goupil_g1(machine_config &config); private: required_device m_acia; optional_device m_ef9364; @@ -117,6 +118,7 @@ public: DECLARE_READ8_MEMBER(visu24x80_ram_r); DECLARE_WRITE8_MEMBER(visu24x80_ram_w); + void goupil_g2(machine_config &config); protected: required_device m_palette; @@ -527,7 +529,7 @@ READ8_MEMBER( goupil_g2_state::visu24x80_ram_r ) return data; } -static MACHINE_CONFIG_START( goupil_g1 ) +MACHINE_CONFIG_START(goupil_g1_state::goupil_g1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6808, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(goupil_mem) @@ -583,7 +585,7 @@ static MACHINE_CONFIG_START( goupil_g1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( goupil_g2 ) +MACHINE_CONFIG_START(goupil_g2_state::goupil_g2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6808, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(goupil_g2_mem) diff --git a/src/mame/drivers/gp2x.cpp b/src/mame/drivers/gp2x.cpp index b2ad1c2d44f..60d18094166 100644 --- a/src/mame/drivers/gp2x.cpp +++ b/src/mame/drivers/gp2x.cpp @@ -55,6 +55,7 @@ public: uint32_t m_nand_ptr_temp; uint32_t m_timer; uint32_t screen_update_gp2x(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void gp2x(machine_config &config); }; @@ -356,7 +357,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( gp2x ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gp2x ) +MACHINE_CONFIG_START(gp2x_state::gp2x) MCFG_CPU_ADD("maincpu", ARM9, 80000000) MCFG_CPU_PROGRAM_MAP(gp2x_map) diff --git a/src/mame/drivers/gp32.cpp b/src/mame/drivers/gp32.cpp index 81f0269608b..92c4783c2d0 100644 --- a/src/mame/drivers/gp32.cpp +++ b/src/mame/drivers/gp32.cpp @@ -1677,7 +1677,7 @@ void gp32_state::machine_reset() s3c240x_machine_reset(); } -static MACHINE_CONFIG_START( gp32 ) +MACHINE_CONFIG_START(gp32_state::gp32) MCFG_CPU_ADD("maincpu", ARM9, 40000000) MCFG_CPU_PROGRAM_MAP(gp32_map) diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp index c395adfa474..7b0b5b478a3 100644 --- a/src/mame/drivers/gp_1.cpp +++ b/src/mame/drivers/gp_1.cpp @@ -57,6 +57,8 @@ public: DECLARE_WRITE8_MEMBER(portc_w); DECLARE_READ8_MEMBER(portb_r); TIMER_DEVICE_CALLBACK_MEMBER(zero_timer); + void gp_1(machine_config &config); + void gp_1s(machine_config &config); private: uint8_t m_u14; uint8_t m_digit; @@ -421,7 +423,7 @@ static const z80_daisy_config daisy_chain[] = { nullptr } }; -static MACHINE_CONFIG_START( gp_1 ) +MACHINE_CONFIG_START(gp_1_state::gp_1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2457600) MCFG_CPU_PROGRAM_MAP(gp_1_map) @@ -447,7 +449,7 @@ static MACHINE_CONFIG_START( gp_1 ) MCFG_TIMER_DRIVER_ADD_PERIODIC("gp1", gp_1_state, zero_timer, attotime::from_hz(120)) // mains freq*2 MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gp_1s, gp_1 ) +MACHINE_CONFIG_DERIVED(gp_1_state::gp_1s, gp_1) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("snsnd", SN76477, 0) MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C diff --git a/src/mame/drivers/gp_2.cpp b/src/mame/drivers/gp_2.cpp index d7413d7901b..6838aa90f6e 100644 --- a/src/mame/drivers/gp_2.cpp +++ b/src/mame/drivers/gp_2.cpp @@ -65,6 +65,7 @@ public: DECLARE_WRITE8_MEMBER(portc_w); DECLARE_READ8_MEMBER(portb_r); TIMER_DEVICE_CALLBACK_MEMBER(zero_timer); + void gp_2(machine_config &config); private: uint8_t m_u14; uint8_t m_digit; @@ -571,7 +572,7 @@ static const z80_daisy_config daisy_chain[] = { nullptr } }; -static MACHINE_CONFIG_START( gp_2 ) +MACHINE_CONFIG_START(gp_2_state::gp_2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2457600) MCFG_CPU_PROGRAM_MAP(gp_2_map) diff --git a/src/mame/drivers/gpworld.cpp b/src/mame/drivers/gpworld.cpp index 9b8199f4432..908344d42aa 100644 --- a/src/mame/drivers/gpworld.cpp +++ b/src/mame/drivers/gpworld.cpp @@ -92,6 +92,7 @@ public: required_device m_gfxdecode; required_device m_palette; + void gpworld(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -488,7 +489,7 @@ static GFXDECODE_START( gpworld ) GFXDECODE_END /* DRIVER */ -static MACHINE_CONFIG_START( gpworld ) +MACHINE_CONFIG_START(gpworld_state::gpworld) /* main cpu */ MCFG_CPU_ADD("maincpu", Z80, GUESSED_CLOCK) diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp index 234354e43e3..c829a901b17 100644 --- a/src/mame/drivers/gradius3.cpp +++ b/src/mame/drivers/gradius3.cpp @@ -274,7 +274,7 @@ void gradius3_state::machine_reset() } -static MACHINE_CONFIG_START( gradius3 ) +MACHINE_CONFIG_START(gradius3_state::gradius3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) diff --git a/src/mame/drivers/grchamp.cpp b/src/mame/drivers/grchamp.cpp index f5db00ce400..929bb734c41 100644 --- a/src/mame/drivers/grchamp.cpp +++ b/src/mame/drivers/grchamp.cpp @@ -729,7 +729,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( grchamp ) +MACHINE_CONFIG_START(grchamp_state::grchamp) /* basic machine hardware */ /* CPU BOARD */ diff --git a/src/mame/drivers/grfd2301.cpp b/src/mame/drivers/grfd2301.cpp index a4b48dbcc6c..af52092d9d6 100644 --- a/src/mame/drivers/grfd2301.cpp +++ b/src/mame/drivers/grfd2301.cpp @@ -47,6 +47,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void grfd2301(machine_config &config); private: virtual void machine_reset() override; required_shared_ptr m_p_videoram; @@ -108,7 +109,7 @@ uint32_t grfd2301_state::screen_update(screen_device &screen, bitmap_ind16 &bitm return 0; } -static MACHINE_CONFIG_START( grfd2301 ) +MACHINE_CONFIG_START(grfd2301_state::grfd2301) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/gridcomp.cpp b/src/mame/drivers/gridcomp.cpp index 58ffe585760..e1a573914bb 100644 --- a/src/mame/drivers/gridcomp.cpp +++ b/src/mame/drivers/gridcomp.cpp @@ -133,6 +133,12 @@ public: void kbd_put(u16 data); + void grid1129(machine_config &config); + void grid1131(machine_config &config); + void grid1121(machine_config &config); + void grid1139(machine_config &config); + void grid1109(machine_config &config); + void grid1101(machine_config &config); private: bool m_kbd_ready; uint16_t m_kbd_data; @@ -350,7 +356,7 @@ INPUT_PORTS_END * IRQ6 8087 * IRQ7 ring */ -static MACHINE_CONFIG_START( grid1101 ) +MACHINE_CONFIG_START(gridcomp_state::grid1101) MCFG_CPU_ADD("maincpu", I8086, XTAL_15MHz / 3) MCFG_CPU_PROGRAM_MAP(grid1101_map) MCFG_CPU_IO_MAP(grid1101_io) @@ -392,29 +398,29 @@ static MACHINE_CONFIG_START( grid1101 ) MCFG_RAM_DEFAULT_VALUE(0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( grid1109, grid1101 ) +MACHINE_CONFIG_DERIVED(gridcomp_state::grid1109, grid1101) MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("512K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( grid1121, grid1101 ) +MACHINE_CONFIG_DERIVED(gridcomp_state::grid1121, grid1101) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(XTAL_24MHz / 3) // XXX MCFG_CPU_PROGRAM_MAP(grid1121_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( grid1129, grid1121 ) +MACHINE_CONFIG_DERIVED(gridcomp_state::grid1129, grid1121) MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("512K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( grid1131, grid1121 ) +MACHINE_CONFIG_DERIVED(gridcomp_state::grid1131, grid1121) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(gridcomp_state, screen_update_113x) MCFG_SCREEN_RAW_PARAMS(XTAL_15MHz/2, 720, 0, 512, 262, 0, 240) // XXX MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( grid1139, grid1131 ) +MACHINE_CONFIG_DERIVED(gridcomp_state::grid1139, grid1131) MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("512K") MACHINE_CONFIG_END diff --git a/src/mame/drivers/gridlee.cpp b/src/mame/drivers/gridlee.cpp index f3551566f5a..7f4e3c2ac95 100644 --- a/src/mame/drivers/gridlee.cpp +++ b/src/mame/drivers/gridlee.cpp @@ -407,7 +407,7 @@ static const char *const sample_names[] = * *************************************/ -static MACHINE_CONFIG_START( gridlee ) +MACHINE_CONFIG_START(gridlee_state::gridlee) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, GRIDLEE_CPU_CLOCK) diff --git a/src/mame/drivers/groundfx.cpp b/src/mame/drivers/groundfx.cpp index ded617299f4..093705701b8 100644 --- a/src/mame/drivers/groundfx.cpp +++ b/src/mame/drivers/groundfx.cpp @@ -268,7 +268,7 @@ INTERRUPT_GEN_MEMBER(groundfx_state::interrupt) device.execute().set_input_line(4, HOLD_LINE); } -static MACHINE_CONFIG_START( groundfx ) +MACHINE_CONFIG_START(groundfx_state::groundfx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_40MHz/2) /* 20MHz - verified */ diff --git a/src/mame/drivers/gstream.cpp b/src/mame/drivers/gstream.cpp index e9d4ab198e9..8d625dc69a5 100644 --- a/src/mame/drivers/gstream.cpp +++ b/src/mame/drivers/gstream.cpp @@ -208,6 +208,8 @@ public: required_device m_gfxdecode; required_device m_palette; + void x2222(machine_config &config); + void gstream(machine_config &config); }; CUSTOM_INPUT_MEMBER(gstream_state::x2222_toggle_r) // or the game hangs when starting, might be a status flag for the sound? @@ -866,7 +868,7 @@ void gstream_state::machine_reset() m_oki_bank_2 = 0; } -static MACHINE_CONFIG_START( gstream ) +MACHINE_CONFIG_START(gstream_state::gstream) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", E132XT, 16000000*4) /* 4x internal multiplier */ @@ -901,7 +903,7 @@ static MACHINE_CONFIG_START( gstream ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( x2222 ) +MACHINE_CONFIG_START(gstream_state::x2222) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", E132XT, 16000000*4) /* 4x internal multiplier */ diff --git a/src/mame/drivers/gstriker.cpp b/src/mame/drivers/gstriker.cpp index e8650a929f6..3cc50f9afaf 100644 --- a/src/mame/drivers/gstriker.cpp +++ b/src/mame/drivers/gstriker.cpp @@ -489,7 +489,7 @@ INPUT_PORTS_END /*** MACHINE DRIVER **********************************************************/ -static MACHINE_CONFIG_START( gstriker ) +MACHINE_CONFIG_START(gstriker_state::gstriker) MCFG_CPU_ADD("maincpu", M68000, 10000000) MCFG_CPU_PROGRAM_MAP(gstriker_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", gstriker_state, irq1_line_hold) @@ -558,7 +558,7 @@ static MACHINE_CONFIG_START( gstriker ) MCFG_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( twc94, gstriker ) +MACHINE_CONFIG_DERIVED(gstriker_state::twc94, gstriker) MCFG_CPU_REPLACE("maincpu", M68000, 16000000) MCFG_CPU_PROGRAM_MAP(twcup94_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", gstriker_state, irq1_line_hold) @@ -571,7 +571,7 @@ static MACHINE_CONFIG_DERIVED( twc94, gstriker ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vgoal, twc94 ) +MACHINE_CONFIG_DERIVED(gstriker_state::vgoal, twc94) MCFG_DEVICE_MODIFY("vsystem_spr") MCFG_VSYSTEM_SPR_SET_TRANSPEN(0xf) // different vs. the other games, find register MACHINE_CONFIG_END diff --git a/src/mame/drivers/gsword.cpp b/src/mame/drivers/gsword.cpp index d8bdcf4d971..48ba56c6083 100644 --- a/src/mame/drivers/gsword.cpp +++ b/src/mame/drivers/gsword.cpp @@ -774,7 +774,7 @@ static GFXDECODE_START( gsword ) GFXDECODE_END -static MACHINE_CONFIG_START( gsword ) +MACHINE_CONFIG_START(gsword_state::gsword) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/6) /* verified on pcb */ @@ -832,7 +832,7 @@ static MACHINE_CONFIG_START( gsword ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( josvolly ) +MACHINE_CONFIG_START(josvolly_state::josvolly) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 18000000/4) /* ? */ diff --git a/src/mame/drivers/gticlub.cpp b/src/mame/drivers/gticlub.cpp index 985218b3126..3f3bbd83c2b 100644 --- a/src/mame/drivers/gticlub.cpp +++ b/src/mame/drivers/gticlub.cpp @@ -329,6 +329,10 @@ public: uint32_t screen_update_gticlub(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_hangplt(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void thunderh(machine_config &config); + void hangplt(machine_config &config); + void slrasslt(machine_config &config); + void gticlub(machine_config &config); private: void gticlub_led_setreg(int offset, uint8_t data); @@ -934,7 +938,7 @@ uint32_t gticlub_state::screen_update_hangplt(screen_device &screen, bitmap_rgb3 return 0; } -static MACHINE_CONFIG_START( gticlub ) +MACHINE_CONFIG_START(gticlub_state::gticlub) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */ @@ -1007,7 +1011,7 @@ static MACHINE_CONFIG_START( gticlub ) MCFG_KONPPC_CGBOARD_TYPE(GTICLUB) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( thunderh, gticlub ) +MACHINE_CONFIG_DERIVED(gticlub_state::thunderh, gticlub) MCFG_DEVICE_REMOVE("adc1038") MCFG_DEVICE_ADD("adc1038", ADC1038, 0) @@ -1019,7 +1023,7 @@ static MACHINE_CONFIG_DERIVED( thunderh, gticlub ) MCFG_K056230_HACK(1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( slrasslt, gticlub ) +MACHINE_CONFIG_DERIVED(gticlub_state::slrasslt, gticlub) MCFG_DEVICE_REMOVE("adc1038") MCFG_DEVICE_ADD("adc1038", ADC1038, 0) @@ -1041,7 +1045,7 @@ MACHINE_RESET_MEMBER(gticlub_state,hangplt) m_dsp2->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } -static MACHINE_CONFIG_START( hangplt ) +MACHINE_CONFIG_START(gticlub_state::hangplt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */ diff --git a/src/mame/drivers/gts1.cpp b/src/mame/drivers/gts1.cpp index 09b65fddff2..177e2f9db7c 100644 --- a/src/mame/drivers/gts1.cpp +++ b/src/mame/drivers/gts1.cpp @@ -106,6 +106,7 @@ public: DECLARE_WRITE8_MEMBER(gts1_io_w); DECLARE_READ8_MEMBER (gts1_pa_r); DECLARE_WRITE8_MEMBER(gts1_do_w); + void gts1(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -675,7 +676,7 @@ WRITE8_MEMBER(gts1_state::gts1_do_w) } -static MACHINE_CONFIG_START( gts1 ) +MACHINE_CONFIG_START(gts1_state::gts1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPS4_2, XTAL_3_579545MHz) // divided by 18 in the CPU MCFG_CPU_PROGRAM_MAP(gts1_map) diff --git a/src/mame/drivers/gts3.cpp b/src/mame/drivers/gts3.cpp index 67af5c9348f..6c47b9c994a 100644 --- a/src/mame/drivers/gts3.cpp +++ b/src/mame/drivers/gts3.cpp @@ -36,11 +36,11 @@ ToDo: #include "machine/6522via.h" #include "gts3.lh" -class gts3_state : public driver_device +class gts3_state : public genpin_class { public: gts3_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) + : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_u4(*this, "u4") , m_u5(*this, "u5") @@ -54,6 +54,7 @@ public: DECLARE_WRITE8_MEMBER(u4b_w); DECLARE_WRITE_LINE_MEMBER(nmi_w); DECLARE_INPUT_CHANGED_MEMBER(test_inp); + void gts3(machine_config &config); private: bool m_dispclk; bool m_lampclk; @@ -274,7 +275,7 @@ DRIVER_INIT_MEMBER( gts3_state, gts3 ) { } -static MACHINE_CONFIG_START( gts3 ) +MACHINE_CONFIG_START(gts3_state::gts3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65C02, XTAL_4MHz / 2) MCFG_CPU_PROGRAM_MAP(gts3_map) diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp index f59c551155e..04b8f1ccdf1 100644 --- a/src/mame/drivers/gts3a.cpp +++ b/src/mame/drivers/gts3a.cpp @@ -27,11 +27,11 @@ ToDo: #include "screen.h" -class gts3a_state : public driver_device +class gts3a_state : public genpin_class { public: gts3a_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) + : genpin_class(mconfig, type, tag) , m_palette(*this, "palette") , m_maincpu(*this, "maincpu") , m_dmdcpu(*this, "dmdcpu") @@ -52,6 +52,7 @@ public: MC6845_UPDATE_ROW(crtc_update_row); DECLARE_PALETTE_INIT(gts3a); required_device m_palette; + void gts3a(machine_config &config); private: bool m_dispclk; bool m_lampclk; @@ -330,7 +331,7 @@ MC6845_UPDATE_ROW( gts3a_state::crtc_update_row ) } } -static MACHINE_CONFIG_START( gts3a ) +MACHINE_CONFIG_START(gts3a_state::gts3a) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65C02, XTAL_4MHz / 2) MCFG_CPU_PROGRAM_MAP(gts3a_map) diff --git a/src/mame/drivers/gts80.cpp b/src/mame/drivers/gts80.cpp index 9e3db98e589..79f76f4b0ac 100644 --- a/src/mame/drivers/gts80.cpp +++ b/src/mame/drivers/gts80.cpp @@ -48,6 +48,10 @@ public: DECLARE_WRITE8_MEMBER(port2b_w); DECLARE_WRITE8_MEMBER(port3a_w); DECLARE_WRITE8_MEMBER(port3b_w); + void gts80(machine_config &config); + void gts80_ss(machine_config &config); + void gts80_s(machine_config &config); + void gts80_hh(machine_config &config); private: uint8_t m_port2; uint8_t m_segment; @@ -344,7 +348,7 @@ DRIVER_INIT_MEMBER( gts80_state, gts80 ) } /* with Sound Board */ -static MACHINE_CONFIG_START( gts80 ) +MACHINE_CONFIG_START(gts80_state::gts80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_3_579545MHz/4) MCFG_CPU_PROGRAM_MAP(gts80_map) @@ -379,17 +383,17 @@ static MACHINE_CONFIG_START( gts80 ) MCFG_SPEAKER_STANDARD_MONO("speaker") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gts80_s, gts80 ) +MACHINE_CONFIG_DERIVED(gts80_state::gts80_s, gts80) MCFG_SOUND_ADD("r0sound", GOTTLIEB_SOUND_REV0, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gts80_hh, gts80 ) +MACHINE_CONFIG_DERIVED(gts80_state::gts80_hh, gts80) MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gts80_ss, gts80 ) +MACHINE_CONFIG_DERIVED(gts80_state::gts80_ss, gts80) MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1, 0) //MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1_WITH_VOTRAX, 0) // votrax crashes MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) diff --git a/src/mame/drivers/gts80a.cpp b/src/mame/drivers/gts80a.cpp index 584e822afcd..aa9bffed279 100644 --- a/src/mame/drivers/gts80a.cpp +++ b/src/mame/drivers/gts80a.cpp @@ -39,6 +39,9 @@ public: DECLARE_WRITE8_MEMBER(port2b_w); DECLARE_WRITE8_MEMBER(port3a_w); DECLARE_WRITE8_MEMBER(port3b_w); + void gts80a(machine_config &config); + void gts80a_s(machine_config &config); + void gts80a_ss(machine_config &config); private: uint8_t m_port2; uint8_t m_segment; @@ -335,7 +338,7 @@ DRIVER_INIT_MEMBER( gts80a_state, gts80a ) } /* with Sound Board */ -static MACHINE_CONFIG_START( gts80a ) +MACHINE_CONFIG_START(gts80a_state::gts80a) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_3_579545MHz/4) MCFG_CPU_PROGRAM_MAP(gts80a_map) @@ -370,12 +373,12 @@ static MACHINE_CONFIG_START( gts80a ) MCFG_SPEAKER_STANDARD_MONO("speaker") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gts80a_s, gts80a ) +MACHINE_CONFIG_DERIVED(gts80a_state::gts80a_s, gts80a) MCFG_SOUND_ADD("r0sound", GOTTLIEB_SOUND_REV0, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gts80a_ss, gts80a ) +MACHINE_CONFIG_DERIVED(gts80a_state::gts80a_ss, gts80a) MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1, 0) //MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1_WITH_VOTRAX, 0) // votrax crashes MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) @@ -396,6 +399,7 @@ public: uint32_t screen_update_caveman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void caveman(machine_config &config); private: required_device m_videocpu; required_shared_ptr m_vram; @@ -441,7 +445,7 @@ static ADDRESS_MAP_START( video_io_map, AS_IO, 8, caveman_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( caveman, gts80a_ss ) +MACHINE_CONFIG_DERIVED(caveman_state::caveman, gts80a_ss) MCFG_CPU_ADD("video_cpu", I8088, 5000000) MCFG_CPU_PROGRAM_MAP(video_map) MCFG_CPU_IO_MAP(video_io_map) diff --git a/src/mame/drivers/gts80b.cpp b/src/mame/drivers/gts80b.cpp index ef0d713c403..e133f424a98 100644 --- a/src/mame/drivers/gts80b.cpp +++ b/src/mame/drivers/gts80b.cpp @@ -41,6 +41,12 @@ public: DECLARE_WRITE8_MEMBER(port2b_w); DECLARE_WRITE8_MEMBER(port3a_w); DECLARE_WRITE8_MEMBER(port3b_w); + void gts80b_s2(machine_config &config); + void gts80b_s3(machine_config &config); + void bonebstr(machine_config &config); + void gts80b_s1(machine_config &config); + void gts80b_s(machine_config &config); + void gts80b(machine_config &config); private: uint8_t m_dispcmd; uint8_t m_port2a; @@ -374,7 +380,7 @@ DRIVER_INIT_MEMBER( gts80b_state, gts80b ) } /* with Sound Board */ -static MACHINE_CONFIG_START( gts80b ) +MACHINE_CONFIG_START(gts80b_state::gts80b) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_3_579545MHz/4) MCFG_CPU_PROGRAM_MAP(gts80b_map) @@ -409,7 +415,7 @@ static MACHINE_CONFIG_START( gts80b ) MCFG_SPEAKER_STANDARD_MONO("speaker") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gts80b_s, gts80b ) +MACHINE_CONFIG_DERIVED(gts80b_state::gts80b_s, gts80b) MCFG_SOUND_ADD("r0sound", GOTTLIEB_SOUND_REV0, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END @@ -420,25 +426,25 @@ MACHINE_CONFIG_END // MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) //MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gts80b_s1, gts80b ) +MACHINE_CONFIG_DERIVED(gts80b_state::gts80b_s1, gts80b) /* related to src/mame/audio/gottlieb.c? */ // MCFG_IMPORT_FROM(gts80s_b1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gts80b_s2, gts80b ) +MACHINE_CONFIG_DERIVED(gts80b_state::gts80b_s2, gts80b) /* related to src/mame/audio/gottlieb.c? */ // MCFG_IMPORT_FROM(gts80s_b2) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gts80b_s3, gts80b ) +MACHINE_CONFIG_DERIVED(gts80b_state::gts80b_s3, gts80b) /* related to src/mame/audio/gottlieb.c? */ // MCFG_IMPORT_FROM(gts80s_b3) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bonebstr, gts80b ) +MACHINE_CONFIG_DERIVED(gts80b_state::bonebstr, gts80b) /* related to src/mame/audio/gottlieb.c? */ // MCFG_IMPORT_FROM(gts80s_b3a) diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp index c9682f5207f..f75b2e592cb 100644 --- a/src/mame/drivers/guab.cpp +++ b/src/mame/drivers/guab.cpp @@ -94,6 +94,7 @@ public: DECLARE_FLOPPY_FORMATS(floppy_formats); + void guab(machine_config &config); protected: virtual void machine_start() override; @@ -447,7 +448,7 @@ SLOT_INTERFACE_END // MACHINE DEFINTIONS //************************************************************************** -static MACHINE_CONFIG_START( guab ) +MACHINE_CONFIG_START(guab_state::guab) /* TODO: Verify clock */ MCFG_CPU_ADD("maincpu", M68000, 8000000) MCFG_CPU_PROGRAM_MAP(guab_map) diff --git a/src/mame/drivers/gumbo.cpp b/src/mame/drivers/gumbo.cpp index 8cff2256311..15b8f4f5244 100644 --- a/src/mame/drivers/gumbo.cpp +++ b/src/mame/drivers/gumbo.cpp @@ -233,7 +233,7 @@ static GFXDECODE_START( gumbo ) GFXDECODE_END -static MACHINE_CONFIG_START( gumbo ) +MACHINE_CONFIG_START(gumbo_state::gumbo) MCFG_CPU_ADD("maincpu", M68000, XTAL_14_31818MHz/2) MCFG_CPU_PROGRAM_MAP(gumbo_map) @@ -259,13 +259,13 @@ static MACHINE_CONFIG_START( gumbo ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mspuzzle, gumbo ) +MACHINE_CONFIG_DERIVED(gumbo_state::mspuzzle, gumbo) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mspuzzle_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dblpoint, gumbo ) +MACHINE_CONFIG_DERIVED(gumbo_state::dblpoint, gumbo) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(dblpoint_map) diff --git a/src/mame/drivers/gunbustr.cpp b/src/mame/drivers/gunbustr.cpp index 36acfab190f..2025c41fe25 100644 --- a/src/mame/drivers/gunbustr.cpp +++ b/src/mame/drivers/gunbustr.cpp @@ -227,7 +227,7 @@ GFXDECODE_END MACHINE DRIVERS ***********************************************************/ -static MACHINE_CONFIG_START( gunbustr ) +MACHINE_CONFIG_START(gunbustr_state::gunbustr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz) diff --git a/src/mame/drivers/gundealr.cpp b/src/mame/drivers/gundealr.cpp index c7bfc943e2d..2cf17fdbc26 100644 --- a/src/mame/drivers/gundealr.cpp +++ b/src/mame/drivers/gundealr.cpp @@ -424,7 +424,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(gundealr_state::gundealr_scanline) m_maincpu->set_input_line_and_vector(0, HOLD_LINE,0xcf); /* RST 10h */ } -static MACHINE_CONFIG_START( gundealr ) +MACHINE_CONFIG_START(gundealr_state::gundealr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz verified for Yam! Yam!? */ @@ -517,14 +517,14 @@ TIMER_DEVICE_CALLBACK_MEMBER(gundealr_state::yamyam_mcu_sim) m_rambase[0x006] = ioport("IN0")->read(); } -static MACHINE_CONFIG_DERIVED( yamyam, gundealr ) +MACHINE_CONFIG_DERIVED(gundealr_state::yamyam, gundealr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(yamyam_main_map) MCFG_TIMER_DRIVER_ADD_PERIODIC("mcusim", gundealr_state, yamyam_mcu_sim, attotime::from_hz(6000000/60)) /* 6mhz confirmed */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gundealrbl, yamyam ) +MACHINE_CONFIG_DERIVED(gundealr_state::gundealrbl, yamyam) MCFG_DEVICE_REMOVE("mcusim") MACHINE_CONFIG_END diff --git a/src/mame/drivers/gunpey.cpp b/src/mame/drivers/gunpey.cpp index 7e3999ca49d..7894ccedacc 100644 --- a/src/mame/drivers/gunpey.cpp +++ b/src/mame/drivers/gunpey.cpp @@ -267,6 +267,7 @@ public: uint32_t get_stream_bits(int bits); int write_dest_byte(uint8_t usedata); + void gunpey(machine_config &config); //uint16_t main_m_vram[0x800][0x800]; }; @@ -1439,7 +1440,7 @@ GFXDECODE_END /***************************************************************************************/ -static MACHINE_CONFIG_START( gunpey ) +MACHINE_CONFIG_START(gunpey_state::gunpey) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30, 57242400 / 4) diff --git a/src/mame/drivers/gunsmoke.cpp b/src/mame/drivers/gunsmoke.cpp index b8a18cd3377..9d805b1dc24 100644 --- a/src/mame/drivers/gunsmoke.cpp +++ b/src/mame/drivers/gunsmoke.cpp @@ -299,7 +299,7 @@ void gunsmoke_state::machine_reset() m_sprite3bank = 0; } -static MACHINE_CONFIG_START( gunsmoke ) +MACHINE_CONFIG_START(gunsmoke_state::gunsmoke) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) // 4 MHz diff --git a/src/mame/drivers/gyruss.cpp b/src/mame/drivers/gyruss.cpp index 18990b2a3bb..8e7b6dfc3f8 100644 --- a/src/mame/drivers/gyruss.cpp +++ b/src/mame/drivers/gyruss.cpp @@ -471,7 +471,7 @@ INTERRUPT_GEN_MEMBER(gyruss_state::slave_vblank_irq) device.execute().set_input_line(0, ASSERT_LINE); } -static MACHINE_CONFIG_START( gyruss ) +MACHINE_CONFIG_START(gyruss_state::gyruss) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */ diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp index 882313b8354..c910686c3cd 100644 --- a/src/mame/drivers/h19.cpp +++ b/src/mame/drivers/h19.cpp @@ -108,6 +108,7 @@ public: MC6845_UPDATE_ROW(crtc_update_row); + void h19(machine_config &config); private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void machine_reset() override; @@ -512,7 +513,7 @@ static GFXDECODE_START( h19 ) GFXDECODE_ENTRY( "chargen", 0x0000, h19_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( h19 ) +MACHINE_CONFIG_START(h19_state::h19) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, H19_CLOCK) // From schematics MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp index d2a28e54356..7fdf8e94b6b 100644 --- a/src/mame/drivers/h8.cpp +++ b/src/mame/drivers/h8.cpp @@ -81,6 +81,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(h8_c); TIMER_DEVICE_CALLBACK_MEMBER(h8_p); + void h8(machine_config &config); private: uint8_t m_digit; uint8_t m_segment; @@ -302,7 +303,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(h8_state::h8_p) } } -static MACHINE_CONFIG_START( h8 ) +MACHINE_CONFIG_START(h8_state::h8) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, H8_CLOCK) MCFG_CPU_PROGRAM_MAP(h8_mem) diff --git a/src/mame/drivers/h89.cpp b/src/mame/drivers/h89.cpp index f1763160889..44a6cbafde1 100644 --- a/src/mame/drivers/h89.cpp +++ b/src/mame/drivers/h89.cpp @@ -43,6 +43,7 @@ public: uint8_t m_port_f2; virtual void machine_reset() override; TIMER_DEVICE_CALLBACK_MEMBER(h89_irq_timer); + void h89(machine_config &config); }; @@ -178,7 +179,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( h89 ) +MACHINE_CONFIG_START(h89_state::h89) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_12_288MHz / 6) MCFG_CPU_PROGRAM_MAP(h89_mem) diff --git a/src/mame/drivers/halleys.cpp b/src/mame/drivers/halleys.cpp index dfedf61c881..fca737c7ab1 100644 --- a/src/mame/drivers/halleys.cpp +++ b/src/mame/drivers/halleys.cpp @@ -292,6 +292,8 @@ public: required_device m_audiocpu; required_device m_palette; required_device m_soundlatch; + void benberob(machine_config &config); + void halleys(machine_config &config); }; @@ -1920,7 +1922,7 @@ void halleys_state::machine_reset() } -static MACHINE_CONFIG_START( halleys ) +MACHINE_CONFIG_START(halleys_state::halleys) MCFG_CPU_ADD("maincpu", MC6809E, XTAL_19_968MHz/12) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(halleys_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", halleys_state, halleys_scanline, "screen", 0, 1) @@ -1963,7 +1965,7 @@ static MACHINE_CONFIG_START( halleys ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( benberob, halleys ) +MACHINE_CONFIG_DERIVED(halleys_state::benberob, halleys) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(XTAL_19_968MHz/12) /* not verified but pcb identical to halley's comet */ MCFG_TIMER_MODIFY("scantimer") diff --git a/src/mame/drivers/hanaawas.cpp b/src/mame/drivers/hanaawas.cpp index cf0caebe318..b0bfe9b02c6 100644 --- a/src/mame/drivers/hanaawas.cpp +++ b/src/mame/drivers/hanaawas.cpp @@ -213,7 +213,7 @@ void hanaawas_state::machine_reset() m_mux = 0; } -static MACHINE_CONFIG_START( hanaawas ) +MACHINE_CONFIG_START(hanaawas_state::hanaawas) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */ diff --git a/src/mame/drivers/hankin.cpp b/src/mame/drivers/hankin.cpp index 26eb97e7049..67df1504ca4 100644 --- a/src/mame/drivers/hankin.cpp +++ b/src/mame/drivers/hankin.cpp @@ -65,6 +65,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(self_test); TIMER_DEVICE_CALLBACK_MEMBER(timer_s); TIMER_DEVICE_CALLBACK_MEMBER(timer_x); + void hankin(machine_config &config); private: bool m_timer_x; bool m_timer_sb; @@ -491,7 +492,7 @@ WRITE_LINE_MEMBER( hankin_state::ic2_cb2_w ) m_ic2_cb2 = state; } -static MACHINE_CONFIG_START( hankin ) +MACHINE_CONFIG_START(hankin_state::hankin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6802, 3276800) MCFG_CPU_PROGRAM_MAP(hankin_map) diff --git a/src/mame/drivers/hapyfish.cpp b/src/mame/drivers/hapyfish.cpp index d109e6154d0..7339ea5e3a4 100644 --- a/src/mame/drivers/hapyfish.cpp +++ b/src/mame/drivers/hapyfish.cpp @@ -33,6 +33,7 @@ public: virtual void video_start() override; uint32_t screen_update_hapyfish(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void hapyfish(machine_config &config); }; static ADDRESS_MAP_START( hapyfish_map, AS_PROGRAM, 32, hapyfish_state ) @@ -53,7 +54,7 @@ void hapyfish_state::video_start() -static MACHINE_CONFIG_START( hapyfish ) +MACHINE_CONFIG_START(hapyfish_state::hapyfish) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM9, 20000000) // ?? ARM baesd CPU diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp index ad742c134a5..62c773464fd 100644 --- a/src/mame/drivers/harddriv.cpp +++ b/src/mame/drivers/harddriv.cpp @@ -522,6 +522,20 @@ public: optional_device m_leftpcb; optional_device m_rightpcb; + void steeltal1_machine(machine_config &config); + void harddriv_machine(machine_config &config); + void hdrivairp_machine(machine_config &config); + void harddrivc_machine(machine_config &config); + void racedrivb1_machine(machine_config &config); + void racedrivc1_machine(machine_config &config); + void steeltal_machine(machine_config &config); + void racedriv_panorama_machine(machine_config &config); + void hdrivair_machine(machine_config &config); + void racedriv_machine(machine_config &config); + void strtdriv_machine(machine_config &config); + void steeltalp_machine(machine_config &config); + void racedrivc_machine(machine_config &config); + void stunrun_machine(machine_config &config); }; @@ -1417,7 +1431,7 @@ INTERRUPT_GEN_MEMBER(harddriv_state::video_int_gen) /* Driver board without MSP (used by Race Drivin' cockpit) */ -static MACHINE_CONFIG_START( driver_nomsp ) +MACHINE_CONFIG_START(harddriv_state::driver_nomsp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, HARDDRIV_MASTER_CLOCK/4) @@ -1465,7 +1479,7 @@ MACHINE_CONFIG_END /* Driver board with MSP (used by Hard Drivin' cockpit) */ -static MACHINE_CONFIG_START( driver_msp ) +MACHINE_CONFIG_START(harddriv_state::driver_msp) MCFG_FRAGMENT_ADD( driver_nomsp ) @@ -1483,7 +1497,7 @@ MACHINE_CONFIG_END /* Multisync board without MSP (used by STUN Runner, Steel Talons, Race Drivin' compact) */ -static MACHINE_CONFIG_START( multisync_nomsp ) +MACHINE_CONFIG_START(harddriv_state::multisync_nomsp) MCFG_FRAGMENT_ADD( driver_nomsp ) @@ -1504,7 +1518,7 @@ MACHINE_CONFIG_END /* Multisync board with MSP (used by Hard Drivin' compact) */ -static MACHINE_CONFIG_START( multisync_msp ) +MACHINE_CONFIG_START(harddriv_state::multisync_msp) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1522,7 +1536,7 @@ MACHINE_CONFIG_END /* Multisync II board (used by Hard Drivin's Airborne) */ -static MACHINE_CONFIG_START( multisync2 ) +MACHINE_CONFIG_START(harddriv_state::multisync2) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1545,7 +1559,7 @@ MACHINE_CONFIG_END *************************************/ /* ADSP/ADSP II boards (used by Hard/Race Drivin', STUN Runner) */ -static MACHINE_CONFIG_START( adsp ) +MACHINE_CONFIG_START(harddriv_state::adsp) /* basic machine hardware */ MCFG_CPU_ADD("adsp", ADSP2100, XTAL_32MHz/4) @@ -1555,7 +1569,7 @@ MACHINE_CONFIG_END /* DS III/IV board (used by Steel Talons, Street Drivin' and Hard Drivin's Airborne) */ -static MACHINE_CONFIG_START( ds3 ) +MACHINE_CONFIG_START(harddriv_state::ds3) /* basic machine hardware */ MCFG_CPU_ADD("adsp", ADSP2101, XTAL_12MHz) @@ -1597,7 +1611,7 @@ MACHINE_CONFIG_END *************************************/ /* DSK board (used by Race Drivin') */ -static MACHINE_CONFIG_START( dsk ) +MACHINE_CONFIG_START(harddriv_state::dsk) /* basic machine hardware */ MCFG_CPU_ADD("dsp32", DSP32C, XTAL_40MHz) @@ -1613,7 +1627,7 @@ MACHINE_CONFIG_END /* DSK II board (used by Hard Drivin's Airborne) */ -static MACHINE_CONFIG_START( dsk2 ) +MACHINE_CONFIG_START(harddriv_state::dsk2) /* basic machine hardware */ MCFG_CPU_ADD("dsp32", DSP32C, XTAL_40MHz) @@ -1639,7 +1653,7 @@ harddriv_board_device_state::harddriv_board_device_state(const machine_config &m { } -MACHINE_CONFIG_MEMBER( harddriv_board_device_state::device_add_mconfig ) +MACHINE_CONFIG_START(harddriv_board_device_state::device_add_mconfig) MCFG_FRAGMENT_ADD( driver_msp ) /* basic machine hardware */ /* original driver board with MSP */ MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */ @@ -1667,7 +1681,7 @@ harddrivc_board_device_state::harddrivc_board_device_state(const machine_config { } -MACHINE_CONFIG_MEMBER( harddrivc_board_device_state::device_add_mconfig ) +MACHINE_CONFIG_START(harddrivc_board_device_state::device_add_mconfig) MCFG_FRAGMENT_ADD( multisync_msp ) /* basic machine hardware */ /* multisync board with MSP */ @@ -1708,7 +1722,7 @@ racedrivb1_board_device_state::racedrivb1_board_device_state(const machine_confi { } -MACHINE_CONFIG_MEMBER( racedriv_board_device_state::device_add_mconfig ) +MACHINE_CONFIG_START(racedriv_board_device_state::device_add_mconfig) MCFG_FRAGMENT_ADD( driver_nomsp ) /* basic machine hardware */ /* original driver board without MSP */ @@ -1763,7 +1777,7 @@ racedrivc_panorama_side_board_device_state::racedrivc_panorama_side_board_device { } -MACHINE_CONFIG_MEMBER( racedrivc_board_device_state::device_add_mconfig ) +MACHINE_CONFIG_START(racedrivc_board_device_state::device_add_mconfig) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1773,7 +1787,7 @@ MACHINE_CONFIG_MEMBER( racedrivc_board_device_state::device_add_mconfig ) MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */ MACHINE_CONFIG_END -MACHINE_CONFIG_MEMBER( racedrivc_panorama_side_board_device_state::device_add_mconfig ) +MACHINE_CONFIG_START(racedrivc_panorama_side_board_device_state::device_add_mconfig) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1798,7 +1812,7 @@ stunrun_board_device_state::stunrun_board_device_state(const machine_config &mco { } -MACHINE_CONFIG_MEMBER( stunrun_board_device_state::device_add_mconfig ) +MACHINE_CONFIG_START(stunrun_board_device_state::device_add_mconfig) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1864,7 +1878,7 @@ steeltalp_board_device_state::steeltalp_board_device_state(const machine_config { } -MACHINE_CONFIG_MEMBER( steeltal_board_device_state::device_add_mconfig ) +MACHINE_CONFIG_START(steeltal_board_device_state::device_add_mconfig) MCFG_FRAGMENT_ADD( multisync_msp ) /* basic machine hardware */ /* multisync board with MSP */ @@ -1902,7 +1916,7 @@ strtdriv_board_device_state::strtdriv_board_device_state(const machine_config &m { } -MACHINE_CONFIG_MEMBER( strtdriv_board_device_state::device_add_mconfig ) +MACHINE_CONFIG_START(strtdriv_board_device_state::device_add_mconfig) MCFG_FRAGMENT_ADD( multisync_nomsp ) @@ -1946,7 +1960,7 @@ hdrivairp_board_device_state::hdrivairp_board_device_state(const machine_config { } -MACHINE_CONFIG_MEMBER( hdrivair_board_device_state::device_add_mconfig ) +MACHINE_CONFIG_START(hdrivair_board_device_state::device_add_mconfig) MCFG_FRAGMENT_ADD( multisync2 ) @@ -1956,55 +1970,55 @@ MACHINE_CONFIG_MEMBER( hdrivair_board_device_state::device_add_mconfig ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( harddriv_machine ) +MACHINE_CONFIG_START(harddriv_new_state::harddriv_machine) MCFG_DEVICE_ADD("mainpcb", HARDDRIV_BOARD, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( harddrivc_machine ) +MACHINE_CONFIG_START(harddriv_new_state::harddrivc_machine) MCFG_DEVICE_ADD("mainpcb", HARDDRIVC_BOARD, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( racedriv_machine ) +MACHINE_CONFIG_START(harddriv_new_state::racedriv_machine) MCFG_DEVICE_ADD("mainpcb", RACEDRIV_BOARD, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( racedrivb1_machine ) +MACHINE_CONFIG_START(harddriv_new_state::racedrivb1_machine) MCFG_DEVICE_ADD("mainpcb", RACEDRIVB1_BOARD, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( racedrivc_machine ) +MACHINE_CONFIG_START(harddriv_new_state::racedrivc_machine) MCFG_DEVICE_ADD("mainpcb", RACEDRIVC_BOARD, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( racedrivc1_machine ) +MACHINE_CONFIG_START(harddriv_new_state::racedrivc1_machine) MCFG_DEVICE_ADD("mainpcb", RACEDRIVC1_BOARD, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( stunrun_machine ) +MACHINE_CONFIG_START(harddriv_new_state::stunrun_machine) MCFG_DEVICE_ADD("mainpcb", STUNRUN_BOARD, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( strtdriv_machine ) +MACHINE_CONFIG_START(harddriv_new_state::strtdriv_machine) MCFG_DEVICE_ADD("mainpcb", STRTDRIV_BOARD, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hdrivair_machine ) +MACHINE_CONFIG_START(harddriv_new_state::hdrivair_machine) MCFG_DEVICE_ADD("mainpcb", HDRIVAIR_BOARD, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hdrivairp_machine ) +MACHINE_CONFIG_START(harddriv_new_state::hdrivairp_machine) MCFG_DEVICE_ADD("mainpcb", HDRIVAIRP_BOARD, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( steeltal_machine ) +MACHINE_CONFIG_START(harddriv_new_state::steeltal_machine) MCFG_DEVICE_ADD("mainpcb", STEELTAL_BOARD, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( steeltal1_machine ) +MACHINE_CONFIG_START(harddriv_new_state::steeltal1_machine) MCFG_DEVICE_ADD("mainpcb", STEELTAL1_BOARD, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( steeltalp_machine ) +MACHINE_CONFIG_START(harddriv_new_state::steeltalp_machine) MCFG_DEVICE_ADD("mainpcb", STEELTALP_BOARD, 0) MACHINE_CONFIG_END @@ -2015,7 +2029,7 @@ WRITE_LINE_MEMBER(harddriv_new_state::tx_a) m_rightpcb->get_duart()->rx_a_w(state); } -static MACHINE_CONFIG_START( racedriv_panorama_machine ) +MACHINE_CONFIG_START(harddriv_new_state::racedriv_panorama_machine) MCFG_DEVICE_ADD("mainpcb", RACEDRIV_BOARD, 0) MCFG_DEVICE_ADD("leftpcb", RACEDRIVC_PANORAMA_SIDE_BOARD, 0) MCFG_DEVICE_ADD("rightpcb", RACEDRIVC_PANORAMA_SIDE_BOARD, 0) diff --git a/src/mame/drivers/harriet.cpp b/src/mame/drivers/harriet.cpp index 5fd82f1a3ac..0eb08e4051d 100644 --- a/src/mame/drivers/harriet.cpp +++ b/src/mame/drivers/harriet.cpp @@ -40,6 +40,7 @@ public: DECLARE_READ8_MEMBER(keyboard_status_r); void kbd_put(u8 data); + void harriet(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -193,7 +194,7 @@ void harriet_state::machine_reset() } -static MACHINE_CONFIG_START( harriet ) +MACHINE_CONFIG_START(harriet_state::harriet) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68010,XTAL_8MHz) // TODO: clock diff --git a/src/mame/drivers/hazelgr.cpp b/src/mame/drivers/hazelgr.cpp index b26f5099089..d70189a1e6b 100644 --- a/src/mame/drivers/hazelgr.cpp +++ b/src/mame/drivers/hazelgr.cpp @@ -22,6 +22,7 @@ public: , m_maincpu(*this, "maincpu") { } + void haze(machine_config &config); private: required_device m_maincpu; }; @@ -65,7 +66,7 @@ static const z80_daisy_config daisy_chain[] = }; // All frequencies are guesswork, in an effort to get something to happen -static MACHINE_CONFIG_START( haze ) +MACHINE_CONFIG_START(haze_state::haze) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,2000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/hazeltin.cpp b/src/mame/drivers/hazeltin.cpp index d8a68012ecc..a4d2aea8542 100644 --- a/src/mame/drivers/hazeltin.cpp +++ b/src/mame/drivers/hazeltin.cpp @@ -165,6 +165,7 @@ public: NETDEV_ANALOG_CALLBACK_MEMBER(vblank_cb); NETDEV_ANALOG_CALLBACK_MEMBER(tvinterq_cb); + void hazl1500(machine_config &config); private: required_device m_maincpu; required_device m_video_board; @@ -686,7 +687,7 @@ static GFXDECODE_START( hazl1500 ) GFXDECODE_ENTRY( CHAR_EPROM_TAG, 0x0000, hazl1500_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( hazl1500 ) +MACHINE_CONFIG_START(hazl1500_state::hazl1500) /* basic machine hardware */ MCFG_CPU_ADD(CPU_TAG, I8080, XTAL_18MHz/9) // 18MHz crystal on schematics, using an i8224 clock gen/driver IC MCFG_CPU_PROGRAM_MAP(hazl1500_mem) diff --git a/src/mame/drivers/hcastle.cpp b/src/mame/drivers/hcastle.cpp index 55509e598f0..757b15f99c0 100644 --- a/src/mame/drivers/hcastle.cpp +++ b/src/mame/drivers/hcastle.cpp @@ -188,7 +188,7 @@ void hcastle_state::machine_reset() m_old_pf2 = -1; } -static MACHINE_CONFIG_START( hcastle ) +MACHINE_CONFIG_START(hcastle_state::hcastle) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* Derived from 24 MHz clock */ diff --git a/src/mame/drivers/headonb.cpp b/src/mame/drivers/headonb.cpp index aa7dda8b505..ba47def1eb6 100644 --- a/src/mame/drivers/headonb.cpp +++ b/src/mame/drivers/headonb.cpp @@ -56,6 +56,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TILE_GET_INFO_MEMBER(get_tile_info); + void headonb(machine_config &config); }; @@ -157,7 +158,7 @@ static GFXDECODE_START( headonb ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( headonb ) +MACHINE_CONFIG_START(headonb_state::headonb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080A, XTAL_20MHz / 10) // divider guessed diff --git a/src/mame/drivers/hec2hrp.cpp b/src/mame/drivers/hec2hrp.cpp index c99902e50e3..d2c74688bc8 100644 --- a/src/mame/drivers/hec2hrp.cpp +++ b/src/mame/drivers/hec2hrp.cpp @@ -401,7 +401,7 @@ SLOT_INTERFACE_END /******************************************************************************/ -static MACHINE_CONFIG_START( hec2hr ) +MACHINE_CONFIG_START(hec2hrp_state::hec2hr) /******************************************************************************/ /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz) @@ -436,7 +436,7 @@ static MACHINE_CONFIG_START( hec2hr ) MACHINE_CONFIG_END /*****************************************************************************/ -static MACHINE_CONFIG_START( hec2hrp ) +MACHINE_CONFIG_START(hec2hrp_state::hec2hrp) /*****************************************************************************/ /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz) @@ -475,7 +475,7 @@ static SLOT_INTERFACE_START( hector_floppies ) SLOT_INTERFACE_END /*****************************************************************************/ -static MACHINE_CONFIG_START( hec2mx40 ) +MACHINE_CONFIG_START(hec2hrp_state::hec2mx40) /*****************************************************************************/ /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz) @@ -519,7 +519,7 @@ static MACHINE_CONFIG_START( hec2mx40 ) MACHINE_CONFIG_END /*****************************************************************************/ -static MACHINE_CONFIG_START( hec2hrx ) +MACHINE_CONFIG_START(hec2hrp_state::hec2hrx) /*****************************************************************************/ /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz) @@ -563,7 +563,7 @@ static MACHINE_CONFIG_START( hec2hrx ) MACHINE_CONFIG_END /*****************************************************************************/ -static MACHINE_CONFIG_START( hec2mdhrx ) +MACHINE_CONFIG_START(hec2hrp_state::hec2mdhrx) /*****************************************************************************/ // minidisc /* basic machine hardware */ @@ -605,7 +605,7 @@ static MACHINE_CONFIG_START( hec2mdhrx ) MACHINE_CONFIG_END /*****************************************************************************/ -static MACHINE_CONFIG_START( hec2mx80 ) +MACHINE_CONFIG_START(hec2hrp_state::hec2mx80) /*****************************************************************************/ /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz) diff --git a/src/mame/drivers/hexion.cpp b/src/mame/drivers/hexion.cpp index 70e00475a22..38ae4ee0eca 100644 --- a/src/mame/drivers/hexion.cpp +++ b/src/mame/drivers/hexion.cpp @@ -254,7 +254,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(hexion_state::scanline) } -static MACHINE_CONFIG_START( hexion ) +MACHINE_CONFIG_START(hexion_state::hexion) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* Z80B 6 MHz @ 17F, xtal verified, divider not verified */ @@ -289,7 +289,7 @@ static MACHINE_CONFIG_START( hexion ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hexionb, hexion ) +MACHINE_CONFIG_DERIVED(hexion_state::hexionb, hexion) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(hexionb_map) diff --git a/src/mame/drivers/hh_amis2k.cpp b/src/mame/drivers/hh_amis2k.cpp index b6ce7c7f61d..c8f0c901a7c 100644 --- a/src/mame/drivers/hh_amis2k.cpp +++ b/src/mame/drivers/hh_amis2k.cpp @@ -72,6 +72,7 @@ public: void sound_update(); virtual void machine_start() override; + void wildfire(machine_config &config); }; @@ -306,7 +307,7 @@ static const u8 wildfire_7seg_table[0x10] = }; -static MACHINE_CONFIG_START( wildfire ) +MACHINE_CONFIG_START(wildfire_state::wildfire) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", AMI_S2152, MASTER_CLOCK) diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp index 4658204ac7f..cee52551427 100644 --- a/src/mame/drivers/hh_cop400.cpp +++ b/src/mame/drivers/hh_cop400.cpp @@ -263,6 +263,7 @@ public: DECLARE_WRITE8_MEMBER(write_g); DECLARE_WRITE8_MEMBER(write_l); DECLARE_READ8_MEMBER(read_l); + void ctstein(machine_config &config); }; // handlers @@ -307,7 +308,7 @@ static INPUT_PORTS_START( ctstein ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Blue Button") INPUT_PORTS_END -static MACHINE_CONFIG_START( ctstein ) +MACHINE_CONFIG_START(ctstein_state::ctstein) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COP421, 850000) // approximation - RC osc. R=12K, C=100pF @@ -358,6 +359,9 @@ public: DECLARE_WRITE8_MEMBER(write_l); DECLARE_READ8_MEMBER(read_in); DECLARE_WRITE_LINE_MEMBER(write_so); + void h2hsoccer(machine_config &config); + void h2hbaskb(machine_config &config); + void h2hhockey(machine_config &config); }; // handlers @@ -447,7 +451,7 @@ static INPUT_PORTS_START( h2hsoccer ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) INPUT_PORTS_END -static MACHINE_CONFIG_START( h2hbaskb ) +MACHINE_CONFIG_START(h2hbaskb_state::h2hbaskb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COP420, 850000) // approximation - RC osc. R=43K, C=101pF @@ -467,13 +471,13 @@ static MACHINE_CONFIG_START( h2hbaskb ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( h2hhockey, h2hbaskb ) +MACHINE_CONFIG_DERIVED(h2hbaskb_state::h2hhockey, h2hbaskb) /* basic machine hardware */ MCFG_DEFAULT_LAYOUT(layout_h2hhockey) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( h2hsoccer, h2hbaskb ) +MACHINE_CONFIG_DERIVED(h2hbaskb_state::h2hsoccer, h2hbaskb) /* basic machine hardware */ MCFG_DEFAULT_LAYOUT(layout_h2hsoccer) @@ -507,6 +511,7 @@ public: DECLARE_WRITE_LINE_MEMBER(write_sk); DECLARE_WRITE_LINE_MEMBER(write_so); DECLARE_WRITE8_MEMBER(write_l); + void einvaderc(machine_config &config); }; // handlers @@ -570,7 +575,7 @@ static INPUT_PORTS_START( einvaderc ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( einvaderc ) +MACHINE_CONFIG_START(einvaderc_state::einvaderc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COP444L, 850000) // approximation - RC osc. R=47K, C=100pF @@ -628,6 +633,7 @@ public: DECLARE_READ8_MEMBER(read_l); DECLARE_INPUT_CHANGED_MEMBER(position_changed); + void unkeinv(machine_config &config); }; // handlers @@ -698,7 +704,7 @@ static INPUT_PORTS_START( unkeinv ) PORT_BIT( 0x0f, 0x00, IPT_POSITIONAL ) PORT_POSITIONS(12) PORT_SENSITIVITY(10) PORT_KEYDELTA(1) PORT_CENTERDELTA(0) PORT_CHANGED_MEMBER(DEVICE_SELF, unkeinv_state, position_changed, nullptr) INPUT_PORTS_END -static MACHINE_CONFIG_START( unkeinv ) +MACHINE_CONFIG_START(unkeinv_state::unkeinv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COP421, 850000) // frequency guessed @@ -756,6 +762,7 @@ public: DECLARE_WRITE_LINE_MEMBER(write_so); DECLARE_READ_LINE_MEMBER(read_si); + void lchicken(machine_config &config); protected: virtual void machine_start() override; }; @@ -853,7 +860,7 @@ void lchicken_state::machine_start() save_item(NAME(m_motor_pos)); } -static MACHINE_CONFIG_START( lchicken ) +MACHINE_CONFIG_START(lchicken_state::lchicken) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COP421, 850000) // approximation - RC osc. R=12K, C=100pF @@ -899,6 +906,7 @@ public: DECLARE_WRITE8_MEMBER(write_g); DECLARE_READ8_MEMBER(read_l); DECLARE_READ8_MEMBER(read_g); + void funjacks(machine_config &config); }; // handlers @@ -962,7 +970,7 @@ static INPUT_PORTS_START( funjacks ) PORT_CONFSETTING( 0x08, "2" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( funjacks ) +MACHINE_CONFIG_START(funjacks_state::funjacks) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COP410, 1000000) // approximation - RC osc. R=47K, C=56pF @@ -1010,6 +1018,7 @@ public: DECLARE_WRITE8_MEMBER(write_g); DECLARE_INPUT_CHANGED_MEMBER(reset_button); + void funrlgl(machine_config &config); }; // handlers @@ -1056,7 +1065,7 @@ INPUT_CHANGED_MEMBER(funrlgl_state::reset_button) m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); } -static MACHINE_CONFIG_START( funrlgl ) +MACHINE_CONFIG_START(funrlgl_state::funrlgl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COP410, 1000000) // approximation - RC osc. R=51K, C=91pF @@ -1102,6 +1111,7 @@ public: DECLARE_WRITE8_MEMBER(write_d); DECLARE_WRITE8_MEMBER(write_g); DECLARE_READ8_MEMBER(read_in); + void mdallas(machine_config &config); }; // handlers @@ -1191,7 +1201,7 @@ static INPUT_PORTS_START( mdallas ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_CODE(KEYCODE_W) PORT_NAME("North") // N INPUT_PORTS_END -static MACHINE_CONFIG_START( mdallas ) +MACHINE_CONFIG_START(mdallas_state::mdallas) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COP444L, 1000000) // approximation - RC osc. R=57K, C=101pF @@ -1236,6 +1246,7 @@ public: DECLARE_WRITE8_MEMBER(write_d); DECLARE_WRITE8_MEMBER(write_l); DECLARE_READ8_MEMBER(read_l); + void plus1(machine_config &config); }; // handlers @@ -1274,7 +1285,7 @@ static INPUT_PORTS_START( plus1 ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( plus1 ) +MACHINE_CONFIG_START(plus1_state::plus1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COP410, 1000000) // approximation - RC osc. R=51K, C=100pF @@ -1328,6 +1339,7 @@ public: DECLARE_WRITE8_MEMBER(write_d); DECLARE_WRITE8_MEMBER(write_l); DECLARE_READ8_MEMBER(read_g); + void lightfgt(machine_config &config); }; // handlers @@ -1401,7 +1413,7 @@ static INPUT_PORTS_START( lightfgt ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_COCKTAIL INPUT_PORTS_END -static MACHINE_CONFIG_START( lightfgt ) +MACHINE_CONFIG_START(lightfgt_state::lightfgt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COP421, 950000) // approximation - RC osc. R=82K, C=56pF @@ -1445,6 +1457,7 @@ public: DECLARE_READ8_MEMBER(read_l); DECLARE_READ8_MEMBER(read_in); DECLARE_WRITE_LINE_MEMBER(write_so); + void bship82(machine_config &config); }; // handlers @@ -1554,7 +1567,7 @@ base pulled high with 4.7K resistor, connects directly to G3, 1K resistor to G2, */ -static MACHINE_CONFIG_START( bship82 ) +MACHINE_CONFIG_START(bship82_state::bship82) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COP420, 750000) // approximation - RC osc. R=14K, C=100pF @@ -1603,6 +1616,7 @@ public: DECLARE_WRITE8_MEMBER(write_l); DECLARE_READ8_MEMBER(read_in); DECLARE_WRITE_LINE_MEMBER(write_sk); + void qkracer(machine_config &config); }; // handlers @@ -1685,7 +1699,7 @@ static INPUT_PORTS_START( qkracer ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_CODE(KEYCODE_R) PORT_NAME("Tables") INPUT_PORTS_END -static MACHINE_CONFIG_START( qkracer ) +MACHINE_CONFIG_START(qkracer_state::qkracer) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", COP420, 1000000) // approximation - RC osc. R=47K, C=100pF diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp index 2d40ce9e66f..8599e3506c4 100644 --- a/src/mame/drivers/hh_hmcs40.cpp +++ b/src/mame/drivers/hh_hmcs40.cpp @@ -364,6 +364,7 @@ public: DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); DECLARE_READ8_MEMBER(input_r); + void bambball(machine_config &config); }; // handlers @@ -429,7 +430,7 @@ static INPUT_PORTS_START( bambball ) PORT_CONFSETTING( 0x00, "2" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( bambball ) +MACHINE_CONFIG_START(bambball_state::bambball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38750, 400000) // approximation @@ -477,6 +478,7 @@ public: DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); DECLARE_READ8_MEMBER(input_r); + void bmboxing(machine_config &config); }; // handlers @@ -564,7 +566,7 @@ static INPUT_PORTS_START( bmboxing ) PORT_BIT( 0xfff8, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( bmboxing ) +MACHINE_CONFIG_START(bmboxing_state::bmboxing) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38750, 400000) // approximation @@ -615,6 +617,7 @@ public: void update_int1(); DECLARE_INPUT_CHANGED_MEMBER(input_changed); + void bfriskyt(machine_config &config); }; // handlers @@ -688,7 +691,7 @@ INPUT_CHANGED_MEMBER(bfriskyt_state::input_changed) update_int1(); } -static MACHINE_CONFIG_START( bfriskyt ) +MACHINE_CONFIG_START(bfriskyt_state::bfriskyt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation @@ -741,6 +744,7 @@ public: DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); DECLARE_READ16_MEMBER(input_r); + void packmon(machine_config &config); }; // handlers @@ -797,7 +801,7 @@ static INPUT_PORTS_START( packmon ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) INPUT_PORTS_END -static MACHINE_CONFIG_START( packmon ) +MACHINE_CONFIG_START(packmon_state::packmon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation @@ -855,6 +859,7 @@ public: void update_int0(); DECLARE_INPUT_CHANGED_MEMBER(input_changed); + void msthawk(machine_config &config); }; // handlers @@ -931,7 +936,7 @@ INPUT_CHANGED_MEMBER(msthawk_state::input_changed) update_int0(); } -static MACHINE_CONFIG_START( msthawk ) +MACHINE_CONFIG_START(msthawk_state::msthawk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation @@ -981,6 +986,7 @@ public: void update_int1(); DECLARE_INPUT_CHANGED_MEMBER(input_changed); + void bzaxxon(machine_config &config); }; // handlers @@ -1051,7 +1057,7 @@ INPUT_CHANGED_MEMBER(bzaxxon_state::input_changed) update_int1(); } -static MACHINE_CONFIG_START( bzaxxon ) +MACHINE_CONFIG_START(bzaxxon_state::bzaxxon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38800, 450000) // approximation @@ -1100,6 +1106,7 @@ public: void update_int0(); DECLARE_INPUT_CHANGED_MEMBER(input_changed); + void zackman(machine_config &config); }; // handlers @@ -1166,7 +1173,7 @@ INPUT_CHANGED_MEMBER(zackman_state::input_changed) update_int0(); } -static MACHINE_CONFIG_START( zackman ) +MACHINE_CONFIG_START(zackman_state::zackman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -1219,6 +1226,7 @@ public: void update_int0(); DECLARE_INPUT_CHANGED_MEMBER(input_changed); + void bpengo(machine_config &config); }; // handlers @@ -1292,7 +1300,7 @@ INPUT_CHANGED_MEMBER(bpengo_state::input_changed) update_int0(); } -static MACHINE_CONFIG_START( bpengo ) +MACHINE_CONFIG_START(bpengo_state::bpengo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -1346,6 +1354,7 @@ public: void update_int0(); DECLARE_INPUT_CHANGED_MEMBER(input_changed); + void bbtime(machine_config &config); }; // handlers @@ -1416,7 +1425,7 @@ INPUT_CHANGED_MEMBER(bbtime_state::input_changed) update_int0(); } -static MACHINE_CONFIG_START( bbtime ) +MACHINE_CONFIG_START(bbtime_state::bbtime) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -1465,6 +1474,7 @@ public: DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); + void bdoramon(machine_config &config); }; // handlers @@ -1515,7 +1525,7 @@ static INPUT_PORTS_START( bdoramon ) PORT_CONFSETTING( 0x08, DEF_STR( On ) ) INPUT_PORTS_END -static MACHINE_CONFIG_START( bdoramon ) +MACHINE_CONFIG_START(bdoramon_state::bdoramon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation @@ -1563,6 +1573,7 @@ public: DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); + void bultrman(machine_config &config); }; // handlers @@ -1607,7 +1618,7 @@ static INPUT_PORTS_START( bultrman ) PORT_BIT( 0xff8f, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( bultrman ) +MACHINE_CONFIG_START(bultrman_state::bultrman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38800, 350000) // approximation @@ -1655,6 +1666,7 @@ public: void prepare_display(); DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); + void machiman(machine_config &config); }; // handlers @@ -1695,7 +1707,7 @@ static INPUT_PORTS_START( machiman ) PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY INPUT_PORTS_END -static MACHINE_CONFIG_START( machiman ) +MACHINE_CONFIG_START(machiman_state::machiman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -1753,6 +1765,7 @@ public: DECLARE_WRITE8_MEMBER(sound_w); DECLARE_WRITE8_MEMBER(sound2_w); DECLARE_WRITE16_MEMBER(speaker_w); + void pairmtch(machine_config &config); }; // handlers: maincpu side @@ -1842,7 +1855,7 @@ static INPUT_PORTS_START( pairmtch ) PORT_BIT( 0x86bf, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( pairmtch ) +MACHINE_CONFIG_START(pairmtch_state::pairmtch) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -1900,6 +1913,7 @@ public: DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); DECLARE_READ16_MEMBER(input_r); + void alnattck(machine_config &config); }; // handlers @@ -1963,7 +1977,7 @@ static INPUT_PORTS_START( alnattck ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Fire") INPUT_PORTS_END -static MACHINE_CONFIG_START( alnattck ) +MACHINE_CONFIG_START(alnattck_state::alnattck) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation @@ -2017,6 +2031,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(speaker_decay_sim); double m_speaker_volume; + void cdkong(machine_config &config); protected: virtual void machine_start() override; }; @@ -2089,7 +2104,7 @@ void cdkong_state::machine_start() save_item(NAME(m_speaker_volume)); } -static MACHINE_CONFIG_START( cdkong ) +MACHINE_CONFIG_START(cdkong_state::cdkong) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -2151,6 +2166,7 @@ public: DECLARE_READ8_MEMBER(input_r); DECLARE_INPUT_CHANGED_MEMBER(player_switch); + void cgalaxn(machine_config &config); }; // handlers @@ -2221,7 +2237,7 @@ INPUT_CHANGED_MEMBER(cgalaxn_state::player_switch) prepare_display(); } -static MACHINE_CONFIG_START( cgalaxn ) +MACHINE_CONFIG_START(cgalaxn_state::cgalaxn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation @@ -2280,6 +2296,7 @@ public: DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); DECLARE_READ8_MEMBER(input_r); + void cpacman(machine_config &config); }; // handlers @@ -2339,7 +2356,7 @@ static INPUT_PORTS_START( cpacman ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) INPUT_PORTS_END -static MACHINE_CONFIG_START( cpacman ) +MACHINE_CONFIG_START(cpacman_state::cpacman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -2396,6 +2413,7 @@ public: DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); DECLARE_READ8_MEMBER(input_r); + void cmspacmn(machine_config &config); }; // handlers @@ -2455,7 +2473,7 @@ static INPUT_PORTS_START( cmspacmn ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) INPUT_PORTS_END -static MACHINE_CONFIG_START( cmspacmn ) +MACHINE_CONFIG_START(cmspacmn_state::cmspacmn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -2510,6 +2528,7 @@ public: DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); DECLARE_READ16_MEMBER(input_r); + void sag(machine_config &config); }; // handlers @@ -2601,7 +2620,7 @@ static INPUT_PORTS_START( sag ) PORT_CONFSETTING( 0x02, "2" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( sag ) +MACHINE_CONFIG_START(sag_state::sag) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38800, 450000) // approximation @@ -2645,6 +2664,7 @@ public: DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); DECLARE_READ8_MEMBER(input_r); + void egalaxn2(machine_config &config); }; // handlers @@ -2715,7 +2735,7 @@ static INPUT_PORTS_START( egalaxn2 ) PORT_CONFSETTING( 0x04, "2" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( egalaxn2 ) +MACHINE_CONFIG_START(egalaxn2_state::egalaxn2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -2763,6 +2783,7 @@ public: epacman2_state(const machine_config &mconfig, device_type type, const char *tag) : egalaxn2_state(mconfig, type, tag) { } + void epacman2(machine_config &config); }; // handlers are identical to Galaxian 2, so we can use those @@ -2799,7 +2820,7 @@ static INPUT_PORTS_START( epacman2 ) PORT_CONFSETTING( 0x00, "2" ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( epacman2, egalaxn2 ) +MACHINE_CONFIG_DERIVED(epacman2_state::epacman2, egalaxn2) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -2842,6 +2863,7 @@ public: void update_int(); DECLARE_INPUT_CHANGED_MEMBER(input_changed); + void eturtles(machine_config &config); protected: virtual void machine_start() override; }; @@ -2963,7 +2985,7 @@ void eturtles_state::machine_start() save_item(NAME(m_cop_irq)); } -static MACHINE_CONFIG_START( eturtles ) +MACHINE_CONFIG_START(eturtles_state::eturtles) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -3022,6 +3044,7 @@ public: virtual void prepare_display() override; DECLARE_READ8_MEMBER(cop_data_r); + void estargte(machine_config &config); }; // handlers (most of it is in eturtles_state above) @@ -3072,7 +3095,7 @@ static INPUT_PORTS_START( estargte ) PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( estargte ) +MACHINE_CONFIG_START(estargte_state::estargte) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -3133,6 +3156,7 @@ public: DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); DECLARE_READ16_MEMBER(input_r); + void ghalien(machine_config &config); }; // handlers @@ -3197,7 +3221,7 @@ static INPUT_PORTS_START( ghalien ) PORT_CONFSETTING( 0x8000, "Professional" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ghalien ) +MACHINE_CONFIG_START(ghalien_state::ghalien) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation @@ -3251,6 +3275,7 @@ public: void update_int1(); DECLARE_INPUT_CHANGED_MEMBER(input_changed); + void gckong(machine_config &config); }; // handlers @@ -3323,7 +3348,7 @@ INPUT_CHANGED_MEMBER(gckong_state::input_changed) update_int1(); } -static MACHINE_CONFIG_START( gckong ) +MACHINE_CONFIG_START(gckong_state::gckong) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation @@ -3373,6 +3398,7 @@ public: void update_int1(); DECLARE_INPUT_CHANGED_MEMBER(input_changed); + void gdigdug(machine_config &config); }; // handlers @@ -3441,7 +3467,7 @@ INPUT_CHANGED_MEMBER(gdigdug_state::input_changed) update_int1(); } -static MACHINE_CONFIG_START( gdigdug ) +MACHINE_CONFIG_START(gdigdug_state::gdigdug) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -3497,6 +3523,7 @@ public: DECLARE_WRITE16_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(speaker_w); DECLARE_READ8_MEMBER(input_r); + void mwcbaseb(machine_config &config); }; // handlers @@ -3602,7 +3629,7 @@ INPUT_PORTS_END static const s16 mwcbaseb_speaker_levels[] = { 0, 0x3fff, -0x4000, 0, -0x4000, 0, -0x8000, -0x4000 }; -static MACHINE_CONFIG_START( mwcbaseb ) +MACHINE_CONFIG_START(mwcbaseb_state::mwcbaseb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -3651,6 +3678,7 @@ public: DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); + void pbqbert(machine_config &config); }; // handlers @@ -3689,7 +3717,7 @@ static INPUT_PORTS_START( pbqbert ) PORT_BIT( 0xe1ff, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( pbqbert ) +MACHINE_CONFIG_START(pbqbert_state::pbqbert) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation @@ -3743,6 +3771,7 @@ public: void update_int0(); DECLARE_INPUT_CHANGED_MEMBER(input_changed); + void kingman(machine_config &config); }; // handlers @@ -3813,7 +3842,7 @@ INPUT_CHANGED_MEMBER(kingman_state::input_changed) update_int0(); } -static MACHINE_CONFIG_START( kingman ) +MACHINE_CONFIG_START(kingman_state::kingman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation @@ -3863,6 +3892,7 @@ public: void update_int1(); DECLARE_INPUT_CHANGED_MEMBER(input_changed); + void tmtron(machine_config &config); }; // handlers @@ -3933,7 +3963,7 @@ INPUT_CHANGED_MEMBER(tmtron_state::input_changed) update_int1(); } -static MACHINE_CONFIG_START( tmtron ) +MACHINE_CONFIG_START(tmtron_state::tmtron) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation @@ -3983,6 +4013,7 @@ public: DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE16_MEMBER(grid_w); + void vinvader(machine_config &config); }; // handlers @@ -4026,7 +4057,7 @@ static INPUT_PORTS_START( vinvader ) PORT_BIT( 0xfff5, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( vinvader ) +MACHINE_CONFIG_START(vinvader_state::vinvader) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD38750, 400000) // approximation diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp index d1f05423a54..30369acbeab 100644 --- a/src/mame/drivers/hh_melps4.cpp +++ b/src/mame/drivers/hh_melps4.cpp @@ -229,6 +229,7 @@ public: DECLARE_WRITE16_MEMBER(grid_w); DECLARE_WRITE_LINE_MEMBER(speaker_w); DECLARE_READ16_MEMBER(input_r); + void cfrogger(machine_config &config); }; // handlers @@ -294,7 +295,7 @@ static INPUT_PORTS_START( cfrogger ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_melps4_state, reset_button, nullptr) INPUT_PORTS_END -static MACHINE_CONFIG_START( cfrogger ) +MACHINE_CONFIG_START(cfrogger_state::cfrogger) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M58846, XTAL_600kHz) @@ -344,6 +345,7 @@ public: DECLARE_WRITE16_MEMBER(grid_w); DECLARE_WRITE_LINE_MEMBER(speaker_w); DECLARE_READ16_MEMBER(input_r); + void gjungler(machine_config &config); }; // handlers @@ -409,7 +411,7 @@ static INPUT_PORTS_START( gjungler ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_melps4_state, reset_button, nullptr) INPUT_PORTS_END -static MACHINE_CONFIG_START( gjungler ) +MACHINE_CONFIG_START(gjungler_state::gjungler) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M58846, XTAL_600kHz) diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp index 1bd057aa97d..4f45c74278c 100644 --- a/src/mame/drivers/hh_pic16.cpp +++ b/src/mame/drivers/hh_pic16.cpp @@ -307,6 +307,7 @@ public: DECLARE_READ8_MEMBER(read_a); DECLARE_WRITE8_MEMBER(write_b); DECLARE_WRITE8_MEMBER(write_c); + void touchme(machine_config &config); }; // handlers @@ -377,7 +378,7 @@ INPUT_PORTS_END static const s16 touchme_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 }; -static MACHINE_CONFIG_START( touchme ) +MACHINE_CONFIG_START(touchme_state::touchme) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PIC1655, 300000) // approximation - RC osc. R=100K, C=47pF @@ -423,6 +424,7 @@ public: DECLARE_WRITE8_MEMBER(write_c); DECLARE_INPUT_CHANGED_MEMBER(reset_button); + void pabball(machine_config &config); }; // handlers @@ -485,7 +487,7 @@ INPUT_CHANGED_MEMBER(pabball_state::reset_button) m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); } -static MACHINE_CONFIG_START( pabball ) +MACHINE_CONFIG_START(pabball_state::pabball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PIC1655, 1200000) // approximation - RC osc. R=18K, C=27pF @@ -528,6 +530,7 @@ public: DECLARE_WRITE8_MEMBER(write_b); DECLARE_READ8_MEMBER(read_c); DECLARE_WRITE8_MEMBER(write_c); + void melodym(machine_config &config); }; // handlers @@ -599,7 +602,7 @@ static INPUT_PORTS_START( melodym ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_CODE(KEYCODE_0) PORT_NAME("Note") INPUT_PORTS_END -static MACHINE_CONFIG_START( melodym ) +MACHINE_CONFIG_START(melodym_state::melodym) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PIC1655, 1000000) // approximation @@ -647,6 +650,7 @@ public: void update_speaker(); DECLARE_WRITE8_MEMBER(write_b); DECLARE_WRITE8_MEMBER(write_c); + void maniac(machine_config &config); }; // handlers @@ -698,7 +702,7 @@ INPUT_PORTS_END static const s16 maniac_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 }; -static MACHINE_CONFIG_START( maniac ) +MACHINE_CONFIG_START(maniac_state::maniac) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PIC1655, 1000000) // approximation - RC osc. R=~13.4K, C=470pF @@ -750,6 +754,7 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(speed_switch); + void matchme(machine_config &config); protected: virtual void machine_reset() override; }; @@ -846,7 +851,7 @@ void matchme_state::machine_reset() set_clock(); } -static MACHINE_CONFIG_START( matchme ) +MACHINE_CONFIG_START(matchme_state::matchme) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PIC1655, 1200000) // see set_clock @@ -906,6 +911,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(speaker_decay_sim); double m_speaker_volume; + void leboom(machine_config &config); protected: virtual void machine_start() override; }; @@ -1001,7 +1007,7 @@ void leboom_state::machine_start() save_item(NAME(m_speaker_volume)); } -static MACHINE_CONFIG_START( leboom ) +MACHINE_CONFIG_START(leboom_state::leboom) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PIC1655, 1000000) // approximation @@ -1046,6 +1052,7 @@ public: DECLARE_READ8_MEMBER(read_a); DECLARE_WRITE8_MEMBER(write_b); DECLARE_WRITE8_MEMBER(write_c); + void tbaskb(machine_config &config); }; // handlers @@ -1110,7 +1117,7 @@ static INPUT_PORTS_START( tbaskb ) PORT_CONFSETTING( 0x00, "2" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( tbaskb ) +MACHINE_CONFIG_START(tbaskb_state::tbaskb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PIC1655, 950000) // approximation - RC osc. R=18K, C=47pF @@ -1157,6 +1164,7 @@ public: DECLARE_WRITE8_MEMBER(write_b); DECLARE_WRITE8_MEMBER(write_c); DECLARE_WRITE8_MEMBER(write_d); + void rockpin(machine_config &config); }; // handlers @@ -1218,7 +1226,7 @@ INPUT_PORTS_END static const s16 rockpin_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 }; -static MACHINE_CONFIG_START( rockpin ) +MACHINE_CONFIG_START(rockpin_state::rockpin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PIC1650, 450000) // approximation - RC osc. R=47K, C=47pF @@ -1271,6 +1279,7 @@ public: DECLARE_READ8_MEMBER(read_a); DECLARE_WRITE8_MEMBER(write_b); DECLARE_WRITE8_MEMBER(write_c); + void hccbaskb(machine_config &config); }; // handlers @@ -1335,7 +1344,7 @@ static INPUT_PORTS_START( hccbaskb ) PORT_CONFSETTING( 0x00, "2" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( hccbaskb ) +MACHINE_CONFIG_START(hccbaskb_state::hccbaskb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PIC1655, 950000) // approximation - RC osc. R=15K, C=47pF @@ -1384,6 +1393,7 @@ public: DECLARE_READ8_MEMBER(read_a); DECLARE_WRITE8_MEMBER(write_b); DECLARE_WRITE8_MEMBER(write_c); + void ttfball(machine_config &config); }; // handlers @@ -1486,7 +1496,7 @@ static INPUT_PORTS_START( ttfballa ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_16WAY INPUT_PORTS_END -static MACHINE_CONFIG_START( ttfball ) +MACHINE_CONFIG_START(ttfball_state::ttfball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PIC1655, 1000000) // approximation - RC osc. R=27K(set 1) or 33K(set 2), C=68pF @@ -1532,6 +1542,7 @@ public: DECLARE_WRITE8_MEMBER(write_b); DECLARE_WRITE8_MEMBER(write_c); DECLARE_WRITE8_MEMBER(write_d); + void uspbball(machine_config &config); }; // handlers @@ -1589,7 +1600,7 @@ static INPUT_PORTS_START( uspbball ) PORT_CONFSETTING( 0x00, "2" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( uspbball ) +MACHINE_CONFIG_START(uspbball_state::uspbball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PIC1650, 1000000) // approximation - RC osc. R=22K, C=47pF @@ -1643,6 +1654,7 @@ public: DECLARE_WRITE8_MEMBER(write_b); DECLARE_WRITE8_MEMBER(write_c); DECLARE_WRITE8_MEMBER(write_d); + void us2pfball(machine_config &config); }; // handlers @@ -1723,7 +1735,7 @@ static INPUT_PORTS_START( us2pfball ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START ) PORT_NAME("Status/Score") // S INPUT_PORTS_END -static MACHINE_CONFIG_START( us2pfball ) +MACHINE_CONFIG_START(us2pfball_state::us2pfball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PIC1650, 800000) // approximation - RC osc. R=39K, C=75pF diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp index 006a46dd5a6..a8fcdeb5027 100644 --- a/src/mame/drivers/hh_sm510.cpp +++ b/src/mame/drivers/hh_sm510.cpp @@ -234,6 +234,7 @@ public: { m_inp_lines = 3; } + void kdribble(machine_config &config); }; // config @@ -259,7 +260,7 @@ static INPUT_PORTS_START( kdribble ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear") INPUT_PORTS_END -static MACHINE_CONFIG_START( kdribble ) +MACHINE_CONFIG_START(kdribble_state::kdribble) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -305,6 +306,7 @@ public: { m_inp_lines = 3; } + void ktopgun(machine_config &config); }; // config @@ -330,7 +332,7 @@ static INPUT_PORTS_START( ktopgun ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear") INPUT_PORTS_END -static MACHINE_CONFIG_START( ktopgun ) +MACHINE_CONFIG_START(ktopgun_state::ktopgun) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -378,6 +380,7 @@ public: { m_inp_lines = 3; } + void kcontra(machine_config &config); }; // config @@ -403,7 +406,7 @@ static INPUT_PORTS_START( kcontra ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear") INPUT_PORTS_END -static MACHINE_CONFIG_START( kcontra ) +MACHINE_CONFIG_START(kcontra_state::kcontra) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) @@ -448,6 +451,7 @@ public: { m_inp_lines = 3; } + void ktmnt(machine_config &config); }; // config @@ -474,7 +478,7 @@ static INPUT_PORTS_START( ktmnt ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear") INPUT_PORTS_END -static MACHINE_CONFIG_START( ktmnt ) +MACHINE_CONFIG_START(ktmnt_state::ktmnt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) @@ -521,6 +525,7 @@ public: { m_inp_lines = 2; } + void kgradius(machine_config &config); }; // config @@ -542,7 +547,7 @@ static INPUT_PORTS_START( kgradius ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear") INPUT_PORTS_END -static MACHINE_CONFIG_START( kgradius ) +MACHINE_CONFIG_START(kgradius_state::kgradius) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) @@ -587,6 +592,7 @@ public: { m_inp_lines = 2; } + void kloneran(machine_config &config); }; // config @@ -608,7 +614,7 @@ static INPUT_PORTS_START( kloneran ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear") INPUT_PORTS_END -static MACHINE_CONFIG_START( kloneran ) +MACHINE_CONFIG_START(kloneran_state::kloneran) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) @@ -653,6 +659,7 @@ public: { m_inp_lines = 3; } + void kblades(machine_config &config); }; // config @@ -678,7 +685,7 @@ static INPUT_PORTS_START( kblades ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear") INPUT_PORTS_END -static MACHINE_CONFIG_START( kblades ) +MACHINE_CONFIG_START(kblades_state::kblades) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) @@ -724,6 +731,7 @@ public: { m_inp_lines = 3; } + void knfl(machine_config &config); }; // config @@ -749,7 +757,7 @@ static INPUT_PORTS_START( knfl ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear") INPUT_PORTS_END -static MACHINE_CONFIG_START( knfl ) +MACHINE_CONFIG_START(knfl_state::knfl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) @@ -792,6 +800,7 @@ public: { m_inp_lines = 3; } + void kbilly(machine_config &config); }; // config @@ -819,7 +828,7 @@ static INPUT_PORTS_START( kbilly ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear") INPUT_PORTS_END -static MACHINE_CONFIG_START( kbilly ) +MACHINE_CONFIG_START(kbilly_state::kbilly) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) @@ -862,6 +871,7 @@ public: { m_inp_lines = 2; } + void kbucky(machine_config &config); }; // config @@ -883,7 +893,7 @@ static INPUT_PORTS_START( kbucky ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear") INPUT_PORTS_END -static MACHINE_CONFIG_START( kbucky ) +MACHINE_CONFIG_START(kbucky_state::kbucky) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) @@ -926,6 +936,7 @@ public: { m_inp_lines = 3; } + void kgarfld(machine_config &config); }; // config @@ -951,7 +962,7 @@ static INPUT_PORTS_START( kgarfld ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear") INPUT_PORTS_END -static MACHINE_CONFIG_START( kgarfld ) +MACHINE_CONFIG_START(kgarfld_state::kgarfld) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) @@ -1003,6 +1014,10 @@ public: { m_inp_lines = 3; } + void exospace(machine_config &config); + void nupogodi(machine_config &config); + void gnw_egg(machine_config &config); + void gnw_mmouse(machine_config &config); }; // config @@ -1039,7 +1054,7 @@ static INPUT_PORTS_START( exospace ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gnw_mmouse ) +MACHINE_CONFIG_START(gnw_mmouse_state::gnw_mmouse) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM5A, XTAL_32_768kHz) @@ -1064,7 +1079,7 @@ static MACHINE_CONFIG_START( gnw_mmouse ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gnw_egg, gnw_mmouse ) +MACHINE_CONFIG_DERIVED(gnw_mmouse_state::gnw_egg, gnw_mmouse) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1072,7 +1087,7 @@ static MACHINE_CONFIG_DERIVED( gnw_egg, gnw_mmouse ) MCFG_SCREEN_VISIBLE_AREA(0, 1694-1, 0, 1080-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nupogodi, gnw_mmouse ) +MACHINE_CONFIG_DERIVED(gnw_mmouse_state::nupogodi, gnw_mmouse) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", KB1013VK12, XTAL_32_768kHz) @@ -1088,7 +1103,7 @@ static MACHINE_CONFIG_DERIVED( nupogodi, gnw_mmouse ) MCFG_SCREEN_VISIBLE_AREA(0, 1715-1, 0, 1080-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( exospace, nupogodi ) +MACHINE_CONFIG_DERIVED(gnw_mmouse_state::exospace, nupogodi) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1117,6 +1132,7 @@ public: { m_inp_lines = 2; } + void gnw_mickdon(machine_config &config); }; // config @@ -1143,7 +1159,7 @@ static INPUT_PORTS_START( gnw_mickdon ) PORT_CONFSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gnw_mickdon ) +MACHINE_CONFIG_START(gnw_mickdon_state::gnw_mickdon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -1195,6 +1211,7 @@ public: { m_inp_lines = 3; } + void gnw_dkong2(machine_config &config); }; // config @@ -1225,7 +1242,7 @@ static INPUT_PORTS_START( gnw_dkong2 ) PORT_CONFSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gnw_dkong2 ) +MACHINE_CONFIG_START(gnw_dkong2_state::gnw_dkong2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -1277,6 +1294,7 @@ public: { m_inp_lines = 2; } + void gnw_mario(machine_config &config); }; // config @@ -1308,7 +1326,7 @@ static INPUT_PORTS_START( gnw_mario ) PORT_CONFSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gnw_mario ) +MACHINE_CONFIG_START(gnw_mario_state::gnw_mario) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -1363,6 +1381,7 @@ public: { m_inp_lines = 3; } + void gnw_dkjr(machine_config &config); }; // config @@ -1398,7 +1417,7 @@ static INPUT_PORTS_START( gnw_dkjr ) PORT_CONFSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gnw_dkjr ) +MACHINE_CONFIG_START(gnw_dkjr_state::gnw_dkjr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -1447,6 +1466,7 @@ public: { m_inp_lines = 2; } + void gnw_mariocm(machine_config &config); }; // config @@ -1478,7 +1498,7 @@ static INPUT_PORTS_START( gnw_mariocm ) PORT_CONFSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gnw_mariocm ) +MACHINE_CONFIG_START(gnw_mariocm_state::gnw_mariocm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -1529,6 +1549,8 @@ public: { m_inp_lines = 3; } + + void gnw_smb(machine_config &config); }; // config @@ -1559,7 +1581,7 @@ static INPUT_PORTS_START( gnw_smb ) PORT_CONFSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gnw_smb ) +MACHINE_CONFIG_START(gnw_smb_state::gnw_smb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) @@ -1606,6 +1628,7 @@ public: { m_inp_lines = 7; } + void gnw_boxing(machine_config &config); }; // config @@ -1659,7 +1682,7 @@ static INPUT_PORTS_START( gnw_boxing ) PORT_CONFSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gnw_boxing ) +MACHINE_CONFIG_START(gnw_boxing_state::gnw_boxing) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) @@ -1713,6 +1736,8 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void trobhood(machine_config &config); + void tgaunt(machine_config &config); }; // config @@ -1766,7 +1791,7 @@ static INPUT_PORTS_START( trobhood ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, input_changed, nullptr) PORT_NAME("Money") INPUT_PORTS_END -static MACHINE_CONFIG_START( tgaunt ) +MACHINE_CONFIG_START(tgaunt_state::tgaunt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -1793,7 +1818,7 @@ static MACHINE_CONFIG_START( tgaunt ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( trobhood, tgaunt ) +MACHINE_CONFIG_DERIVED(tgaunt_state::trobhood, tgaunt) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1825,6 +1850,7 @@ public: m_inp_lines = 5; m_inp_fixed = 5; } + void tddragon(machine_config &config); }; // config @@ -1866,7 +1892,7 @@ static INPUT_PORTS_START( tddragon ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tddragon ) +MACHINE_CONFIG_START(tddragon_state::tddragon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -1914,6 +1940,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tkarnov(machine_config &config); }; // config @@ -1959,7 +1986,7 @@ static INPUT_PORTS_START( tkarnov ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tkarnov ) +MACHINE_CONFIG_START(tkarnov_state::tkarnov) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -2007,6 +2034,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tvindictr(machine_config &config); }; // config @@ -2051,7 +2079,7 @@ static INPUT_PORTS_START( tvindictr ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tvindictr ) +MACHINE_CONFIG_START(tvindictr_state::tvindictr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -2101,6 +2129,7 @@ public: } DECLARE_WRITE8_MEMBER(write_r); + void tgaiden(machine_config &config); }; // handlers @@ -2153,7 +2182,7 @@ static INPUT_PORTS_START( tgaiden ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tgaiden ) +MACHINE_CONFIG_START(tgaiden_state::tgaiden) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -2201,6 +2230,7 @@ public: m_inp_lines = 5; m_inp_fixed = 5; } + void tbatman(machine_config &config); }; // config @@ -2241,7 +2271,7 @@ static INPUT_PORTS_START( tbatman ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tbatman ) +MACHINE_CONFIG_START(tbatman_state::tbatman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -2293,6 +2323,7 @@ public: m_inp_lines = 5; m_inp_fixed = 5; } + void tsharr2(machine_config &config); }; // config @@ -2333,7 +2364,7 @@ static INPUT_PORTS_START( tsharr2 ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tsharr2 ) +MACHINE_CONFIG_START(tsharr2_state::tsharr2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -2381,6 +2412,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tgoldnaxe(machine_config &config); }; // config @@ -2426,7 +2458,7 @@ static INPUT_PORTS_START( tgoldnaxe ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tgoldnaxe ) +MACHINE_CONFIG_START(tgoldnaxe_state::tgoldnaxe) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -2474,6 +2506,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void trobocop2(machine_config &config); }; // config @@ -2519,7 +2552,7 @@ static INPUT_PORTS_START( trobocop2 ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( trobocop2 ) +MACHINE_CONFIG_START(trobocop2_state::trobocop2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -2571,6 +2604,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void taltbeast(machine_config &config); }; // config @@ -2616,7 +2650,7 @@ static INPUT_PORTS_START( taltbeast ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( taltbeast ) +MACHINE_CONFIG_START(taltbeast_state::taltbeast) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -2664,6 +2698,7 @@ public: m_inp_lines = 5; m_inp_fixed = 5; } + void tswampt(machine_config &config); }; // config @@ -2705,7 +2740,7 @@ static INPUT_PORTS_START( tswampt ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tswampt ) +MACHINE_CONFIG_START(tswampt_state::tswampt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -2753,6 +2788,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tmchammer(machine_config &config); }; // config @@ -2799,7 +2835,7 @@ static INPUT_PORTS_START( tmchammer ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tmchammer ) +MACHINE_CONFIG_START(tmchammer_state::tmchammer) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) @@ -2846,6 +2882,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tbtoads(machine_config &config); }; // config @@ -2891,7 +2928,7 @@ static INPUT_PORTS_START( tbtoads ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tbtoads ) +MACHINE_CONFIG_START(tbtoads_state::tbtoads) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -2943,6 +2980,7 @@ public: void update_speaker(); DECLARE_WRITE8_MEMBER(write_r); DECLARE_WRITE8_MEMBER(write_s); + void tsonic(machine_config &config); }; // handlers @@ -3009,7 +3047,7 @@ INPUT_PORTS_END static const s16 tsonic_speaker_levels[] = { 0, 0x7fff/3*1, 0x7fff/3*2, 0x7fff }; -static MACHINE_CONFIG_START( tsonic ) +MACHINE_CONFIG_START(tsonic_state::tsonic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) @@ -3056,6 +3094,7 @@ public: m_inp_lines = 5; m_inp_fixed = 5; } + void tdummies(machine_config &config); }; // config @@ -3097,7 +3136,7 @@ static INPUT_PORTS_START( tdummies ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tdummies ) +MACHINE_CONFIG_START(tdummies_state::tdummies) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -3145,6 +3184,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tsfight2(machine_config &config); }; // config @@ -3190,7 +3230,7 @@ static INPUT_PORTS_START( tsfight2 ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tsfight2 ) +MACHINE_CONFIG_START(tsfight2_state::tsfight2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -3242,6 +3282,8 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + + void tsddragon(machine_config &config); }; // config @@ -3288,7 +3330,7 @@ static INPUT_PORTS_START( tsddragon ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tsddragon ) +MACHINE_CONFIG_START(tsddragon_state::tsddragon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -3338,6 +3380,7 @@ public: } virtual DECLARE_WRITE8_MEMBER(input_w) override; + void tnmarebc(machine_config &config); }; // handlers @@ -3386,7 +3429,7 @@ static INPUT_PORTS_START( tnmarebc ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tnmarebc ) +MACHINE_CONFIG_START(tnmarebc_state::tnmarebc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -3434,6 +3477,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tmkombat(machine_config &config); }; // config @@ -3480,7 +3524,7 @@ static INPUT_PORTS_START( tmkombat ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tmkombat ) +MACHINE_CONFIG_START(tmkombat_state::tmkombat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -3528,6 +3572,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tshadow(machine_config &config); }; // config @@ -3573,7 +3618,7 @@ static INPUT_PORTS_START( tshadow ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tshadow ) +MACHINE_CONFIG_START(tshadow_state::tshadow) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -3621,6 +3666,8 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + + void tskelwarr(machine_config &); }; // config @@ -3666,7 +3713,7 @@ static INPUT_PORTS_START( tskelwarr ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tskelwarr ) +MACHINE_CONFIG_START(tskelwarr_state::tskelwarr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -3714,6 +3761,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tbatfor(machine_config &config); }; // config @@ -3760,7 +3808,7 @@ static INPUT_PORTS_START( tbatfor ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tbatfor ) +MACHINE_CONFIG_START(tbatfor_state::tbatfor) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -3808,6 +3856,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tjdredd(machine_config &config); }; // config @@ -3854,7 +3903,7 @@ static INPUT_PORTS_START( tjdredd ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tjdredd ) +MACHINE_CONFIG_START(tjdredd_state::tjdredd) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -3902,6 +3951,7 @@ public: m_inp_lines = 6; m_inp_fixed = 6; } + void tapollo13(machine_config &config); }; // config @@ -3948,7 +3998,7 @@ static INPUT_PORTS_START( tapollo13 ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tapollo13 ) +MACHINE_CONFIG_START(tapollo13_state::tapollo13) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -3996,6 +4046,7 @@ public: m_inp_lines = 5; m_inp_fixed = 5; } + void tsjam(machine_config &config); }; // config @@ -4037,7 +4088,7 @@ static INPUT_PORTS_START( tsjam ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL") INPUT_PORTS_END -static MACHINE_CONFIG_START( tsjam ) +MACHINE_CONFIG_START(tsjam_state::tsjam) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) // no external XTAL @@ -4084,6 +4135,7 @@ public: { m_inp_lines = 8; } + void tigarden(machine_config &config); }; // config @@ -4140,7 +4192,7 @@ static INPUT_PORTS_START( tigarden ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_VOLUME_DOWN ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, input_changed, nullptr) PORT_NAME("Sound") INPUT_PORTS_END -static MACHINE_CONFIG_START( tigarden ) +MACHINE_CONFIG_START(tigarden_state::tigarden) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) @@ -4185,6 +4237,7 @@ public: { m_inp_lines = 8; } + void nummunch(machine_config &config); }; // config @@ -4239,7 +4292,7 @@ static INPUT_PORTS_START( nummunch ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POWER_ON ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) INPUT_PORTS_END -static MACHINE_CONFIG_START( nummunch ) +MACHINE_CONFIG_START(nummunch_state::nummunch) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz) diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index c4b2df63e62..682c82a6c1c 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -446,6 +446,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void matchnum(machine_config &config); }; // handlers @@ -526,7 +527,7 @@ INPUT_PORTS_END static const s16 matchnum_speaker_levels[4] = { 0, 0x7fff, -0x8000, 0 }; -static MACHINE_CONFIG_START( matchnum ) +MACHINE_CONFIG_START(matchnum_state::matchnum) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=47K, C=47pF @@ -574,6 +575,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void arrball(machine_config &config); }; // handlers @@ -625,7 +627,7 @@ INPUT_PORTS_END static const s16 arrball_speaker_levels[4] = { 0, 0x7fff, -0x8000, 0 }; -static MACHINE_CONFIG_START( arrball ) +MACHINE_CONFIG_START(arrball_state::arrball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=47K, C=47pF @@ -681,6 +683,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void mathmagi(machine_config &config); }; // handlers @@ -804,7 +807,7 @@ static const u16 mathmagi_output_pla[0x20] = lA+lF+lE+lD+lC // G }; -static MACHINE_CONFIG_START( mathmagi ) +MACHINE_CONFIG_START(mathmagi_state::mathmagi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 175000) // approximation - RC osc. R=68K, C=82pF @@ -851,6 +854,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void bcheetah(machine_config &config); }; // handlers @@ -909,7 +913,7 @@ static INPUT_PORTS_START( bcheetah ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD) PORT_NAME("4") INPUT_PORTS_END -static MACHINE_CONFIG_START( bcheetah ) +MACHINE_CONFIG_START(bcheetah_state::bcheetah) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 100000) // approximation - RC osc. R=47K, C=47pF @@ -949,6 +953,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void amaztron(machine_config &config); }; // handlers @@ -1035,7 +1040,7 @@ static INPUT_PORTS_START( amaztron ) PORT_BIT( 0x1c, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( amaztron ) +MACHINE_CONFIG_START(amaztron_state::amaztron) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 300000) // approximation - RC osc. R=33K?, C=100pF @@ -1078,6 +1083,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void zodiac(machine_config &config); }; // handlers @@ -1211,7 +1217,7 @@ static const u16 zodiac_output_pla[0x20] = lB+lC+lD+lE+lF // U }; -static MACHINE_CONFIG_START( zodiac ) +MACHINE_CONFIG_START(zodiac_state::zodiac) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 500000) // approximation - RC osc. R=18K, C=100pF @@ -1256,6 +1262,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void cqback(machine_config &config); }; // handlers @@ -1326,7 +1333,7 @@ static INPUT_PORTS_START( cqback ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_16WAY INPUT_PORTS_END -static MACHINE_CONFIG_START( cqback ) +MACHINE_CONFIG_START(cqback_state::cqback) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 310000) // approximation - RC osc. R=33K, C=100pF @@ -1373,6 +1380,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void h2hfootb(machine_config &config); }; // handlers @@ -1443,7 +1451,7 @@ static INPUT_PORTS_START( h2hfootb ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_16WAY INPUT_PORTS_END -static MACHINE_CONFIG_START( h2hfootb ) +MACHINE_CONFIG_START(h2hfootb_state::h2hfootb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 310000) // approximation - RC osc. R=39K, C=100pF @@ -1492,6 +1500,7 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(skill_switch); + void h2hbaseb(machine_config &config); protected: virtual void machine_reset() override; }; @@ -1581,7 +1590,7 @@ void h2hbaseb_state::machine_reset() set_clock(); } -static MACHINE_CONFIG_START( h2hbaseb ) +MACHINE_CONFIG_START(h2hbaseb_state::h2hbaseb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1170, 350000) // see set_clock @@ -1623,6 +1632,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void h2hboxing(machine_config &config); }; // handlers @@ -1692,7 +1702,7 @@ static INPUT_PORTS_START( h2hboxing ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL PORT_NAME("P2 Block") INPUT_PORTS_END -static MACHINE_CONFIG_START( h2hboxing ) +MACHINE_CONFIG_START(h2hboxing_state::h2hboxing) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 350000) // approximation - RC osc. R=39K, C=100pF @@ -1754,6 +1764,7 @@ public: DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void quizwizc(machine_config &config); protected: virtual void machine_start() override; }; @@ -1862,7 +1873,7 @@ void quizwizc_state::machine_start() save_item(NAME(m_pinout)); } -static MACHINE_CONFIG_START( quizwizc ) +MACHINE_CONFIG_START(quizwizc_state::quizwizc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 300000) // approximation - RC osc. R=43K, C=100pF @@ -1930,6 +1941,7 @@ public: DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void tc4(machine_config &config); protected: virtual void machine_start() override; }; @@ -2037,7 +2049,7 @@ void tc4_state::machine_start() save_item(NAME(m_pinout)); } -static MACHINE_CONFIG_START( tc4 ) +MACHINE_CONFIG_START(tc4_state::tc4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1400, 450000) // approximation - RC osc. R=27.3K, C=100pF @@ -2091,6 +2103,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void cnbaskb(machine_config &config); }; // handlers @@ -2151,7 +2164,7 @@ static INPUT_PORTS_START( cnbaskb ) PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( cnbaskb ) +MACHINE_CONFIG_START(cnbaskb_state::cnbaskb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 400000) // approximation - RC osc. R=39K, C=47pF @@ -2201,6 +2214,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void cmsport(machine_config &config); }; // handlers @@ -2263,7 +2277,7 @@ static INPUT_PORTS_START( cmsport ) PORT_CONFSETTING( 0x08, "2" ) // professional INPUT_PORTS_END -static MACHINE_CONFIG_START( cmsport ) +MACHINE_CONFIG_START(cmsport_state::cmsport) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 375000) // approximation - RC osc. R=47K, C=47pF @@ -2315,6 +2329,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void cnfball(machine_config &config); }; // handlers @@ -2388,7 +2403,7 @@ INPUT_PORTS_END static const s16 cnfball_speaker_levels[4] = { 0, 0x7fff, -0x8000, 0 }; -static MACHINE_CONFIG_START( cnfball ) +MACHINE_CONFIG_START(cnfball_state::cnfball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 400000) // approximation - RC osc. R=39K, C=47pF @@ -2435,6 +2450,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void cnfball2(machine_config &config); }; // handlers @@ -2513,7 +2529,7 @@ static const u16 cnfball2_output_pla[0x20] = 0, 0, 0, 0, 0, 0, 0, 0 }; -static MACHINE_CONFIG_START( cnfball2 ) +MACHINE_CONFIG_START(cnfball2_state::cnfball2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=47pF @@ -2564,6 +2580,7 @@ public: DECLARE_READ8_MEMBER(read_k); DECLARE_INPUT_CHANGED_MEMBER(reset_button); + void eleciq(machine_config &config); }; // handlers @@ -2654,7 +2671,7 @@ INPUT_CHANGED_MEMBER(eleciq_state::reset_button) m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); } -static MACHINE_CONFIG_START( eleciq ) +MACHINE_CONFIG_START(eleciq_state::eleciq) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=47K, C=50pF @@ -2698,6 +2715,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void esoccer(machine_config &config); }; // handlers @@ -2758,7 +2776,7 @@ static INPUT_PORTS_START( esoccer ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL INPUT_PORTS_END -static MACHINE_CONFIG_START( esoccer ) +MACHINE_CONFIG_START(esoccer_state::esoccer) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=47K, C=33pF @@ -2821,6 +2839,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void ebball(machine_config &config); }; // handlers @@ -2891,7 +2910,7 @@ static INPUT_PORTS_START( ebball ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Batter") INPUT_PORTS_END -static MACHINE_CONFIG_START( ebball ) +MACHINE_CONFIG_START(ebball_state::ebball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 375000) // approximation - RC osc. R=43K, C=47pF @@ -2950,6 +2969,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void ebball2(machine_config &config); }; // handlers @@ -3013,7 +3033,7 @@ static INPUT_PORTS_START( ebball2 ) PORT_BIT( 0x0a, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ebball2 ) +MACHINE_CONFIG_START(ebball2_state::ebball2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=47K, C=47pF @@ -3081,6 +3101,7 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(skill_switch); + void ebball3(machine_config &config); protected: virtual void machine_reset() override; }; @@ -3192,7 +3213,7 @@ void ebball3_state::machine_reset() set_clock(); } -static MACHINE_CONFIG_START( ebball3 ) +MACHINE_CONFIG_START(ebball3_state::ebball3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 340000) // see set_clock @@ -3247,6 +3268,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void esbattle(machine_config &config); }; // handlers @@ -3302,7 +3324,7 @@ static INPUT_PORTS_START( esbattle ) PORT_CONFSETTING( 0x00, "2" ) // Manual INPUT_PORTS_END -static MACHINE_CONFIG_START( esbattle ) +MACHINE_CONFIG_START(esbattle_state::esbattle) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 425000) // approximation - RC osc. R=47K, C=33pF @@ -3349,6 +3371,7 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(skill_switch); + void einvader(machine_config &config); protected: virtual void machine_reset() override; }; @@ -3410,7 +3433,7 @@ void einvader_state::machine_reset() set_clock(); } -static MACHINE_CONFIG_START( einvader ) +MACHINE_CONFIG_START(einvader_state::einvader) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 320000) // see set_clock @@ -3455,6 +3478,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void efootb4(machine_config &config); }; // handlers @@ -3529,7 +3553,7 @@ static INPUT_PORTS_START( efootb4 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( efootb4 ) +MACHINE_CONFIG_START(efootb4_state::efootb4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1670, 475000) // approximation - RC osc. R=42K, C=47pF @@ -3581,6 +3605,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void ebaskb2(machine_config &config); }; // handlers @@ -3649,7 +3674,7 @@ static INPUT_PORTS_START( ebaskb2 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_16WAY INPUT_PORTS_END -static MACHINE_CONFIG_START( ebaskb2 ) +MACHINE_CONFIG_START(ebaskb2_state::ebaskb2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 360000) // approximation - RC osc. R=33K, C=82pF @@ -3708,6 +3733,7 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(skill_switch); + void raisedvl(machine_config &config); protected: virtual void machine_reset() override; }; @@ -3787,7 +3813,7 @@ void raisedvl_state::machine_reset() set_clock(); } -static MACHINE_CONFIG_START( raisedvl ) +MACHINE_CONFIG_START(raisedvl_state::raisedvl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 350000) // see set_clock @@ -3847,6 +3873,7 @@ public: DECLARE_READ8_MEMBER(read_k); DECLARE_INPUT_CHANGED_MEMBER(reset_button); + void f2pbball(machine_config &config); }; // handlers @@ -3917,7 +3944,7 @@ INPUT_CHANGED_MEMBER(f2pbball_state::reset_button) m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); } -static MACHINE_CONFIG_START( f2pbball ) +MACHINE_CONFIG_START(f2pbball_state::f2pbball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=51K, C=39pF @@ -3965,6 +3992,7 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(skill_switch); + void f3in1(machine_config &config); protected: virtual void machine_reset() override; }; @@ -4053,7 +4081,7 @@ void f3in1_state::machine_reset() set_clock(); } -static MACHINE_CONFIG_START( f3in1 ) +MACHINE_CONFIG_START(f3in1_state::f3in1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 300000) // see set_clock @@ -4102,6 +4130,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_o); virtual DECLARE_READ8_MEMBER(read_k); + void gpoker(machine_config &config); protected: virtual void machine_reset() override; }; @@ -4197,7 +4226,7 @@ void gpoker_state::machine_reset() m_beeper->set_state(0); } -static MACHINE_CONFIG_START( gpoker ) +MACHINE_CONFIG_START(gpoker_state::gpoker) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1370, 350000) // approximation - RC osc. R=47K, C=47pF @@ -4239,6 +4268,7 @@ public: { } virtual DECLARE_WRITE16_MEMBER(write_r) override; + void gjackpot(machine_config &config); }; // handlers @@ -4309,7 +4339,7 @@ static INPUT_PORTS_START( gjackpot ) PORT_BIT( 0x09, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gjackpot ) +MACHINE_CONFIG_START(gjackpot_state::gjackpot) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1670, 450000) // approximation - RC osc. R=47K, C=47pF @@ -4355,6 +4385,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_r); virtual DECLARE_WRITE16_MEMBER(write_o); virtual DECLARE_READ8_MEMBER(read_k); + void ginv1000(machine_config &config); }; // handlers @@ -4413,7 +4444,7 @@ static INPUT_PORTS_START( ginv1000 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ginv1000 ) +MACHINE_CONFIG_START(ginv1000_state::ginv1000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1370, 340000) // approximation @@ -4469,6 +4500,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_o); virtual DECLARE_READ8_MEMBER(read_k); + void ginv2000(machine_config &config); protected: virtual void machine_reset() override; }; @@ -4542,7 +4574,7 @@ void ginv2000_state::machine_reset() m_expander->write_ms(1); // Vss } -static MACHINE_CONFIG_START( ginv2000 ) +MACHINE_CONFIG_START(ginv2000_state::ginv2000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1370, 425000) // approximation - RC osc. R=36K, C=47pF @@ -4603,6 +4635,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void fxmcr165(machine_config &config); }; // handlers @@ -4690,7 +4723,7 @@ static INPUT_PORTS_START( fxmcr165 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_MINUS) PORT_CODE(KEYCODE_MINUS_PAD) PORT_NAME("Address Set") INPUT_PORTS_END -static MACHINE_CONFIG_START( fxmcr165 ) +MACHINE_CONFIG_START(fxmcr165_state::fxmcr165) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, XTAL_400kHz) @@ -4736,6 +4769,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void elecdet(machine_config &config); }; // handlers @@ -4817,7 +4851,7 @@ INPUT_PORTS_END static const s16 elecdet_speaker_levels[4] = { 0, 0x3fff, 0x3fff, 0x7fff }; -static MACHINE_CONFIG_START( elecdet ) +MACHINE_CONFIG_START(elecdet_state::elecdet) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS0980, 425000) // approximation @@ -4863,6 +4897,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void starwbc(machine_config &config); }; // handlers @@ -4944,7 +4979,7 @@ static INPUT_PORTS_START( starwbc ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_RIGHT) PORT_NAME("Right") INPUT_PORTS_END -static MACHINE_CONFIG_START( starwbc ) +MACHINE_CONFIG_START(starwbc_state::starwbc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 325000) // approximation - RC osc. R=51K, C=47pF @@ -4987,6 +5022,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void astro(machine_config &config); }; // handlers @@ -5070,7 +5106,7 @@ static INPUT_PORTS_START( astro ) PORT_CONFSETTING( 0x08, "Astro" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( astro ) +MACHINE_CONFIG_START(astro_state::astro) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1470, 450000) // approximation - RC osc. R=4.7K, C=33pF @@ -5125,6 +5161,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void elecbowl(machine_config &config); }; // handlers @@ -5234,7 +5271,7 @@ static const u16 elecbowl_output_pla[0x20] = 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f }; -static MACHINE_CONFIG_START( elecbowl ) +MACHINE_CONFIG_START(elecbowl_state::elecbowl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 350000) // approximation - RC osc. R=33K, C=100pF @@ -5286,6 +5323,7 @@ public: DECLARE_WRITE32_MEMBER(lcd_output_w); DECLARE_WRITE16_MEMBER(write_r); DECLARE_READ8_MEMBER(read_k); + void horseran(machine_config &config); }; // handlers @@ -5390,7 +5428,7 @@ static INPUT_PORTS_START( horseran ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_7_PAD) PORT_NAME("7") INPUT_PORTS_END -static MACHINE_CONFIG_START( horseran ) +MACHINE_CONFIG_START(horseran_state::horseran) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 300000) // approximation - RC osc. R=56K, C=47pF @@ -5431,6 +5469,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void mdndclab(machine_config &config); }; // handlers @@ -5568,7 +5607,7 @@ static INPUT_PORTS_START( mdndclab ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD) PORT_NAME("Dragon Attacks / Dragon Wakes") INPUT_PORTS_END -static MACHINE_CONFIG_START( mdndclab ) +MACHINE_CONFIG_START(mdndclab_state::mdndclab) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 475000) // approximation - RC osc. R=27K, C=100pF @@ -5617,6 +5656,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void comp4(machine_config &config); }; // handlers @@ -5671,7 +5711,7 @@ static INPUT_PORTS_START( comp4 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_NAME("9") INPUT_PORTS_END -static MACHINE_CONFIG_START( comp4 ) +MACHINE_CONFIG_START(comp4_state::comp4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS0970, 250000) // approximation @@ -5720,6 +5760,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void bship(machine_config &config); }; // handlers @@ -5820,7 +5861,7 @@ static INPUT_PORTS_START( bship ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("P2 Clear Last Entry") INPUT_PORTS_END -static MACHINE_CONFIG_START( bship ) +MACHINE_CONFIG_START(bship_state::bship) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=100K, C=47pF @@ -5864,6 +5905,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void bshipb(machine_config &config); }; // handlers @@ -5922,7 +5964,7 @@ READ8_MEMBER(bshipb_state::read_k) // buttons are same as bship set -static MACHINE_CONFIG_START( bshipb ) +MACHINE_CONFIG_START(bshipb_state::bshipb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=100K, C=47pF @@ -5981,6 +6023,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_READ8_MEMBER(read_k); + void simon(machine_config &config); }; // handlers @@ -6039,7 +6082,7 @@ static INPUT_PORTS_START( simon ) PORT_CONFSETTING( 0x01, "4" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( simon ) +MACHINE_CONFIG_START(simon_state::simon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=33K, C=100pF @@ -6083,6 +6126,7 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(speed_switch); + void ssimon(machine_config &config); protected: virtual void machine_reset() override; }; @@ -6179,7 +6223,7 @@ void ssimon_state::machine_reset() set_clock(); } -static MACHINE_CONFIG_START( ssimon ) +MACHINE_CONFIG_START(ssimon_state::ssimon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 275000) // see set_clock @@ -6231,6 +6275,7 @@ public: bool sensor_state() { return m_gearbox_pos < 0 && m_display_decay[0][0] != 0; } TIMER_DEVICE_CALLBACK_MEMBER(gearbox_sim_tick); + void bigtrak(machine_config &config); protected: virtual void machine_start() override; }; @@ -6358,7 +6403,7 @@ void bigtrak_state::machine_start() static const s16 bigtrak_speaker_levels[8] = { 0, 0x7fff/3, 0x7fff/3, 0x7fff/3*2, 0x7fff/3, 0x7fff/3*2, 0x7fff/3*2, 0x7fff }; -static MACHINE_CONFIG_START( bigtrak ) +MACHINE_CONFIG_START(bigtrak_state::bigtrak) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=83K, C=100pF @@ -6422,6 +6467,7 @@ public: DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void mbdtower(machine_config &config); protected: virtual void machine_start() override; }; @@ -6590,7 +6636,7 @@ void mbdtower_state::machine_start() save_item(NAME(m_sensor_blind)); } -static MACHINE_CONFIG_START( mbdtower ) +MACHINE_CONFIG_START(mbdtower_state::mbdtower) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1400, 425000) // approximation - RC osc. R=43K, C=56pF @@ -6633,6 +6679,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void arcmania(machine_config &config); }; // handlers @@ -6700,7 +6747,7 @@ INPUT_PORTS_END static const s16 arcmania_speaker_levels[8] = { 0, 0x7fff/3, 0x7fff/3, 0x7fff/3*2, 0x7fff/3, 0x7fff/3*2, 0x7fff/3*2, 0x7fff }; -static MACHINE_CONFIG_START( arcmania ) +MACHINE_CONFIG_START(arcmania_state::arcmania) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 250000) // approximation - RC osc. R=56K, C=100pF @@ -6744,6 +6791,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void cnsector(machine_config &config); }; // handlers @@ -6818,7 +6866,7 @@ static INPUT_PORTS_START( cnsector ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_B) PORT_NAME("Teach Mode") INPUT_PORTS_END -static MACHINE_CONFIG_START( cnsector ) +MACHINE_CONFIG_START(cnsector_state::cnsector) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS0970, 250000) // approximation @@ -6868,6 +6916,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_r); virtual DECLARE_WRITE16_MEMBER(write_o); virtual DECLARE_READ8_MEMBER(read_k); + void merlin(machine_config &config); }; // handlers @@ -6931,7 +6980,7 @@ INPUT_PORTS_END static const s16 merlin_speaker_levels[8] = { 0, 0x7fff/3, 0x7fff/3, 0x7fff/3*2, 0x7fff/3, 0x7fff/3*2, 0x7fff/3*2, 0x7fff }; -static MACHINE_CONFIG_START( merlin ) +MACHINE_CONFIG_START(merlin_state::merlin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 350000) // approximation - RC osc. R=33K, C=100pF @@ -6981,6 +7030,7 @@ public: mmerlin_state(const machine_config &mconfig, device_type type, const char *tag) : merlin_state(mconfig, type, tag) { } + void mmerlin(machine_config &config); }; // handlers: uses the ones in merlin_state @@ -6994,7 +7044,7 @@ static INPUT_PORTS_START( mmerlin ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_S) PORT_NAME("Score") // instead of Hit Me INPUT_PORTS_END -static MACHINE_CONFIG_START( mmerlin ) +MACHINE_CONFIG_START(mmerlin_state::mmerlin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1400, 425000) // approximation - RC osc. R=30K, C=100pF @@ -7038,6 +7088,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void stopthief(machine_config &config); }; // handlers @@ -7108,7 +7159,7 @@ INPUT_PORTS_END static const s16 stopthief_speaker_levels[7] = { 0, 0x7fff/6, 0x7fff/5, 0x7fff/4, 0x7fff/3, 0x7fff/2, 0x7fff }; -static MACHINE_CONFIG_START( stopthief ) +MACHINE_CONFIG_START(stopthief_state::stopthief) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS0980, 425000) // approximation @@ -7158,6 +7209,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void bankshot(machine_config &config); }; // handlers @@ -7222,7 +7274,7 @@ static INPUT_PORTS_START( bankshot ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( bankshot ) +MACHINE_CONFIG_START(bankshot_state::bankshot) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1400, 475000) // approximation - RC osc. R=24K, C=100pF @@ -7286,6 +7338,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void splitsec(machine_config &config); }; // handlers @@ -7338,7 +7391,7 @@ static INPUT_PORTS_START( splitsec ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( splitsec ) +MACHINE_CONFIG_START(splitsec_state::splitsec) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1400, 475000) // approximation - RC osc. R=24K, C=100pF @@ -7380,6 +7433,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void lostreas(machine_config &config); }; // handlers @@ -7455,7 +7509,7 @@ static const s16 lostreas_speaker_levels[16] = 0x7fff/8, 0x7fff/7, 0x7fff/6, 0x7fff/5, 0x7fff/4, 0x7fff/3, 0x7fff/2, 0x7fff/1 }; -static MACHINE_CONFIG_START( lostreas ) +MACHINE_CONFIG_START(lostreas_state::lostreas) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 425000) // approximation - RC osc. R=39K, C=47pF @@ -7508,6 +7562,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void alphie(machine_config &config); }; // handlers @@ -7575,7 +7630,7 @@ static const u16 alphie_output_pla[0x20] = 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1 }; -static MACHINE_CONFIG_START( alphie ) +MACHINE_CONFIG_START(alphie_state::alphie) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 350000) // approximation @@ -7621,6 +7676,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_r); virtual DECLARE_WRITE16_MEMBER(write_o); virtual DECLARE_READ8_MEMBER(read_k); + void tcfball(machine_config &config); }; // handlers @@ -7685,7 +7741,7 @@ static INPUT_PORTS_START( tcfball ) PORT_CONFSETTING( 0x08, "2" ) // professional INPUT_PORTS_END -static MACHINE_CONFIG_START( tcfball ) +MACHINE_CONFIG_START(tcfball_state::tcfball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=56K, C=24pF @@ -7727,6 +7783,7 @@ public: tcfballa_state(const machine_config &mconfig, device_type type, const char *tag) : tcfball_state(mconfig, type, tag) { } + void tcfballa(machine_config &config); }; // handlers: uses the ones in tcfball_state @@ -7748,7 +7805,7 @@ static const u16 tcfballa_output_pla[0x20] = 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -static MACHINE_CONFIG_START( tcfballa ) +MACHINE_CONFIG_START(tcfballa_state::tcfballa) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=50pF @@ -7808,6 +7865,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void tandy12(machine_config &config); }; // handlers @@ -7911,7 +7969,7 @@ static const u16 tandy12_output_pla[0x20] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -static MACHINE_CONFIG_START( tandy12 ) +MACHINE_CONFIG_START(tandy12_state::tandy12) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 400000) // approximation - RC osc. R=39K, C=47pF @@ -7959,6 +8017,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void monkeysee(machine_config &config); }; // handlers @@ -8019,7 +8078,7 @@ static INPUT_PORTS_START( monkeysee ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_STOP) PORT_CODE(KEYCODE_DEL_PAD) PORT_NAME(".") INPUT_PORTS_END -static MACHINE_CONFIG_START( monkeysee ) +MACHINE_CONFIG_START(monkeysee_state::monkeysee) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 250000) // approximation - RC osc. R=68K, C=47pF @@ -8067,6 +8126,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_r); virtual DECLARE_WRITE16_MEMBER(write_o); virtual DECLARE_READ8_MEMBER(read_k); + void speechp(machine_config &config); }; // handlers @@ -8167,7 +8227,7 @@ static INPUT_PORTS_START( speechp ) PORT_CONFSETTING( 0x00, DEF_STR( Normal ) ) INPUT_PORTS_END -static MACHINE_CONFIG_START( speechp ) +MACHINE_CONFIG_START(speechp_state::speechp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 400000) // approximation - RC osc. R=39K, C=47pF @@ -8215,6 +8275,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void timaze(machine_config &config); }; // handlers @@ -8248,7 +8309,7 @@ static INPUT_PORTS_START( timaze ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_16WAY INPUT_PORTS_END -static MACHINE_CONFIG_START( timaze ) +MACHINE_CONFIG_START(timaze_state::timaze) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=80K, C=27pF @@ -8290,6 +8351,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void copycat(machine_config &config); }; // handlers @@ -8349,7 +8411,7 @@ INPUT_PORTS_END static const s16 copycat_speaker_levels[4] = { 0, 0x7fff, -0x8000, 0 }; -static MACHINE_CONFIG_START( copycat ) +MACHINE_CONFIG_START(copycat_state::copycat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 320000) // approximation - RC osc. R=47K, C=47pF @@ -8398,6 +8460,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); + void copycatm2(machine_config &config); }; // handlers @@ -8424,7 +8487,7 @@ static INPUT_PORTS_START( copycatm2 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Green Button") INPUT_PORTS_END -static MACHINE_CONFIG_START( copycatm2 ) +MACHINE_CONFIG_START(copycatm2_state::copycatm2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1730, 275000) // approximation - RC osc. R=100K, C=47pF @@ -8468,6 +8531,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); + void ditto(machine_config &config); }; // handlers @@ -8494,7 +8558,7 @@ static INPUT_PORTS_START( ditto ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Red Button") INPUT_PORTS_END -static MACHINE_CONFIG_START( ditto ) +MACHINE_CONFIG_START(ditto_state::ditto) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1730, 275000) // approximation - RC osc. R=100K, C=47pF @@ -8543,6 +8607,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void ss7in1(machine_config &config); }; // handlers @@ -8608,7 +8673,7 @@ static INPUT_PORTS_START( ss7in1 ) PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ss7in1 ) +MACHINE_CONFIG_START(ss7in1_state::ss7in1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1400, 450000) // approximation - RC osc. R=47K, C=47pF @@ -8684,6 +8749,7 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(skill_switch); + void tbreakup(machine_config &config); protected: virtual void machine_reset() override; virtual void machine_start() override; @@ -8800,7 +8866,7 @@ void tbreakup_state::machine_start() save_item(NAME(m_exp_port)); } -static MACHINE_CONFIG_START( tbreakup ) +MACHINE_CONFIG_START(tbreakup_state::tbreakup) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1040, 325000) // see set_clock @@ -8872,6 +8938,7 @@ public: DECLARE_READ8_MEMBER(read_k); DECLARE_INPUT_CHANGED_MEMBER(flipper_button); + void phpball(machine_config &config); }; // handlers @@ -8932,7 +8999,7 @@ INPUT_CHANGED_MEMBER(phpball_state::flipper_button) prepare_display(); } -static MACHINE_CONFIG_START( phpball ) +MACHINE_CONFIG_START(phpball_state::phpball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=47pF @@ -8977,6 +9044,7 @@ public: DECLARE_WRITE16_MEMBER(write_r); DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void ssports4(machine_config &config); }; // handlers @@ -9066,7 +9134,7 @@ static const u16 ssports4_output_pla[0x20] = 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7d, 0x07, 0x7f, 0x6f, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40 }; -static MACHINE_CONFIG_START( ssports4 ) +MACHINE_CONFIG_START(ssports4_state::ssports4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=47pF @@ -9114,6 +9182,7 @@ public: DECLARE_WRITE16_MEMBER(write_o); DECLARE_READ8_MEMBER(read_k); + void xl25(machine_config &config); protected: virtual void machine_reset() override; }; @@ -9235,7 +9304,7 @@ void xl25_state::machine_reset() update_halt(); } -static MACHINE_CONFIG_START( xl25 ) +MACHINE_CONFIG_START(xl25_state::xl25) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000C, 300000) // approximation - RC osc. R=5.6K, C=47pF diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp index 5faf57763bb..d5d044926b7 100644 --- a/src/mame/drivers/hh_ucom4.cpp +++ b/src/mame/drivers/hh_ucom4.cpp @@ -276,6 +276,7 @@ public: DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE8_MEMBER(speaker_w); + void ufombs(machine_config &config); }; // handlers @@ -328,7 +329,7 @@ INPUT_PORTS_END static const s16 ufombs_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 }; -static MACHINE_CONFIG_START( ufombs ) +MACHINE_CONFIG_START(ufombs_state::ufombs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation @@ -388,6 +389,7 @@ public: DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); DECLARE_READ8_MEMBER(input_b_r); + void ssfball(machine_config &config); }; // handlers @@ -474,7 +476,7 @@ INPUT_PORTS_END static const s16 ssfball_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 }; -static MACHINE_CONFIG_START( ssfball ) +MACHINE_CONFIG_START(ssfball_state::ssfball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D553, 400000) // approximation @@ -531,6 +533,7 @@ public: DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); DECLARE_READ8_MEMBER(input_a_r); + void bmsoccer(machine_config &config); }; // handlers @@ -601,7 +604,7 @@ static INPUT_PORTS_START( bmsoccer ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Shoot") INPUT_PORTS_END -static MACHINE_CONFIG_START( bmsoccer ) +MACHINE_CONFIG_START(bmsoccer_state::bmsoccer) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation @@ -653,6 +656,7 @@ public: DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE8_MEMBER(speaker_w); + void bmsafari(machine_config &config); }; // handlers @@ -708,7 +712,7 @@ static INPUT_PORTS_START( bmsafari ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_16WAY INPUT_PORTS_END -static MACHINE_CONFIG_START( bmsafari ) +MACHINE_CONFIG_START(bmsafari_state::bmsafari) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation @@ -762,6 +766,7 @@ public: DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); DECLARE_READ8_MEMBER(input_b_r); + void splasfgt(machine_config &config); }; // handlers @@ -857,7 +862,7 @@ INPUT_PORTS_END static const s16 splasfgt_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 }; -static MACHINE_CONFIG_START( splasfgt ) +MACHINE_CONFIG_START(splasfgt_state::splasfgt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D553, 400000) // approximation @@ -913,6 +918,7 @@ public: void prepare_display(); DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); + void bcclimbr(machine_config &config); }; // handlers @@ -960,7 +966,7 @@ static INPUT_PORTS_START( bcclimbr ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_RIGHT ) INPUT_PORTS_END -static MACHINE_CONFIG_START( bcclimbr ) +MACHINE_CONFIG_START(bcclimbr_state::bcclimbr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz) @@ -1018,6 +1024,7 @@ public: DECLARE_WRITE8_MEMBER(speaker_w); DECLARE_WRITE8_MEMBER(input_w); DECLARE_READ8_MEMBER(input_r); + void tactix(machine_config &config); }; // handlers @@ -1082,7 +1089,7 @@ static INPUT_PORTS_START( tactix ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( tactix ) +MACHINE_CONFIG_START(tactix_state::tactix) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D557L, 400000) // approximation @@ -1129,6 +1136,7 @@ public: void prepare_display(); DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); + void invspace(machine_config &config); }; // handlers @@ -1175,7 +1183,7 @@ static INPUT_PORTS_START( invspace ) PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( invspace ) +MACHINE_CONFIG_START(invspace_state::invspace) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D552, XTAL_400kHz) @@ -1230,6 +1238,7 @@ public: void prepare_display(); DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); + void efball(machine_config &config); }; // handlers @@ -1290,7 +1299,7 @@ static INPUT_PORTS_START( efball ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_16WAY INPUT_PORTS_END -static MACHINE_CONFIG_START( efball ) +MACHINE_CONFIG_START(efball_state::efball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz) @@ -1342,6 +1351,8 @@ public: void prepare_display(); DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); + void galaxy2b(machine_config &config); + void galaxy2(machine_config &config); }; // handlers @@ -1388,7 +1399,7 @@ static INPUT_PORTS_START( galaxy2 ) PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( galaxy2 ) +MACHINE_CONFIG_START(galaxy2_state::galaxy2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz) @@ -1416,7 +1427,7 @@ static MACHINE_CONFIG_START( galaxy2 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( galaxy2b, galaxy2 ) +MACHINE_CONFIG_DERIVED(galaxy2_state::galaxy2b, galaxy2) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1452,6 +1463,7 @@ public: void prepare_display(); DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); + void astrocmd(machine_config &config); }; // handlers @@ -1505,7 +1517,7 @@ static INPUT_PORTS_START( astrocmd ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) INPUT_PORTS_END -static MACHINE_CONFIG_START( astrocmd ) +MACHINE_CONFIG_START(astrocmd_state::astrocmd) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz) @@ -1560,6 +1572,7 @@ public: DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); + void edracula(machine_config &config); }; // handlers @@ -1600,7 +1613,7 @@ static INPUT_PORTS_START( edracula ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) INPUT_PORTS_END -static MACHINE_CONFIG_START( edracula ) +MACHINE_CONFIG_START(edracula_state::edracula) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz) @@ -1652,6 +1665,7 @@ public: DECLARE_WRITE32_MEMBER(lcd_output_w); DECLARE_WRITE8_MEMBER(lcd_w); + void mcompgin(machine_config &config); }; // handlers @@ -1687,7 +1701,7 @@ static INPUT_PORTS_START( mcompgin ) PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( mcompgin ) +MACHINE_CONFIG_START(mcompgin_state::mcompgin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D650, XTAL_400kHz) // TDK FCR400K @@ -1728,6 +1742,7 @@ public: DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); DECLARE_WRITE8_MEMBER(speaker_w); + void mvbfree(machine_config &config); }; // handlers @@ -1783,7 +1798,7 @@ static INPUT_PORTS_START( mvbfree ) PORT_CONFSETTING( 0x08, "3" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( mvbfree ) +MACHINE_CONFIG_START(mvbfree_state::mvbfree) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D553, 400000) // approximation @@ -1838,6 +1853,7 @@ public: DECLARE_WRITE8_MEMBER(speaker_w); DECLARE_WRITE8_MEMBER(input_w); DECLARE_READ8_MEMBER(input_r); + void grobot9(machine_config &config); }; // handlers @@ -1901,7 +1917,7 @@ static INPUT_PORTS_START( grobot9 ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_V) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_ucom4_state, single_interrupt_line, nullptr) PORT_NAME("Start-Pitch") INPUT_PORTS_END -static MACHINE_CONFIG_START( grobot9 ) +MACHINE_CONFIG_START(grobot9_state::grobot9) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D557L, 160000) // approximation @@ -1947,6 +1963,7 @@ public: void prepare_display(); DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); + void tccombat(machine_config &config); }; // handlers @@ -1990,7 +2007,7 @@ static INPUT_PORTS_START( tccombat ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY INPUT_PORTS_END -static MACHINE_CONFIG_START( tccombat ) +MACHINE_CONFIG_START(tccombat_state::tccombat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation @@ -2051,6 +2068,7 @@ public: void set_clock(); DECLARE_INPUT_CHANGED_MEMBER(difficulty_switch); + void tmtennis(machine_config &config); protected: virtual void machine_reset() override; }; @@ -2146,7 +2164,7 @@ void tmtennis_state::machine_reset() set_clock(); } -static MACHINE_CONFIG_START( tmtennis ) +MACHINE_CONFIG_START(tmtennis_state::tmtennis) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D552, 360000) // see set_clock @@ -2207,6 +2225,7 @@ public: void prepare_display(); DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); + void tmpacman(machine_config &config); }; // handlers @@ -2254,7 +2273,7 @@ static INPUT_PORTS_START( tmpacman ) PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( tmpacman ) +MACHINE_CONFIG_START(tmpacman_state::tmpacman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_430kHz) @@ -2311,6 +2330,7 @@ public: void prepare_display(); DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); + void tmscramb(machine_config &config); }; // handlers @@ -2356,7 +2376,7 @@ static INPUT_PORTS_START( tmscramb ) PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( tmscramb ) +MACHINE_CONFIG_START(tmscramb_state::tmscramb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz) @@ -2412,6 +2432,7 @@ public: void prepare_display(); DECLARE_WRITE8_MEMBER(grid_w); DECLARE_WRITE8_MEMBER(plate_w); + void tcaveman(machine_config &config); }; // handlers @@ -2455,7 +2476,7 @@ static INPUT_PORTS_START( tcaveman ) PORT_CONFSETTING( 0x08, "Professional" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( tcaveman ) +MACHINE_CONFIG_START(tcaveman_state::tcaveman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz) @@ -2510,6 +2531,7 @@ public: DECLARE_WRITE8_MEMBER(output_w); DECLARE_READ8_MEMBER(input_r); + void alnchase(machine_config &config); }; // handlers @@ -2586,7 +2608,7 @@ static INPUT_PORTS_START( alnchase ) PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( alnchase ) +MACHINE_CONFIG_START(alnchase_state::alnchase) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz) diff --git a/src/mame/drivers/hideseek.cpp b/src/mame/drivers/hideseek.cpp index 0ab3d531085..5e8b32dcf79 100644 --- a/src/mame/drivers/hideseek.cpp +++ b/src/mame/drivers/hideseek.cpp @@ -46,6 +46,7 @@ public: DECLARE_PALETTE_INIT(hideseek); uint32_t screen_update_hideseek(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void hideseek(machine_config &config); protected: required_device m_maincpu; }; @@ -96,7 +97,7 @@ PALETTE_INIT_MEMBER(hideseek_state, hideseek) -static MACHINE_CONFIG_START( hideseek ) +MACHINE_CONFIG_START(hideseek_state::hideseek) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH2, 7372800 * 4 ) diff --git a/src/mame/drivers/higemaru.cpp b/src/mame/drivers/higemaru.cpp index 0f9b8914cf9..59235995b8c 100644 --- a/src/mame/drivers/higemaru.cpp +++ b/src/mame/drivers/higemaru.cpp @@ -162,7 +162,7 @@ static GFXDECODE_START( higemaru ) GFXDECODE_END -static MACHINE_CONFIG_START( higemaru ) +MACHINE_CONFIG_START(higemaru_state::higemaru) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz Sharp LH0080A Z80A-CPU-D */ diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp index 11a49be7062..c1a1b5977ff 100644 --- a/src/mame/drivers/highvdeo.cpp +++ b/src/mame/drivers/highvdeo.cpp @@ -159,6 +159,15 @@ public: required_device m_maincpu; required_device m_okim6376; required_device m_palette; + void grancapi(machine_config &config); + void tv_ncf(machine_config &config); + void ciclone(machine_config &config); + void nyjoker(machine_config &config); + void magicbom(machine_config &config); + void brasil(machine_config &config); + void newmcard(machine_config &config); + void tv_tcf(machine_config &config); + void tv_vcf(machine_config &config); }; @@ -1124,7 +1133,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, highvdeo_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( tv_vcf ) +MACHINE_CONFIG_START(highvdeo_state::tv_vcf) MCFG_CPU_ADD("maincpu", V30, XTAL_12MHz/2 ) // ? MCFG_CPU_PROGRAM_MAP(tv_vcf_map) MCFG_CPU_IO_MAP(tv_vcf_io) @@ -1153,7 +1162,7 @@ static MACHINE_CONFIG_START( tv_vcf ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tv_ncf, tv_vcf ) +MACHINE_CONFIG_DERIVED(highvdeo_state::tv_ncf, tv_vcf) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tv_ncf_map) @@ -1161,7 +1170,7 @@ static MACHINE_CONFIG_DERIVED( tv_ncf, tv_vcf ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nyjoker, tv_vcf ) +MACHINE_CONFIG_DERIVED(highvdeo_state::nyjoker, tv_vcf) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(nyjoker_map) @@ -1169,7 +1178,7 @@ static MACHINE_CONFIG_DERIVED( nyjoker, tv_vcf ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tv_tcf, tv_vcf ) +MACHINE_CONFIG_DERIVED(highvdeo_state::tv_tcf, tv_vcf) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tv_tcf_map) @@ -1182,7 +1191,7 @@ static MACHINE_CONFIG_DERIVED( tv_tcf, tv_vcf ) MCFG_PALETTE_FORMAT(RRRRRGGGGGGBBBBB) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( newmcard, tv_tcf ) +MACHINE_CONFIG_DERIVED(highvdeo_state::newmcard, tv_tcf) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(newmcard_map) @@ -1192,7 +1201,7 @@ static MACHINE_CONFIG_DERIVED( newmcard, tv_tcf ) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ciclone, tv_tcf ) +MACHINE_CONFIG_DERIVED(highvdeo_state::ciclone, tv_tcf) MCFG_DEVICE_REMOVE("maincpu") @@ -1202,7 +1211,7 @@ static MACHINE_CONFIG_DERIVED( ciclone, tv_tcf ) MCFG_CPU_VBLANK_INT_DRIVER("screen", highvdeo_state, vblank_irq_80186) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( brasil ) +MACHINE_CONFIG_START(highvdeo_state::brasil) MCFG_CPU_ADD("maincpu", I80186, 20000000 ) // fashion doesn't like 20/2 Mhz MCFG_CPU_PROGRAM_MAP(brasil_map) MCFG_CPU_IO_MAP(brasil_io) @@ -1228,7 +1237,7 @@ static MACHINE_CONFIG_START( brasil ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( grancapi ) +MACHINE_CONFIG_START(highvdeo_state::grancapi) MCFG_CPU_ADD("maincpu", I80186, 20000000 ) MCFG_CPU_PROGRAM_MAP(brasil_map) MCFG_CPU_IO_MAP(grancapi_io) @@ -1254,7 +1263,7 @@ static MACHINE_CONFIG_START( grancapi ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( magicbom ) +MACHINE_CONFIG_START(highvdeo_state::magicbom) MCFG_CPU_ADD("maincpu", I80186, 20000000 ) MCFG_CPU_PROGRAM_MAP(brasil_map) MCFG_CPU_IO_MAP(magicbom_io) diff --git a/src/mame/drivers/hikaru.cpp b/src/mame/drivers/hikaru.cpp index ddc1feb620a..3385ee9639b 100644 --- a/src/mame/drivers/hikaru.cpp +++ b/src/mame/drivers/hikaru.cpp @@ -397,6 +397,7 @@ public: virtual void video_start() override; uint32_t screen_update_hikaru(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void hikaru(machine_config &config); }; void hikaru_state::video_start() @@ -481,7 +482,7 @@ static ADDRESS_MAP_START( hikaru_map_slave, AS_PROGRAM, 64, hikaru_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( hikaru ) +MACHINE_CONFIG_START(hikaru_state::hikaru) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH4LE, CPU_CLOCK) // MCFG_SH4_MD0(1) diff --git a/src/mame/drivers/himesiki.cpp b/src/mame/drivers/himesiki.cpp index 4e9b4ed85d1..49713b46a34 100644 --- a/src/mame/drivers/himesiki.cpp +++ b/src/mame/drivers/himesiki.cpp @@ -422,7 +422,7 @@ void himesiki_state::machine_reset() m_flipscreen = 0; } -static MACHINE_CONFIG_START( himesiki ) +MACHINE_CONFIG_START(himesiki_state::himesiki) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CLK2) /* it's a 6.000 MHz rated part, but near the 8 Mhz XTAL?? - Android skips lots of frames at 6, crashes at 4 */ diff --git a/src/mame/drivers/hitme.cpp b/src/mame/drivers/hitme.cpp index dd0bc7f7403..8fbc6ba676b 100644 --- a/src/mame/drivers/hitme.cpp +++ b/src/mame/drivers/hitme.cpp @@ -311,7 +311,7 @@ void hitme_state::machine_reset() m_timeout_time = attotime::zero; } -static MACHINE_CONFIG_START( hitme ) +MACHINE_CONFIG_START(hitme_state::hitme) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/16) @@ -348,7 +348,7 @@ MACHINE_CONFIG_END Barricade or is the resolution set by a dip switch? */ -static MACHINE_CONFIG_DERIVED( barricad, hitme ) +MACHINE_CONFIG_DERIVED(hitme_state::barricad, hitme) /* video hardware */ MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/hitpoker.cpp b/src/mame/drivers/hitpoker.cpp index 5d7b2152885..c129df2714b 100644 --- a/src/mame/drivers/hitpoker.cpp +++ b/src/mame/drivers/hitpoker.cpp @@ -91,6 +91,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void hitpoker(machine_config &config); }; @@ -469,7 +470,7 @@ INTERRUPT_GEN_MEMBER(hitpoker_state::hitpoker_irq) device.execute().set_input_line(MC68HC11_IRQ_LINE, HOLD_LINE); } -static MACHINE_CONFIG_START( hitpoker ) +MACHINE_CONFIG_START(hitpoker_state::hitpoker) MCFG_CPU_ADD("maincpu", MC68HC11,1000000) MCFG_CPU_PROGRAM_MAP(hitpoker_map) MCFG_CPU_IO_MAP(hitpoker_io) diff --git a/src/mame/drivers/hk68v10.cpp b/src/mame/drivers/hk68v10.cpp index 9fee60dcb45..335f3eceb66 100644 --- a/src/mame/drivers/hk68v10.cpp +++ b/src/mame/drivers/hk68v10.cpp @@ -209,6 +209,7 @@ DECLARE_WRITE16_MEMBER (bootvect_w); virtual void machine_start () override; virtual void machine_reset () override; +void hk68v10(machine_config &config); protected: private: @@ -333,7 +334,7 @@ SLOT_INTERFACE_END /* * Machine configuration */ -static MACHINE_CONFIG_START (hk68v10) +MACHINE_CONFIG_START(hk68v10_state::hk68v10) /* basic machine hardware */ MCFG_CPU_ADD ("maincpu", M68010, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP (hk68v10_mem) diff --git a/src/mame/drivers/hnayayoi.cpp b/src/mame/drivers/hnayayoi.cpp index 01d847956ac..7cfdb3d7959 100644 --- a/src/mame/drivers/hnayayoi.cpp +++ b/src/mame/drivers/hnayayoi.cpp @@ -537,7 +537,7 @@ void hnayayoi_state::machine_reset() } -static MACHINE_CONFIG_START( hnayayoi ) +MACHINE_CONFIG_START(hnayayoi_state::hnayayoi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 20000000/4 ) /* 5 MHz ???? */ @@ -584,7 +584,7 @@ static MACHINE_CONFIG_START( hnayayoi ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hnfubuki, hnayayoi ) +MACHINE_CONFIG_DERIVED(hnayayoi_state::hnfubuki, hnayayoi) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(hnfubuki_map) MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_IO) @@ -593,7 +593,7 @@ static MACHINE_CONFIG_DERIVED( hnfubuki, hnayayoi ) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(hnayayoi_state, nmi_enable_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( untoucha, hnayayoi ) +MACHINE_CONFIG_DERIVED(hnayayoi_state::untoucha, hnayayoi) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(untoucha_map) MCFG_CPU_IO_MAP(untoucha_io_map) diff --git a/src/mame/drivers/hng64.cpp b/src/mame/drivers/hng64.cpp index 8d2b698e075..b6637e94f8b 100644 --- a/src/mame/drivers/hng64.cpp +++ b/src/mame/drivers/hng64.cpp @@ -441,7 +441,6 @@ or Fatal Fury for example). #include "cpu/mips/mips3.h" #include "cpu/z80/z80.h" #include "machine/nvram.h" -#include "machine/hng64_net.h" /* TODO: NOT measured! */ @@ -1532,9 +1531,7 @@ void hng64_state::machine_reset() reset_sound(); } -MACHINE_CONFIG_EXTERN(hng64_audio); - -static MACHINE_CONFIG_START(hng64) +MACHINE_CONFIG_START(hng64_state::hng64) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", VR4300BE, HNG64_MASTER_CLOCK) // actually R4300 MCFG_MIPS3_ICACHE_SIZE(16384) diff --git a/src/mame/drivers/holeland.cpp b/src/mame/drivers/holeland.cpp index 2de977c84e8..8ae1dbe699f 100644 --- a/src/mame/drivers/holeland.cpp +++ b/src/mame/drivers/holeland.cpp @@ -272,7 +272,7 @@ static GFXDECODE_START( crzrally ) GFXDECODE_END -static MACHINE_CONFIG_START( holeland ) +MACHINE_CONFIG_START(holeland_state::holeland) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3355700) /* measured 298ns on PCB */ @@ -353,7 +353,7 @@ Notes: */ -static MACHINE_CONFIG_START( crzrally ) +MACHINE_CONFIG_START(holeland_state::crzrally) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 20000000/4) /* 5 MHz */ diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp index c0c20ee7b90..4eb78392ea3 100644 --- a/src/mame/drivers/homedata.cpp +++ b/src/mame/drivers/homedata.cpp @@ -1211,7 +1211,7 @@ MACHINE_RESET_MEMBER(homedata_state,reikaids) m_gfx_bank[1] = 0; // this is not used by reikaids } -static MACHINE_CONFIG_START( mrokumei ) +MACHINE_CONFIG_START(homedata_state::mrokumei) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */ @@ -1258,7 +1258,7 @@ MACHINE_CONFIG_END /**************************************************************************/ -static MACHINE_CONFIG_START( reikaids ) +MACHINE_CONFIG_START(homedata_state::reikaids) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */ @@ -1314,7 +1314,7 @@ MACHINE_CONFIG_END /**************************************************************************/ -static MACHINE_CONFIG_START( pteacher ) +MACHINE_CONFIG_START(homedata_state::pteacher) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */ @@ -1364,13 +1364,13 @@ static MACHINE_CONFIG_START( pteacher ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjkinjas, pteacher ) +MACHINE_CONFIG_DERIVED(homedata_state::mjkinjas, pteacher) MCFG_CPU_MODIFY("audiocpu") MCFG_CPU_CLOCK(11000000) /* 11MHz ? */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lemnangl, pteacher ) +MACHINE_CONFIG_DERIVED(homedata_state::lemnangl, pteacher) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", lemnangl) @@ -1483,7 +1483,7 @@ GFXDECODE_END /* clocks are 16mhz and 9mhz */ -static MACHINE_CONFIG_START( mirderby ) +MACHINE_CONFIG_START(homedata_state::mirderby) MCFG_CPU_ADD("maincpu", M6809, 16000000/8) /* 2 Mhz */ MCFG_CPU_PROGRAM_MAP(cpu2_map) diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp index dfbd2eebb63..f195abd1bb4 100644 --- a/src/mame/drivers/homelab.cpp +++ b/src/mame/drivers/homelab.cpp @@ -76,6 +76,9 @@ public: uint32_t screen_update_homelab2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_homelab3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void homelab3(machine_config &config); + void brailab4(machine_config &config); + void homelab(machine_config &config); private: const uint8_t *m_p_videoram; bool m_nmi; @@ -732,7 +735,7 @@ QUICKLOAD_LOAD_MEMBER( homelab_state,homelab) } /* Machine driver */ -static MACHINE_CONFIG_START( homelab ) +MACHINE_CONFIG_START(homelab_state::homelab) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(homelab2_mem) @@ -764,7 +767,7 @@ static MACHINE_CONFIG_START( homelab ) MCFG_QUICKLOAD_ADD("quickload", homelab_state, homelab, "htp", 2) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( homelab3 ) +MACHINE_CONFIG_START(homelab_state::homelab3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 4) MCFG_CPU_PROGRAM_MAP(homelab3_mem) @@ -797,7 +800,7 @@ static MACHINE_CONFIG_START( homelab3 ) MCFG_QUICKLOAD_ADD("quickload", homelab_state, homelab, "htp", 2) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( brailab4 ) +MACHINE_CONFIG_START(homelab_state::brailab4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 4) MCFG_CPU_PROGRAM_MAP(brailab4_mem) diff --git a/src/mame/drivers/homerun.cpp b/src/mame/drivers/homerun.cpp index 8d8d7388b4e..82510fbf3f6 100644 --- a/src/mame/drivers/homerun.cpp +++ b/src/mame/drivers/homerun.cpp @@ -348,7 +348,7 @@ void homerun_state::machine_reset() /**************************************************************************/ -static MACHINE_CONFIG_START( dynashot ) +MACHINE_CONFIG_START(homerun_state::dynashot) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz/4) @@ -382,7 +382,7 @@ static MACHINE_CONFIG_START( dynashot ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( homerun, dynashot ) +MACHINE_CONFIG_DERIVED(homerun_state::homerun, dynashot) /* sound hardware */ MCFG_SOUND_ADD("d7756", UPD7756, UPD7759_STANDARD_CLOCK) @@ -394,7 +394,7 @@ static MACHINE_CONFIG_DERIVED( homerun, dynashot ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ganjaja, dynashot ) +MACHINE_CONFIG_DERIVED(homerun_state::ganjaja, dynashot) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/homez80.cpp b/src/mame/drivers/homez80.cpp index 0a21d013dc0..30ae417d14c 100644 --- a/src/mame/drivers/homez80.cpp +++ b/src/mame/drivers/homez80.cpp @@ -39,6 +39,7 @@ public: INTERRUPT_GEN_MEMBER(homez80_interrupt); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void homez80(machine_config &config); private: bool m_irq; virtual void machine_reset() override; @@ -278,7 +279,7 @@ INTERRUPT_GEN_MEMBER(homez80_state::homez80_interrupt) m_irq ^= 1; } -static MACHINE_CONFIG_START( homez80 ) +MACHINE_CONFIG_START(homez80_state::homez80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(homez80_mem) diff --git a/src/mame/drivers/horizon.cpp b/src/mame/drivers/horizon.cpp index 4d93f964040..58e250c4a5e 100644 --- a/src/mame/drivers/horizon.cpp +++ b/src/mame/drivers/horizon.cpp @@ -61,6 +61,8 @@ public: DECLARE_READ8_MEMBER(ff_r); + void horizon(machine_config &config); + void horizon2mhz(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -170,7 +172,7 @@ SLOT_INTERFACE_END // MACHINE_CONFIG( horizon ) //------------------------------------------------- -static MACHINE_CONFIG_START( horizon ) +MACHINE_CONFIG_START(horizon_state::horizon) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(horizon_mem) @@ -216,7 +218,7 @@ static MACHINE_CONFIG_START( horizon ) MCFG_SOFTWARE_LIST_ADD("flop_list", "horizon") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( horizon2mhz, horizon ) +MACHINE_CONFIG_DERIVED(horizon_state::horizon2mhz, horizon) MCFG_CPU_MODIFY("z80") MCFG_CPU_CLOCK(XTAL_4MHz / 2) diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp index 586fcea9451..74c0f0eacae 100644 --- a/src/mame/drivers/hornet.cpp +++ b/src/mame/drivers/hornet.cpp @@ -437,6 +437,11 @@ public: int jvs_encode_data(uint8_t *in, int length); int jvs_decode_data(uint8_t *in, uint8_t *out, int length); void jamma_jvs_cmd_exec(); + void terabrst(machine_config &config); + void sscope2(machine_config &config); + void hornet_2board(machine_config &config); + void hornet_2board_v2(machine_config &config); + void hornet(machine_config &config); }; @@ -1004,7 +1009,7 @@ ADC12138_IPT_CONVERT_CB(hornet_state::adc12138_input_callback) return (double)(value) / 2047.0; } -static MACHINE_CONFIG_START( hornet ) +MACHINE_CONFIG_START(hornet_state::hornet) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */ @@ -1066,7 +1071,7 @@ static MACHINE_CONFIG_START( hornet ) MCFG_KONPPC_CGBOARD_TYPE(HORNET) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hornet_2board, hornet ) +MACHINE_CONFIG_DERIVED(hornet_state::hornet_2board, hornet) MCFG_CPU_ADD("dsp2", ADSP21062, XTAL_36MHz) MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM) @@ -1123,13 +1128,13 @@ static MACHINE_CONFIG_DERIVED( hornet_2board, hornet ) MCFG_KONPPC_CGBOARD_TYPE(HORNET) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( terabrst, hornet ) +MACHINE_CONFIG_DERIVED(hornet_state::terabrst, hornet) MCFG_CPU_ADD("gn680", M68000, XTAL_32MHz/2) /* 16MHz */ MCFG_CPU_PROGRAM_MAP(gn680_memmap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hornet_2board_v2, hornet_2board ) +MACHINE_CONFIG_DERIVED(hornet_state::hornet_2board_v2, hornet_2board) MCFG_DEVICE_REMOVE("voodoo0") MCFG_DEVICE_ADD("voodoo0", VOODOO_2, STD_VOODOO_2_CLOCK) MCFG_VOODOO_FBMEM(2) @@ -1147,7 +1152,7 @@ static MACHINE_CONFIG_DERIVED( hornet_2board_v2, hornet_2board ) MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_1)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sscope2, hornet_2board_v2) +MACHINE_CONFIG_DERIVED(hornet_state::sscope2, hornet_2board_v2) MCFG_DS2401_ADD("lan_serial_id") MCFG_EEPROM_SERIAL_93C46_ADD("lan_eeprom") diff --git a/src/mame/drivers/hotblock.cpp b/src/mame/drivers/hotblock.cpp index 4b96adf8cdd..a0492d23028 100644 --- a/src/mame/drivers/hotblock.cpp +++ b/src/mame/drivers/hotblock.cpp @@ -77,6 +77,7 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void hotblock(machine_config &config); }; @@ -201,7 +202,7 @@ static INPUT_PORTS_START( hotblock ) INPUT_PORTS_END -static MACHINE_CONFIG_START( hotblock ) +MACHINE_CONFIG_START(hotblock_state::hotblock) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, 10000000) diff --git a/src/mame/drivers/hotstuff.cpp b/src/mame/drivers/hotstuff.cpp index 92554933fd7..60f03ad69b2 100644 --- a/src/mame/drivers/hotstuff.cpp +++ b/src/mame/drivers/hotstuff.cpp @@ -21,6 +21,7 @@ public: virtual void video_start() override; uint32_t screen_update_hotstuff(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void hotstuff(machine_config &config); }; @@ -87,7 +88,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( hotstuff ) INPUT_PORTS_END -static MACHINE_CONFIG_START( hotstuff ) +MACHINE_CONFIG_START(hotstuff_state::hotstuff) MCFG_CPU_ADD("maincpu", M68000, 16000000) MCFG_CPU_PROGRAM_MAP(hotstuff_map) diff --git a/src/mame/drivers/hp16500.cpp b/src/mame/drivers/hp16500.cpp index 971ef1d8b46..17d1d90174f 100644 --- a/src/mame/drivers/hp16500.cpp +++ b/src/mame/drivers/hp16500.cpp @@ -99,6 +99,10 @@ public: INTERRUPT_GEN_MEMBER(vblank); + void hp16500(machine_config &config); + void hp16500a(machine_config &config); + void hp1651(machine_config &config); + void hp1650(machine_config &config); private: uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs; }; @@ -406,7 +410,7 @@ uint32_t hp16500_state::screen_update_hp16500(screen_device &screen, bitmap_rgb3 return 0; } -static MACHINE_CONFIG_START( hp1650 ) +MACHINE_CONFIG_START(hp16500_state::hp1650) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) MCFG_CPU_PROGRAM_MAP(hp1650_map) @@ -426,7 +430,7 @@ static MACHINE_CONFIG_START( hp1650 ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hp1651 ) +MACHINE_CONFIG_START(hp16500_state::hp1651) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) MCFG_CPU_PROGRAM_MAP(hp1651_map) @@ -446,7 +450,7 @@ static MACHINE_CONFIG_START( hp1651 ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hp16500a ) +MACHINE_CONFIG_START(hp16500_state::hp16500a) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) MCFG_CPU_PROGRAM_MAP(hp16500a_map) @@ -464,7 +468,7 @@ static MACHINE_CONFIG_START( hp16500a ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hp16500 ) +MACHINE_CONFIG_START(hp16500_state::hp16500) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC030, 25000000) MCFG_CPU_PROGRAM_MAP(hp16500_map) diff --git a/src/mame/drivers/hp2100.cpp b/src/mame/drivers/hp2100.cpp index 2de7897e9e8..dcfd3fcb568 100644 --- a/src/mame/drivers/hp2100.cpp +++ b/src/mame/drivers/hp2100.cpp @@ -241,6 +241,7 @@ public: // , m_maincpu(*this, "maincpu") { } +void hp2100(machine_config &config); private: // required_device m_maincpu; }; @@ -251,7 +252,7 @@ private: static INPUT_PORTS_START( hp2100 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( hp2100 ) +MACHINE_CONFIG_START(hp2100_state::hp2100) MACHINE_CONFIG_END ROM_START( hp2100 ) diff --git a/src/mame/drivers/hp2620.cpp b/src/mame/drivers/hp2620.cpp index 6b6af27d0c6..e95a11357c1 100644 --- a/src/mame/drivers/hp2620.cpp +++ b/src/mame/drivers/hp2620.cpp @@ -32,6 +32,7 @@ public: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void hp2622(machine_config &config); private: required_device m_maincpu; required_region_ptr m_p_chargen; @@ -91,7 +92,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( hp2622 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( hp2622 ) +MACHINE_CONFIG_START(hp2620_state::hp2622) MCFG_CPU_ADD("maincpu", Z80, XTAL_25_7715MHz / 7) // 3.68 MHz MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/hp2640.cpp b/src/mame/drivers/hp2640.cpp index 1191f10138b..3d0b61d0999 100644 --- a/src/mame/drivers/hp2640.cpp +++ b/src/mame/drivers/hp2640.cpp @@ -152,6 +152,8 @@ public: DECLARE_WRITE_LINE_MEMBER(async_txd_w); TIMER_DEVICE_CALLBACK_MEMBER(timer_beep_exp); + + void hp2645(machine_config &config); protected: required_device m_cpu; required_device m_timer_10ms; @@ -974,7 +976,7 @@ static ADDRESS_MAP_START(cpu_io_map , AS_IO , 8 , hp2645_state) AM_RANGE(0x00 , 0xff) AM_WRITE(mode_byte_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START(hp2645) +MACHINE_CONFIG_START(hp2645_state::hp2645) MCFG_CPU_ADD("cpu" , I8080A , SYS_CLOCK / 2) MCFG_CPU_PROGRAM_MAP(cpu_mem_map) MCFG_CPU_IO_MAP(cpu_io_map) diff --git a/src/mame/drivers/hp48.cpp b/src/mame/drivers/hp48.cpp index d703b139449..3613bb31872 100644 --- a/src/mame/drivers/hp48.cpp +++ b/src/mame/drivers/hp48.cpp @@ -1257,7 +1257,7 @@ ADDRESS_MAP_END /*************************** driver ********************************/ -static MACHINE_CONFIG_START( hp48_common ) +MACHINE_CONFIG_START(hp48_state::hp48_common) /* cpu */ MCFG_CPU_ADD ( "maincpu", SATURN, 3937007 ) /* almost 4 MHz */ @@ -1289,7 +1289,7 @@ static MACHINE_CONFIG_START( hp48_common ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hp48gx, hp48_common ) +MACHINE_CONFIG_DERIVED(hp48_state::hp48gx, hp48_common) MCFG_MACHINE_START_OVERRIDE (hp48_state, hp48gx ) /* expansion ports */ @@ -1301,7 +1301,7 @@ static MACHINE_CONFIG_DERIVED( hp48gx, hp48_common ) //MCFG_KERMIT_ADD( "rs232_k", hp48_kermit_rs232_conf ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hp48g, hp48_common ) +MACHINE_CONFIG_DERIVED(hp48_state::hp48g, hp48_common) MCFG_MACHINE_START_OVERRIDE (hp48_state, hp48g ) /* serial I/O */ @@ -1310,7 +1310,7 @@ static MACHINE_CONFIG_DERIVED( hp48g, hp48_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hp48gp, hp48_common ) +MACHINE_CONFIG_DERIVED(hp48_state::hp48gp, hp48_common) MCFG_MACHINE_START_OVERRIDE (hp48_state, hp48gp ) /* serial I/O */ @@ -1319,7 +1319,7 @@ static MACHINE_CONFIG_DERIVED( hp48gp, hp48_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hp48sx, hp48_common ) +MACHINE_CONFIG_DERIVED(hp48_state::hp48sx, hp48_common) MCFG_CPU_MODIFY ( "maincpu" ) MCFG_CPU_CLOCK ( 2000000 ) MCFG_MACHINE_START_OVERRIDE (hp48_state, hp48sx ) @@ -1332,7 +1332,7 @@ static MACHINE_CONFIG_DERIVED( hp48sx, hp48_common ) //MCFG_KERMIT_ADD( "rs232_k", hp48_kermit_rs232_conf ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hp48s, hp48_common ) +MACHINE_CONFIG_DERIVED(hp48_state::hp48s, hp48_common) MCFG_CPU_MODIFY ( "maincpu" ) MCFG_CPU_CLOCK ( 2000000 ) MCFG_MACHINE_START_OVERRIDE (hp48_state, hp48s ) @@ -1341,7 +1341,7 @@ static MACHINE_CONFIG_DERIVED( hp48s, hp48_common ) //MCFG_KERMIT_ADD( "rs232_k", hp48_kermit_rs232_conf ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hp49g, hp48_common ) +MACHINE_CONFIG_DERIVED(hp48_state::hp49g, hp48_common) MCFG_CPU_MODIFY ( "maincpu" ) MCFG_MACHINE_START_OVERRIDE (hp48_state, hp49g ) diff --git a/src/mame/drivers/hp49gp.cpp b/src/mame/drivers/hp49gp.cpp index a1592d9fcf0..9ef0fd4f8e3 100644 --- a/src/mame/drivers/hp49gp.cpp +++ b/src/mame/drivers/hp49gp.cpp @@ -47,6 +47,7 @@ public: void lcd_spi_line_w( int line, int data); int lcd_spi_line_r( int line); required_device m_maincpu; + void hp49gp(machine_config &config); }; /*************************************************************************** @@ -276,7 +277,7 @@ DRIVER_INIT_MEMBER(hp49gp_state,hp49gp) lcd_spi_init(); } -static MACHINE_CONFIG_START( hp49gp ) +MACHINE_CONFIG_START(hp49gp_state::hp49gp) MCFG_CPU_ADD("maincpu", ARM9, 400000000) MCFG_CPU_PROGRAM_MAP(hp49gp_map) diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp index 54fe302a140..d9c7589278d 100644 --- a/src/mame/drivers/hp64k.cpp +++ b/src/mame/drivers/hp64k.cpp @@ -232,6 +232,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(hp64k_beeper_off); DECLARE_WRITE_LINE_MEMBER(hp64k_baud_clk_w); + void hp64k(machine_config &config); private: required_device m_cpu; required_device m_crtc; @@ -1333,7 +1334,7 @@ static SLOT_INTERFACE_START(hp64k_floppies) SLOT_INTERFACE("525dd" , FLOPPY_525_DD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START(hp64k) +MACHINE_CONFIG_START(hp64k_state::hp64k) MCFG_CPU_ADD("cpu" , HP_5061_3011 , 6250000) MCFG_CPU_PROGRAM_MAP(cpu_mem_map) MCFG_CPU_IO_MAP(cpu_io_map) diff --git a/src/mame/drivers/hp700.cpp b/src/mame/drivers/hp700.cpp index 942b641ed8f..857b5554d22 100644 --- a/src/mame/drivers/hp700.cpp +++ b/src/mame/drivers/hp700.cpp @@ -19,6 +19,7 @@ public: , m_maincpu(*this, "maincpu") { } + void hp700_92(machine_config &config); private: required_device m_maincpu; }; @@ -39,7 +40,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( hp700_92 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( hp700_92 ) +MACHINE_CONFIG_START(hp700_state::hp700_92) MCFG_CPU_ADD("maincpu", V20, XTAL_29_4912MHz / 3) // divider not verified MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/hp80.cpp b/src/mame/drivers/hp80.cpp index 803c2dfca78..ab35920f317 100644 --- a/src/mame/drivers/hp80.cpp +++ b/src/mame/drivers/hp80.cpp @@ -165,6 +165,7 @@ public: DECLARE_WRITE8_MEMBER(irl_w); DECLARE_WRITE8_MEMBER(halt_w); + void hp85(machine_config &config); protected: required_device m_cpu; required_device m_screen; @@ -1323,7 +1324,7 @@ static ADDRESS_MAP_START(rombank_mem_map , AS_PROGRAM , 8 , hp85_state) AM_RANGE(0x0000 , 0x1fff) AM_ROM ADDRESS_MAP_END -static MACHINE_CONFIG_START(hp85) +MACHINE_CONFIG_START(hp85_state::hp85) MCFG_CPU_ADD("cpu" , HP_CAPRICORN , MASTER_CLOCK / 16) MCFG_CPU_PROGRAM_MAP(cpu_mem_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(hp85_state , irq_callback) diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp index 5a290d8e2b2..837ce2e2d99 100644 --- a/src/mame/drivers/hp9845.cpp +++ b/src/mame/drivers/hp9845.cpp @@ -205,6 +205,8 @@ public: { } uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void hp9845a(machine_config &config); + void hp9835a(machine_config &config); }; static INPUT_PORTS_START( hp9845 ) @@ -860,6 +862,7 @@ public: DECLARE_WRITE_LINE_MEMBER(vblank_w); + void hp9845b(machine_config &config); protected: void set_graphic_mode(bool graphic); void set_video_mar(uint16_t mar); @@ -2084,6 +2087,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(scanline_timer); + void hp9845c(machine_config &config); protected: virtual void set_graphic_mode(bool graphic , bool alpha) override; void video_render_buff(unsigned video_scanline , unsigned line_in_row, bool buff_idx); @@ -2820,6 +2824,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(scanline_timer); + void hp9845t(machine_config &config); protected: virtual void set_graphic_mode(bool graphic , bool alpha) override; void video_render_buff(unsigned video_scanline , unsigned line_in_row, bool buff_idx); @@ -3652,7 +3657,7 @@ const uint8_t hp9845t_state::m_back_arrow_shape[] = { 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00 }; -static MACHINE_CONFIG_START( hp9845a ) +MACHINE_CONFIG_START(hp9845_state::hp9845a) //MCFG_CPU_ADD("lpu", HP_5061_3010, XTAL_11_4MHz) //MCFG_CPU_ADD("ppu", HP_5061_3011, XTAL_11_4MHz) @@ -3667,7 +3672,7 @@ static MACHINE_CONFIG_START( hp9845a ) MCFG_SOFTWARE_LIST_ADD("optrom_list", "hp9845a_rom") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hp9835a ) +MACHINE_CONFIG_START(hp9845_state::hp9835a) //MCFG_CPU_ADD("lpu", HP_5061_3001, XTAL_11_4MHz) //MCFG_CPU_ADD("ppu", HP_5061_3001, XTAL_11_4MHz) @@ -3741,7 +3746,7 @@ static ADDRESS_MAP_START(ppu_io_map , AS_IO , 16 , hp9845_base_state) AM_RANGE(HP_MAKE_IOADDR(T15_PA , 0) , HP_MAKE_IOADDR(T15_PA , 3)) AM_DEVREADWRITE("t15" , hp_taco_device , reg_r , reg_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START(hp9845_base) +MACHINE_CONFIG_START(hp9845_base_state::hp9845_base) MCFG_CPU_ADD("lpu", HP_5061_3001, 5700000) MCFG_CPU_PROGRAM_MAP(global_mem_map) MCFG_HPHYBRID_SET_9845_BOOT(true) @@ -3828,7 +3833,7 @@ static MACHINE_CONFIG_START(hp9845_base) MCFG_9845PRT_STS_HANDLER(WRITELINE(hp9845_base_state , prt_sts_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START(hp9845b) +MACHINE_CONFIG_START(hp9845b_state::hp9845b) MCFG_FRAGMENT_ADD(hp9845_base) // video hardware MCFG_SCREEN_MODIFY("screen") @@ -3846,7 +3851,7 @@ static MACHINE_CONFIG_START(hp9845b) MACHINE_CONFIG_END -static MACHINE_CONFIG_START(hp9845c) +MACHINE_CONFIG_START(hp9845c_state::hp9845c) MCFG_FRAGMENT_ADD(hp9845_base) // video hardware MCFG_SCREEN_MODIFY("screen") @@ -3860,7 +3865,7 @@ static MACHINE_CONFIG_START(hp9845c) MACHINE_CONFIG_END -static MACHINE_CONFIG_START(hp9845t) +MACHINE_CONFIG_START(hp9845t_state::hp9845t) MCFG_FRAGMENT_ADD(hp9845_base) // video hardware MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/hp9k.cpp b/src/mame/drivers/hp9k.cpp index 37b49c34886..11170d172a0 100644 --- a/src/mame/drivers/hp9k.cpp +++ b/src/mame/drivers/hp9k.cpp @@ -166,6 +166,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_gfxdecode; + void hp9k(machine_config &config); }; // @@ -392,7 +393,7 @@ WRITE8_MEMBER( hp9k_state::kbd_put ) } -static MACHINE_CONFIG_START( hp9k ) +MACHINE_CONFIG_START(hp9k_state::hp9k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(hp9k_mem) diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp index 39ebcab48d4..f650a033f18 100644 --- a/src/mame/drivers/hp9k_3xx.cpp +++ b/src/mame/drivers/hp9k_3xx.cpp @@ -134,6 +134,14 @@ public: #endif } + void hp9k370(machine_config &config); + void hp9k330(machine_config &config); + void hp9k382(machine_config &config); + void hp9k310(machine_config &config); + void hp9k340(machine_config &config); + void hp9k380(machine_config &config); + void hp9k320(machine_config &config); + void hp9k332(machine_config &config); private: bool m_in_buserr; bool m_hil_read; @@ -360,7 +368,7 @@ static SLOT_INTERFACE_START(dio16_cards) SLOT_INTERFACE("98603", HPDIO_98603) /* 98603 ROM BASIC */ SLOT_INTERFACE_END -static MACHINE_CONFIG_START( hp9k310 ) +MACHINE_CONFIG_START(hp9k3xx_state::hp9k310) /* basic machine hardware */ MCFG_CPU_ADD(MAINCPU_TAG, M68010, 10000000) MCFG_CPU_PROGRAM_MAP(hp9k310_map) @@ -389,7 +397,7 @@ static MACHINE_CONFIG_START( hp9k310 ) MCFG_DIO16_SLOT_ADD("diobus", "sl3", dio16_cards, nullptr, false) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hp9k320 ) +MACHINE_CONFIG_START(hp9k3xx_state::hp9k320) /* basic machine hardware */ MCFG_CPU_ADD(MAINCPU_TAG, M68020FPU, 16670000) MCFG_CPU_PROGRAM_MAP(hp9k320_map) @@ -418,13 +426,13 @@ static MACHINE_CONFIG_START( hp9k320 ) MCFG_DIO32_SLOT_ADD("diobus", "sl3", dio16_cards, nullptr, false) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hp9k330, hp9k320 ) +MACHINE_CONFIG_DERIVED(hp9k3xx_state::hp9k330, hp9k320) /* basic machine hardware */ MCFG_CPU_REPLACE(MAINCPU_TAG, M68020PMMU, 16670000) MCFG_CPU_PROGRAM_MAP(hp9k330_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hp9k332 ) +MACHINE_CONFIG_START(hp9k3xx_state::hp9k332) /* basic machine hardware */ MCFG_CPU_ADD(MAINCPU_TAG, M68020PMMU, 16670000) MCFG_CPU_PROGRAM_MAP(hp9k332_map) @@ -453,25 +461,25 @@ static MACHINE_CONFIG_START( hp9k332 ) MCFG_SCREEN_REFRESH_RATE(70) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hp9k340, hp9k320 ) +MACHINE_CONFIG_DERIVED(hp9k3xx_state::hp9k340, hp9k320) /* basic machine hardware */ MCFG_CPU_REPLACE(MAINCPU_TAG, M68030, 16670000) MCFG_CPU_PROGRAM_MAP(hp9k330_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hp9k370, hp9k320 ) +MACHINE_CONFIG_DERIVED(hp9k3xx_state::hp9k370, hp9k320) /* basic machine hardware */ MCFG_CPU_REPLACE(MAINCPU_TAG, M68030, 33000000) MCFG_CPU_PROGRAM_MAP(hp9k370_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hp9k380, hp9k320 ) +MACHINE_CONFIG_DERIVED(hp9k3xx_state::hp9k380, hp9k320) /* basic machine hardware */ MCFG_CPU_REPLACE(MAINCPU_TAG, M68040, 25000000) MCFG_CPU_PROGRAM_MAP(hp9k380_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hp9k382, hp9k320 ) +MACHINE_CONFIG_DERIVED(hp9k3xx_state::hp9k382, hp9k320) /* basic machine hardware */ MCFG_CPU_REPLACE(MAINCPU_TAG, M68040, 25000000) MCFG_CPU_PROGRAM_MAP(hp9k382_map) diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp index d3272864dce..cce458a2fe6 100644 --- a/src/mame/drivers/hp_ipc.cpp +++ b/src/mame/drivers/hp_ipc.cpp @@ -415,6 +415,7 @@ public: emu_timer *m_bus_error_timer; + void hp_ipc(machine_config &config); private: required_device m_maincpu; required_device m_bankdev; @@ -709,7 +710,7 @@ SLOT_INTERFACE_END * 2 HP-HIL devices (keyboard, mouse) * 1 Real-time clock */ -static MACHINE_CONFIG_START(hp_ipc) +MACHINE_CONFIG_START(hp_ipc_state::hp_ipc) MCFG_CPU_ADD("maincpu", M68000, XTAL_15_92MHz / 2) MCFG_CPU_PROGRAM_MAP(hp_ipc_mem_outer) diff --git a/src/mame/drivers/hprot1.cpp b/src/mame/drivers/hprot1.cpp index 03bac45704c..cd99fa4b864 100644 --- a/src/mame/drivers/hprot1.cpp +++ b/src/mame/drivers/hprot1.cpp @@ -77,6 +77,9 @@ public: DECLARE_DRIVER_INIT(hprot1); DECLARE_PALETTE_INIT(hprot1); HD44780_PIXEL_UPDATE(hprot1_pixel_update); + void hprotr8a(machine_config &config); + void hprot2r6(machine_config &config); + void hprot1(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -300,7 +303,7 @@ HD44780_PIXEL_UPDATE(hprot1_state::hprot1_pixel_update) } } -static MACHINE_CONFIG_START( hprot1 ) +MACHINE_CONFIG_START(hprot1_state::hprot1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C31, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP(i80c31_prg) @@ -329,7 +332,7 @@ static MACHINE_CONFIG_START( hprot1 ) /* TODO: emulate the ADM695AN chip (watchdog/brownout reset)*/ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hprotr8a, hprot1 ) +MACHINE_CONFIG_DERIVED(hprot1_state::hprotr8a, hprot1) MCFG_CPU_REPLACE("maincpu", I80C31, 11059200) // value of X1 cristal on the PCB MCFG_CPU_PROGRAM_MAP(i80c31_prg) MCFG_CPU_IO_MAP(i80c31_io) @@ -345,7 +348,7 @@ static MACHINE_CONFIG_DERIVED( hprotr8a, hprot1 ) /* TODO: add an I2C interface (the board has GND/VCC/SDA/SCL pins available in a connector) */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hprot2r6, hprot1 ) +MACHINE_CONFIG_DERIVED(hprot1_state::hprot2r6, hprot1) MCFG_CPU_REPLACE("maincpu", I80C31, 11059200) // value of X1 cristal on the PCB MCFG_CPU_PROGRAM_MAP(i80c31_prg) MCFG_CPU_IO_MAP(i80c31_io) diff --git a/src/mame/drivers/hpz80unk.cpp b/src/mame/drivers/hpz80unk.cpp index 3f63642b353..6a30490d239 100644 --- a/src/mame/drivers/hpz80unk.cpp +++ b/src/mame/drivers/hpz80unk.cpp @@ -70,6 +70,7 @@ public: DECLARE_WRITE8_MEMBER(port0e_w); DECLARE_READ8_MEMBER(portfc_r); + void hpz80unk(machine_config &config); private: uint8_t m_port02_data; virtual void machine_reset() override; @@ -213,7 +214,7 @@ void hpz80unk_state::machine_reset() } -static MACHINE_CONFIG_START( hpz80unk ) +MACHINE_CONFIG_START(hpz80unk_state::hpz80unk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(hpz80unk_mem) diff --git a/src/mame/drivers/ht68k.cpp b/src/mame/drivers/ht68k.cpp index b8a5445c1ff..a1c1af325d4 100644 --- a/src/mame/drivers/ht68k.cpp +++ b/src/mame/drivers/ht68k.cpp @@ -65,6 +65,7 @@ public: DECLARE_WRITE8_MEMBER(duart_output); required_shared_ptr m_p_ram; virtual void machine_reset() override; + void ht68k(machine_config &config); }; @@ -123,7 +124,7 @@ static SLOT_INTERFACE_START( ht68k_floppies ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( ht68k ) +MACHINE_CONFIG_START(ht68k_state::ht68k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(ht68k_mem) diff --git a/src/mame/drivers/huebler.cpp b/src/mame/drivers/huebler.cpp index 2f372149eb9..ff2293e02df 100644 --- a/src/mame/drivers/huebler.cpp +++ b/src/mame/drivers/huebler.cpp @@ -309,7 +309,7 @@ static GFXDECODE_START( amu880 ) GFXDECODE_END -static MACHINE_CONFIG_START( amu880 ) +MACHINE_CONFIG_START(amu880_state::amu880) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10MHz/4) // U880D MCFG_CPU_PROGRAM_MAP(amu880_mem) diff --git a/src/mame/drivers/hunter2.cpp b/src/mame/drivers/hunter2.cpp index 4d77977cf6a..013dfa266ff 100644 --- a/src/mame/drivers/hunter2.cpp +++ b/src/mame/drivers/hunter2.cpp @@ -69,6 +69,7 @@ public: DECLARE_WRITE_LINE_MEMBER(cts_w); DECLARE_WRITE_LINE_MEMBER(rxd_w); + void hunter2(machine_config &config); private: uint8_t m_keydata; uint8_t m_irq_mask; @@ -365,7 +366,7 @@ WRITE_LINE_MEMBER(hunter2_state::rxd_w) m_maincpu->set_input_line(NSC800_RSTB, ASSERT_LINE); } -static MACHINE_CONFIG_START( hunter2 ) +MACHINE_CONFIG_START(hunter2_state::hunter2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NSC800, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(hunter2_mem) diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp index 5f79c40b086..810f4e415d1 100644 --- a/src/mame/drivers/hvyunit.cpp +++ b/src/mame/drivers/hvyunit.cpp @@ -149,6 +149,7 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank); TIMER_DEVICE_CALLBACK_MEMBER(scanline); + void hvyunit(machine_config &config); }; @@ -609,7 +610,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(hvyunit_state::scanline) * *************************************/ -static MACHINE_CONFIG_START( hvyunit ) +MACHINE_CONFIG_START(hvyunit_state::hvyunit) MCFG_CPU_ADD("master", Z80, 6000000) MCFG_CPU_PROGRAM_MAP(master_memory) diff --git a/src/mame/drivers/hx20.cpp b/src/mame/drivers/hx20.cpp index b06b9431e21..79876628942 100644 --- a/src/mame/drivers/hx20.cpp +++ b/src/mame/drivers/hx20.cpp @@ -889,7 +889,7 @@ void hx20_state::machine_start() // MACHINE_CONFIG( hx20 ) //------------------------------------------------- -static MACHINE_CONFIG_START( hx20 ) +MACHINE_CONFIG_START(hx20_state::hx20) // basic machine hardware MCFG_CPU_ADD(HD6301V1_MAIN_TAG, HD63701, XTAL_2_4576MHz) MCFG_CPU_PROGRAM_MAP(hx20_mem) @@ -953,7 +953,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( hx20 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cm6000, hx20 ) +MACHINE_CONFIG_DERIVED(hx20_state::cm6000, hx20) // basic machine hardware MCFG_CPU_MODIFY(HD6301V1_MAIN_TAG) MCFG_CPU_PROGRAM_MAP(cm6000_mem) diff --git a/src/mame/drivers/hyhoo.cpp b/src/mame/drivers/hyhoo.cpp index e753ba0a1f6..a4cdc292bae 100644 --- a/src/mame/drivers/hyhoo.cpp +++ b/src/mame/drivers/hyhoo.cpp @@ -224,7 +224,7 @@ static INPUT_PORTS_START( hyhoo2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( hyhoo ) +MACHINE_CONFIG_START(hyhoo_state::hyhoo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz ?? */ @@ -260,7 +260,7 @@ static MACHINE_CONFIG_START( hyhoo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hyhoo2, hyhoo ) +MACHINE_CONFIG_DERIVED(hyhoo_state::hyhoo2, hyhoo) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_HYHOO2 ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/hyperscan.cpp b/src/mame/drivers/hyperscan.cpp index 91447a27ce3..66f8f99a6a3 100644 --- a/src/mame/drivers/hyperscan.cpp +++ b/src/mame/drivers/hyperscan.cpp @@ -88,6 +88,7 @@ public: void spg290_blit_bitmap(bitmap_rgb32 &bitmap, const rectangle &cliprect, uint32_t control, uint32_t attribute, int posy, int posx, uint32_t nptr, uint32_t buf_start, uint32_t transrgb); void spg290_blit_character(bitmap_rgb32 &bitmap, const rectangle &cliprect, uint32_t control, uint32_t attribute, int posy, int posx, uint32_t nptr, uint32_t buf_start, uint32_t transrgb); + void hyperscan(machine_config &config); private: static const device_timer_id TIMER_SPG290 = 0; static const device_timer_id TIMER_I2C = 1; @@ -616,7 +617,7 @@ void hyperscan_state::machine_reset() } -static MACHINE_CONFIG_START( hyperscan ) +MACHINE_CONFIG_START(hyperscan_state::hyperscan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SCORE7, XTAL_27MHz * 4) // 108MHz S+core 7 MCFG_CPU_PROGRAM_MAP(spg290_mem) diff --git a/src/mame/drivers/hyperspt.cpp b/src/mame/drivers/hyperspt.cpp index b003e0794ef..64e208512b7 100644 --- a/src/mame/drivers/hyperspt.cpp +++ b/src/mame/drivers/hyperspt.cpp @@ -288,7 +288,7 @@ INTERRUPT_GEN_MEMBER(hyperspt_state::vblank_irq) device.execute().set_input_line(0, ASSERT_LINE); } -static MACHINE_CONFIG_START( hyperspt ) +MACHINE_CONFIG_START(hyperspt_state::hyperspt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI1, XTAL_18_432MHz/12) /* verified on pcb */ @@ -343,18 +343,50 @@ static MACHINE_CONFIG_START( hyperspt ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END +static ADDRESS_MAP_START( hyprolyb_adpcm_map, AS_PROGRAM, 8, hyprolyb_adpcm_device ) + AM_RANGE(0x0000, 0x007f) AM_RAM + AM_RANGE(0x1000, 0x1000) AM_DEVREAD("hyprolyb_adpcm", hyprolyb_adpcm_device, data_r) + AM_RANGE(0x1001, 0x1001) AM_DEVREAD("hyprolyb_adpcm", hyprolyb_adpcm_device, ready_r) + AM_RANGE(0x1002, 0x1002) AM_DEVWRITE("hyprolyb_adpcm", hyprolyb_adpcm_device, msm_data_w) + AM_RANGE(0x1003, 0x1003) AM_DEVREAD("hyprolyb_adpcm", hyprolyb_adpcm_device, msm_vck_r) + // on init: + // $1003 = $00 + // $1002 = $FF + // $1003 = $34 + // $1001 = $36 + // $1002 = $80 + // loops while ($1003) & 0x80 == 0 + // 1002 = ADPCM data written (low 4 bits) + // + // $1003 & $80 (in) = 5205 DRQ + // $1002 & $0f (out) = 5205 data + // $1001 & $80 (in) = sound latch request + // $1000 (in) = sound latch data + AM_RANGE(0x8000, 0xffff) AM_ROM +ADDRESS_MAP_END + -static MACHINE_CONFIG_DERIVED( hypersptb, hyperspt ) +MACHINE_CONFIG_DERIVED(hyperspt_state::hypersptb, hyperspt) MCFG_DEVICE_REMOVE("vlm") MCFG_CPU_MODIFY("audiocpu") MCFG_CPU_PROGRAM_MAP(soundb_map) - MCFG_FRAGMENT_ADD(hyprolyb_adpcm) + MCFG_CPU_ADD("adpcm", M6802, XTAL_14_31818MHz/8) /* unknown clock */ + MCFG_CPU_PROGRAM_MAP(hyprolyb_adpcm_map) + + MCFG_GENERIC_LATCH_8_ADD("soundlatch2") + + MCFG_SOUND_ADD("hyprolyb_adpcm", HYPROLYB_ADPCM, 0) + + MCFG_SOUND_ADD("msm", MSM5205, 384000) + MCFG_MSM5205_VCLK_CB(DEVWRITELINE("hyprolyb_adpcm", hyprolyb_adpcm_device, vck_callback)) /* VCK function */ + MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4 kHz */ + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( roadf, hyperspt ) +MACHINE_CONFIG_DERIVED(hyperspt_state::roadf, hyperspt) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(roadf_map) diff --git a/src/mame/drivers/hyprduel.cpp b/src/mame/drivers/hyprduel.cpp index 01df793dacb..5d83e94899b 100644 --- a/src/mame/drivers/hyprduel.cpp +++ b/src/mame/drivers/hyprduel.cpp @@ -651,7 +651,7 @@ MACHINE_START_MEMBER(hyprduel_state,magerror) m_magerror_irq_timer->adjust(attotime::zero, 0, attotime::from_hz(968)); /* tempo? */ } -static MACHINE_CONFIG_START( hyprduel ) +MACHINE_CONFIG_START(hyprduel_state::hyprduel) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* 10MHz */ @@ -692,7 +692,7 @@ static MACHINE_CONFIG_START( hyprduel ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( magerror ) +MACHINE_CONFIG_START(hyprduel_state::magerror) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* 10MHz */ diff --git a/src/mame/drivers/i7000.cpp b/src/mame/drivers/i7000.cpp index f8c38bdf255..d08df3e49b0 100644 --- a/src/mame/drivers/i7000.cpp +++ b/src/mame/drivers/i7000.cpp @@ -86,6 +86,7 @@ public: DECLARE_READ8_MEMBER(i7000_kbd_r); DECLARE_WRITE8_MEMBER(i7000_scanlines_w); + void i7000(machine_config &config); }; WRITE8_MEMBER( i7000_state::i7000_scanlines_w ) @@ -332,7 +333,7 @@ MC6845_ON_UPDATE_ADDR_CHANGED(i7000_state::crtc_addr) } -static MACHINE_CONFIG_START( i7000 ) +MACHINE_CONFIG_START(i7000_state::i7000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NSC800, XTAL_4MHz) diff --git a/src/mame/drivers/ibm3153.cpp b/src/mame/drivers/ibm3153.cpp index 19542cf5e7b..86d91f93050 100644 --- a/src/mame/drivers/ibm3153.cpp +++ b/src/mame/drivers/ibm3153.cpp @@ -54,6 +54,7 @@ public: DECLARE_PALETTE_INIT(ibm3153); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void ibm3153(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -93,7 +94,7 @@ void ibm3153_state::machine_reset() { } -static MACHINE_CONFIG_START( ibm3153 ) +MACHINE_CONFIG_START(ibm3153_state::ibm3153) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C32, XTAL_16MHz) // no idea of clock MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/ibm6580.cpp b/src/mame/drivers/ibm6580.cpp index 58cdc215aca..1913e1cec69 100644 --- a/src/mame/drivers/ibm6580.cpp +++ b/src/mame/drivers/ibm6580.cpp @@ -182,6 +182,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void ibm6580(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -874,7 +875,7 @@ static SLOT_INTERFACE_START( dw_floppies ) SLOT_INTERFACE( "8sssd", IBM_6360 ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( ibm6580 ) +MACHINE_CONFIG_START(ibm6580_state::ibm6580) MCFG_CPU_ADD("maincpu", I8086, XTAL_14_7456MHz/3) MCFG_CPU_PROGRAM_MAP(ibm6580_mem) MCFG_CPU_IO_MAP(ibm6580_io) diff --git a/src/mame/drivers/ibmpc.cpp b/src/mame/drivers/ibmpc.cpp index 01f9aa926b3..19139fea6ce 100644 --- a/src/mame/drivers/ibmpc.cpp +++ b/src/mame/drivers/ibmpc.cpp @@ -270,6 +270,9 @@ public: m_maincpu(*this, "maincpu") { } required_device m_maincpu; + void ibm5160(machine_config &config); + void ibm5150(machine_config &config); + void ibm5140(machine_config &config); }; static ADDRESS_MAP_START( pc8_map, AS_PROGRAM, 8, ibmpc_state ) @@ -286,7 +289,7 @@ static DEVICE_INPUT_DEFAULTS_START(cga) DEVICE_INPUT_DEFAULTS("DSW0",0x30, 0x20) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( ibm5150 ) +MACHINE_CONFIG_START(ibmpc_state::ibm5150) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3) MCFG_CPU_PROGRAM_MAP(pc8_map) @@ -316,14 +319,14 @@ static MACHINE_CONFIG_START( ibm5150 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ibm5140, ibm5150 ) +MACHINE_CONFIG_DERIVED(ibmpc_state::ibm5140, ibm5150) /* software lists */ MCFG_DEVICE_REMOVE( "disk_list" ) MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5140") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ibm5160 ) +MACHINE_CONFIG_START(ibmpc_state::ibm5160) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3) MCFG_CPU_PROGRAM_MAP(pc8_map) diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp index 692db0c95bd..0ce55a812ec 100644 --- a/src/mame/drivers/ibmpcjr.cpp +++ b/src/mame/drivers/ibmpcjr.cpp @@ -106,6 +106,8 @@ public: void machine_reset() override; DECLARE_DRIVER_INIT(pcjr); + void ibmpcjx(machine_config &config); + void ibmpcjr(machine_config &config); }; static INPUT_PORTS_START( ibmpcjr ) @@ -575,7 +577,7 @@ static ADDRESS_MAP_START(ibmpcjx_io, AS_IO, 8, pcjr_state) AM_IMPORT_FROM( ibmpcjr_io ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( ibmpcjr ) +MACHINE_CONFIG_START(pcjr_state::ibmpcjr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, 4900000) MCFG_CPU_PROGRAM_MAP(ibmpcjr_map) @@ -670,7 +672,7 @@ static GFXDECODE_START( ibmpcjx ) GFXDECODE_ENTRY( "kanji", 0x0000, kanji_layout, 3, 1 ) GFXDECODE_END -static MACHINE_CONFIG_DERIVED( ibmpcjx, ibmpcjr ) +MACHINE_CONFIG_DERIVED(pcjr_state::ibmpcjx, ibmpcjr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(ibmpcjx_map) MCFG_CPU_IO_MAP(ibmpcjx_io) diff --git a/src/mame/drivers/icatel.cpp b/src/mame/drivers/icatel.cpp index c172f16cb04..4e2e8dfa481 100644 --- a/src/mame/drivers/icatel.cpp +++ b/src/mame/drivers/icatel.cpp @@ -62,6 +62,7 @@ public: HD44780_PIXEL_UPDATE(icatel_pixel_update); + void icatel(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -239,7 +240,7 @@ HD44780_PIXEL_UPDATE(icatel_state::icatel_pixel_update) } } -static MACHINE_CONFIG_START( icatel ) +MACHINE_CONFIG_START(icatel_state::icatel) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C31, XTAL_2_097152MHz) MCFG_CPU_PROGRAM_MAP(i80c31_prg) diff --git a/src/mame/drivers/ice_bozopail.cpp b/src/mame/drivers/ice_bozopail.cpp index c726425e66d..d6905aaf852 100644 --- a/src/mame/drivers/ice_bozopail.cpp +++ b/src/mame/drivers/ice_bozopail.cpp @@ -33,6 +33,7 @@ public: virtual void machine_reset() override; required_device m_maincpu; + void ice_bozo(machine_config &config); }; static ADDRESS_MAP_START( ice_bozo_map, AS_PROGRAM, 8, ice_bozopail_state ) @@ -53,7 +54,7 @@ void ice_bozopail_state::machine_reset() } -static MACHINE_CONFIG_START( ice_bozo ) +MACHINE_CONFIG_START(ice_bozopail_state::ice_bozo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC68HC11, 8000000) // unknown clock diff --git a/src/mame/drivers/ice_tbd.cpp b/src/mame/drivers/ice_tbd.cpp index 011910db128..177f1a6c8a1 100644 --- a/src/mame/drivers/ice_tbd.cpp +++ b/src/mame/drivers/ice_tbd.cpp @@ -29,6 +29,7 @@ public: , m_maincpu(*this, "maincpu") { } + void ice_tbd(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -59,7 +60,7 @@ void ice_tbd_state::machine_reset() { } -static MACHINE_CONFIG_START( ice_tbd ) +MACHINE_CONFIG_START(ice_tbd_state::ice_tbd) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */ diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp index 96b81561513..a3fe384ac6c 100644 --- a/src/mame/drivers/icecold.cpp +++ b/src/mame/drivers/icecold.cpp @@ -63,6 +63,7 @@ public: int m_lmotor; // left motor position (0-100) TIMER_DEVICE_CALLBACK_MEMBER(icecold_sint_timer); TIMER_DEVICE_CALLBACK_MEMBER(icecold_motors_timer); + void icecold(machine_config &config); }; static ADDRESS_MAP_START( icecold_map, AS_PROGRAM, 8, icecold_state ) @@ -330,7 +331,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(icecold_state::icecold_motors_timer) } } -static MACHINE_CONFIG_START( icecold ) +MACHINE_CONFIG_START(icecold_state::icecold) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_6MHz/4) // 68A09E diff --git a/src/mame/drivers/ichiban.cpp b/src/mame/drivers/ichiban.cpp index 903eef5634d..f0776765348 100644 --- a/src/mame/drivers/ichiban.cpp +++ b/src/mame/drivers/ichiban.cpp @@ -63,6 +63,7 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void ichibanjyan(machine_config &config); }; void ichibanjyan_state::video_start() @@ -115,7 +116,7 @@ void ichibanjyan_state::machine_reset() } -static MACHINE_CONFIG_START( ichibanjyan ) +MACHINE_CONFIG_START(ichibanjyan_state::ichibanjyan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,MAIN_CLOCK/3) diff --git a/src/mame/drivers/idsa.cpp b/src/mame/drivers/idsa.cpp index ee1ffc1dcc3..ccd81445f6b 100644 --- a/src/mame/drivers/idsa.cpp +++ b/src/mame/drivers/idsa.cpp @@ -63,6 +63,8 @@ public: DECLARE_WRITE8_MEMBER(ay2_a_w); DECLARE_WRITE8_MEMBER(ay2_b_w); + void bsktbllp(machine_config &config); + void idsa(machine_config &config); private: virtual void machine_reset() override; @@ -324,7 +326,7 @@ void idsa_state::machine_reset() m_irqcnt = 0; } -static MACHINE_CONFIG_START( idsa ) +MACHINE_CONFIG_START(idsa_state::idsa) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(maincpu_map) @@ -353,7 +355,7 @@ static MACHINE_CONFIG_START( idsa ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bsktbllp, idsa ) +MACHINE_CONFIG_DERIVED(idsa_state::bsktbllp, idsa) MCFG_DEVICE_MODIFY("aysnd1") MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(idsa_state, ppi_control_w)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(idsa_state, ppi_data_w)) diff --git a/src/mame/drivers/ie15.cpp b/src/mame/drivers/ie15.cpp index 96ced86bd46..1b547a8c116 100644 --- a/src/mame/drivers/ie15.cpp +++ b/src/mame/drivers/ie15.cpp @@ -26,10 +26,11 @@ public: { } required_device m_ie15; + void ie15(machine_config &config); }; -static MACHINE_CONFIG_START( ie15 ) +MACHINE_CONFIG_START(ie15_state::ie15) MCFG_DEVICE_ADD("ie15", IE15, 0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/if800.cpp b/src/mame/drivers/if800.cpp index bbb4cff5895..9d1d6307ff9 100644 --- a/src/mame/drivers/if800.cpp +++ b/src/mame/drivers/if800.cpp @@ -32,6 +32,7 @@ public: required_device m_maincpu; required_device m_palette; UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); + void if800(machine_config &config); }; UPD7220_DISPLAY_PIXELS_MEMBER( if800_state::hgdc_display_pixels ) @@ -80,7 +81,7 @@ static ADDRESS_MAP_START( upd7220_map, 0, 16, if800_state ) AM_RANGE(0x00000, 0x3ffff) AM_RAM AM_SHARE("video_ram") ADDRESS_MAP_END -static MACHINE_CONFIG_START( if800 ) +MACHINE_CONFIG_START(if800_state::if800) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, 8000000) MCFG_CPU_PROGRAM_MAP(if800_map) diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp index e07eb86fbcf..f759049d9b0 100644 --- a/src/mame/drivers/igs009.cpp +++ b/src/mame/drivers/igs009.cpp @@ -118,6 +118,8 @@ public: DECLARE_VIDEO_START(gp98); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void gp98(machine_config &config); + void jingbell(machine_config &config); }; @@ -808,7 +810,7 @@ INTERRUPT_GEN_MEMBER(igs009_state::interrupt) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( jingbell ) +MACHINE_CONFIG_START(igs009_state::jingbell) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */ MCFG_CPU_PROGRAM_MAP(jingbell_map) @@ -850,7 +852,7 @@ static MACHINE_CONFIG_START( jingbell ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gp98, jingbell ) +MACHINE_CONFIG_DERIVED(igs009_state::gp98, jingbell) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(gp98_portmap) diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp index 042aa6b5056..52b6cf93dfc 100644 --- a/src/mame/drivers/igs011.cpp +++ b/src/mame/drivers/igs011.cpp @@ -253,6 +253,16 @@ public: void vbowl_gfx_decrypt(); void drgnwrld_gfx_decrypt(); void prot_mem_range_set(); + void igs011_base(machine_config &config); + void drgnwrld(machine_config &config); + void nkishusp(machine_config &config); + void wlcc(machine_config &config); + void vbowl(machine_config &config); + void vbowlhk(machine_config &config); + void xymg(machine_config &config); + void lhb2(machine_config &config); + void lhb(machine_config &config); + void drgnwrld_igs012(machine_config &config); }; @@ -4138,7 +4148,7 @@ static GFXDECODE_START( igs011_hi ) GFXDECODE_END #endif -static MACHINE_CONFIG_START( igs011_base ) +MACHINE_CONFIG_START(igs011_state::igs011_base) MCFG_CPU_ADD("maincpu",M68000, XTAL_22MHz/3) MCFG_NVRAM_ADD_0FILL("nvram") @@ -4168,7 +4178,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( igs011_state::lev5_timer_irq_cb ) m_maincpu->set_input_line(5, HOLD_LINE); } -static MACHINE_CONFIG_DERIVED( drgnwrld, igs011_base ) +MACHINE_CONFIG_DERIVED(igs011_state::drgnwrld, igs011_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(drgnwrld) MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold) @@ -4178,7 +4188,7 @@ static MACHINE_CONFIG_DERIVED( drgnwrld, igs011_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( drgnwrld_igs012, drgnwrld ) +MACHINE_CONFIG_DERIVED(igs011_state::drgnwrld_igs012, drgnwrld) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(drgnwrld_igs012) MACHINE_CONFIG_END @@ -4201,7 +4211,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( igs011_state::lhb_timer_irq_cb ) m_maincpu->set_input_line(5, HOLD_LINE); } -static MACHINE_CONFIG_DERIVED( lhb, igs011_base ) +MACHINE_CONFIG_DERIVED(igs011_state::lhb, igs011_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(lhb) MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, lhb_vblank_irq) @@ -4217,7 +4227,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( igs011_state::lev3_timer_irq_cb ) } -static MACHINE_CONFIG_DERIVED( wlcc, igs011_base ) +MACHINE_CONFIG_DERIVED(igs011_state::wlcc, igs011_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(wlcc) MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold) @@ -4226,7 +4236,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( xymg, igs011_base ) +MACHINE_CONFIG_DERIVED(igs011_state::xymg, igs011_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(xymg) MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold) @@ -4235,7 +4245,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lhb2, igs011_base ) +MACHINE_CONFIG_DERIVED(igs011_state::lhb2, igs011_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(lhb2) MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold) @@ -4249,7 +4259,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nkishusp, igs011_base ) +MACHINE_CONFIG_DERIVED(igs011_state::nkishusp, igs011_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(nkishusp) MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold) @@ -4270,7 +4280,7 @@ WRITE_LINE_MEMBER(igs011_state::sound_irq) // m_maincpu->set_input_line(3, state); } -static MACHINE_CONFIG_DERIVED( vbowl, igs011_base ) +MACHINE_CONFIG_DERIVED(igs011_state::vbowl, igs011_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(vbowl) MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold) @@ -4288,7 +4298,7 @@ static MACHINE_CONFIG_DERIVED( vbowl, igs011_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vbowlhk, vbowl ) +MACHINE_CONFIG_DERIVED(igs011_state::vbowlhk, vbowl) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(vbowlhk) MACHINE_CONFIG_END diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp index ed794f720e9..94e10a17a19 100644 --- a/src/mame/drivers/igs017.cpp +++ b/src/mame/drivers/igs017.cpp @@ -197,6 +197,16 @@ public: void slqz2_patch_rom(); void slqz2_decrypt_tiles(); void spkrform_decrypt_sprites(); + void mgcs(machine_config &config); + void mgdha(machine_config &config); + void tjsb(machine_config &config); + void lhzb2a(machine_config &config); + void slqz2(machine_config &config); + void iqblocka(machine_config &config); + void lhzb2(machine_config &config); + void starzan(machine_config &config); + void spkrform(machine_config &config); + void sdmg2(machine_config &config); }; void igs017_state::machine_reset() @@ -3250,7 +3260,7 @@ MACHINE_RESET_MEMBER(igs017_state,iqblocka) m_input_select = 0; } -static MACHINE_CONFIG_START( iqblocka ) +MACHINE_CONFIG_START(igs017_state::iqblocka) MCFG_CPU_ADD("maincpu", Z180, XTAL_16MHz / 2) MCFG_CPU_PROGRAM_MAP(iqblocka_map) MCFG_CPU_IO_MAP(iqblocka_io) @@ -3288,7 +3298,7 @@ static MACHINE_CONFIG_START( iqblocka ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( starzan, iqblocka ) +MACHINE_CONFIG_DERIVED(igs017_state::starzan, iqblocka) MCFG_DEVICE_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END @@ -3315,7 +3325,7 @@ MACHINE_RESET_MEMBER(igs017_state,mgcs) memset(m_igs_magic, 0, sizeof(m_igs_magic)); } -static MACHINE_CONFIG_START( mgcs ) +MACHINE_CONFIG_START(igs017_state::mgcs) MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2) MCFG_CPU_PROGRAM_MAP(mgcs) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) @@ -3354,7 +3364,7 @@ MACHINE_CONFIG_END // lhzb2 -static MACHINE_CONFIG_START( lhzb2 ) +MACHINE_CONFIG_START(igs017_state::lhzb2) MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2) MCFG_CPU_PROGRAM_MAP(lhzb2) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) @@ -3406,7 +3416,7 @@ MACHINE_RESET_MEMBER(igs017_state,lhzb2a) lhzb2a_input_addr_w(m_maincpu->space(AS_PROGRAM), 0, 0xf0); } -static MACHINE_CONFIG_START( lhzb2a ) +MACHINE_CONFIG_START(igs017_state::lhzb2a) MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz/2) MCFG_CPU_PROGRAM_MAP(lhzb2a) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) @@ -3443,7 +3453,7 @@ MACHINE_CONFIG_END // slqz2 -static MACHINE_CONFIG_START( slqz2 ) +MACHINE_CONFIG_START(igs017_state::slqz2) MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2) MCFG_CPU_PROGRAM_MAP(slqz2) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) @@ -3487,7 +3497,7 @@ MACHINE_CONFIG_END // sdmg2 -static MACHINE_CONFIG_START( sdmg2 ) +MACHINE_CONFIG_START(igs017_state::sdmg2) MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz/2) MCFG_CPU_PROGRAM_MAP(sdmg2) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) @@ -3535,7 +3545,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(igs017_state::mgdh_interrupt) m_maincpu->set_input_line(3, HOLD_LINE); // lev 3 instead of 2 } -static MACHINE_CONFIG_START( mgdha ) +MACHINE_CONFIG_START(igs017_state::mgdha) MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2) MCFG_CPU_PROGRAM_MAP(mgdha_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgdh_interrupt, "screen", 0, 1) @@ -3571,7 +3581,7 @@ MACHINE_CONFIG_END // tjsb -static MACHINE_CONFIG_START( tjsb ) +MACHINE_CONFIG_START(igs017_state::tjsb) MCFG_CPU_ADD("maincpu", Z180, XTAL_16MHz / 2) MCFG_CPU_PROGRAM_MAP(tjsb_map) MCFG_CPU_IO_MAP(tjsb_io) @@ -3614,7 +3624,7 @@ MACHINE_CONFIG_END // spkrform -static MACHINE_CONFIG_START( spkrform ) +MACHINE_CONFIG_START(igs017_state::spkrform) MCFG_CPU_ADD("maincpu", Z180, XTAL_16MHz / 2) MCFG_CPU_PROGRAM_MAP(spkrform_map) MCFG_CPU_IO_MAP(spkrform_io) diff --git a/src/mame/drivers/igs_fear.cpp b/src/mame/drivers/igs_fear.cpp index e864fad5fcb..a1bfe1d44e3 100644 --- a/src/mame/drivers/igs_fear.cpp +++ b/src/mame/drivers/igs_fear.cpp @@ -30,6 +30,7 @@ public: required_device m_maincpu; optional_device m_gfxdecode; required_device m_palette; + void igs_fear(machine_config &config); }; @@ -75,7 +76,7 @@ WRITE_LINE_MEMBER(igs_fear_state::sound_irq) } -static MACHINE_CONFIG_START( igs_fear ) +MACHINE_CONFIG_START(igs_fear_state::igs_fear) MCFG_CPU_ADD("maincpu",ARM7, 50000000/2) MCFG_CPU_PROGRAM_MAP(igs_igs_fear_map) diff --git a/src/mame/drivers/igs_m027.cpp b/src/mame/drivers/igs_m027.cpp index 195d3fd8cc4..e63c7919741 100644 --- a/src/mame/drivers/igs_m027.cpp +++ b/src/mame/drivers/igs_m027.cpp @@ -65,6 +65,8 @@ public: void sdwx_gfx_decrypt(); void pgm_create_dummy_internal_arm_region(); + void igs_majhong(machine_config &config); + void amazonia(machine_config &config); }; @@ -333,7 +335,7 @@ INTERRUPT_GEN_MEMBER(igs_m027_state::igs_majhong_interrupt) } -static MACHINE_CONFIG_START( igs_majhong ) +MACHINE_CONFIG_START(igs_m027_state::igs_majhong) MCFG_CPU_ADD("maincpu",ARM7, 20000000) MCFG_CPU_PROGRAM_MAP(igs_majhong_map) @@ -367,7 +369,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( amazonia ) +MACHINE_CONFIG_START(igs_m027_state::amazonia) MCFG_CPU_ADD("maincpu",ARM7, 20000000) MCFG_CPU_PROGRAM_MAP(igs_majhong_map) diff --git a/src/mame/drivers/igs_m036.cpp b/src/mame/drivers/igs_m036.cpp index 566503bb840..bf2f61ca63e 100644 --- a/src/mame/drivers/igs_m036.cpp +++ b/src/mame/drivers/igs_m036.cpp @@ -82,6 +82,8 @@ public: void pgm_create_dummy_internal_arm_region(void); + void igs_m036_tt(machine_config &config); + void igs_m036(machine_config &config); }; @@ -245,7 +247,7 @@ void igs_m036_state::pgm_create_dummy_internal_arm_region(void) #define IGS036_CPU ARM7 -static MACHINE_CONFIG_START( igs_m036 ) +MACHINE_CONFIG_START(igs_m036_state::igs_m036) MCFG_CPU_ADD("maincpu",IGS036_CPU, 20000000) MCFG_CPU_PROGRAM_MAP(igs_m036_map) @@ -264,7 +266,7 @@ static MACHINE_CONFIG_START( igs_m036 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( igs_m036_tt ) +MACHINE_CONFIG_START(igs_m036_state::igs_m036_tt) MCFG_CPU_ADD("maincpu",IGS036_CPU, 20000000) MCFG_CPU_PROGRAM_MAP(igs_m036_map) diff --git a/src/mame/drivers/igspc.cpp b/src/mame/drivers/igspc.cpp index 8e217f8961e..d82072f3ed9 100644 --- a/src/mame/drivers/igspc.cpp +++ b/src/mame/drivers/igspc.cpp @@ -54,6 +54,7 @@ public: m_maincpu(*this, "maincpu") { } + void speeddrv(machine_config &config); protected: // devices @@ -75,7 +76,7 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( speeddrv ) +MACHINE_CONFIG_START(speeddrv_state::speeddrv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I486, 40000000 ) // ?? at least a pentium MCFG_CPU_PROGRAM_MAP(speeddrv_map) diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp index b5c17fa34fd..4e683d9274b 100644 --- a/src/mame/drivers/igspoker.cpp +++ b/src/mame/drivers/igspoker.cpp @@ -138,6 +138,13 @@ public: uint32_t screen_update_igs_video(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_cpokerpk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(igs_interrupt); + void csk234it(machine_config &config); + void igs_ncs(machine_config &config); + void csk227it(machine_config &config); + void igspoker(machine_config &config); + void pktetris(machine_config &config); + void cpokerpk(machine_config &config); + void number10(machine_config &config); }; @@ -1892,7 +1899,7 @@ static GFXDECODE_START( cpokerpk ) GFXDECODE_ENTRY( "gfx2", 0x00000, charlayout2, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( igspoker ) +MACHINE_CONFIG_START(igspoker_state::igspoker) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, 3579545) @@ -1925,19 +1932,19 @@ static MACHINE_CONFIG_START( igspoker ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( csk227it, igspoker ) +MACHINE_CONFIG_DERIVED(igspoker_state::csk227it, igspoker) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( csk234it, igspoker ) +MACHINE_CONFIG_DERIVED(igspoker_state::csk234it, igspoker) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( igs_ncs, igspoker ) +MACHINE_CONFIG_DERIVED(igspoker_state::igs_ncs, igspoker) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( number10, igspoker ) +MACHINE_CONFIG_DERIVED(igspoker_state::number10, igspoker) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(number10_io_map) @@ -1951,14 +1958,14 @@ static MACHINE_CONFIG_DERIVED( number10, igspoker ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cpokerpk, number10 ) +MACHINE_CONFIG_DERIVED(igspoker_state::cpokerpk, number10) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(cpokerpk_io_map) MCFG_GFXDECODE_MODIFY("gfxdecode", cpokerpk) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pktetris, igspoker ) +MACHINE_CONFIG_DERIVED(igspoker_state::pktetris, igspoker) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ikki.cpp b/src/mame/drivers/ikki.cpp index ee138c77303..b33e69bb7f5 100644 --- a/src/mame/drivers/ikki.cpp +++ b/src/mame/drivers/ikki.cpp @@ -238,7 +238,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ikki_state::ikki_irq) -static MACHINE_CONFIG_START( ikki ) +MACHINE_CONFIG_START(ikki_state::ikki) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */ diff --git a/src/mame/drivers/imds.cpp b/src/mame/drivers/imds.cpp index 0536b13d75f..29fa12596ab 100644 --- a/src/mame/drivers/imds.cpp +++ b/src/mame/drivers/imds.cpp @@ -40,6 +40,7 @@ public: void kbd_put(u8 data); uint8_t m_term_data; virtual void machine_reset() override; + void imds(machine_config &config); }; READ8_MEMBER( imds_state::term_status_r ) @@ -88,7 +89,7 @@ void imds_state::machine_reset() // nullptr //}; -static MACHINE_CONFIG_START( imds ) +MACHINE_CONFIG_START(imds_state::imds) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_4MHz) // no idea of clock. MCFG_CPU_PROGRAM_MAP(imds_mem) diff --git a/src/mame/drivers/imds2.cpp b/src/mame/drivers/imds2.cpp index 10ee69e7d4e..948eebce9d0 100644 --- a/src/mame/drivers/imds2.cpp +++ b/src/mame/drivers/imds2.cpp @@ -753,7 +753,7 @@ static SLOT_INTERFACE_START( imds2_floppies ) SLOT_INTERFACE( "8sssd", FLOPPY_8_SSSD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START(imds2) +MACHINE_CONFIG_START(imds2_state::imds2) MCFG_CPU_ADD("ipccpu" , I8085A , IPC_XTAL_Y2 / 2) // 4 MHz MCFG_CPU_PROGRAM_MAP(ipc_mem_map) MCFG_CPU_IO_MAP(ipc_io_map) diff --git a/src/mame/drivers/imolagp.cpp b/src/mame/drivers/imolagp.cpp index f420c7d4500..3d6f869946c 100644 --- a/src/mame/drivers/imolagp.cpp +++ b/src/mame/drivers/imolagp.cpp @@ -132,6 +132,7 @@ public: virtual void video_start() override; DECLARE_PALETTE_INIT(imolagp); uint32_t screen_update_imolagp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void imolagp(machine_config &config); }; @@ -485,7 +486,7 @@ void imolagp_state::machine_reset() } -static MACHINE_CONFIG_START( imolagp ) +MACHINE_CONFIG_START(imolagp_state::imolagp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3000000) // ? (assume slower than slave) diff --git a/src/mame/drivers/imsai.cpp b/src/mame/drivers/imsai.cpp index d3f21760f0f..2865776a9f2 100644 --- a/src/mame/drivers/imsai.cpp +++ b/src/mame/drivers/imsai.cpp @@ -39,6 +39,7 @@ public: DECLARE_READ8_MEMBER(status_r); DECLARE_WRITE8_MEMBER(control_w); + void imsai(machine_config &config); private: uint8_t m_term_data; virtual void machine_reset() override; @@ -100,7 +101,7 @@ void imsai_state::machine_reset() m_term_data = 0; } -static MACHINE_CONFIG_START( imsai ) +MACHINE_CONFIG_START(imsai_state::imsai) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A, XTAL_6MHz) MCFG_CPU_PROGRAM_MAP(imsai_mem) diff --git a/src/mame/drivers/inder.cpp b/src/mame/drivers/inder.cpp index 230c3c4cc25..6501f1fd62a 100644 --- a/src/mame/drivers/inder.cpp +++ b/src/mame/drivers/inder.cpp @@ -82,6 +82,10 @@ public: DECLARE_WRITE_LINE_MEMBER(qc9b_w); DECLARE_DRIVER_INIT(inder); DECLARE_DRIVER_INIT(inder1); + void inder(machine_config &config); + void brvteam(machine_config &config); + void canasta(machine_config &config); + void lapbylap(machine_config &config); private: void update_mus(); bool m_pc0; @@ -1335,7 +1339,7 @@ DRIVER_INIT_MEMBER( inder_state, inder1 ) m_game = 1; } -static MACHINE_CONFIG_START( brvteam ) +MACHINE_CONFIG_START(inder_state::brvteam) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2) MCFG_CPU_PROGRAM_MAP(brvteam_map) @@ -1353,7 +1357,7 @@ static MACHINE_CONFIG_START( brvteam ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "snvol", 2.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( canasta ) +MACHINE_CONFIG_START(inder_state::canasta) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2) MCFG_CPU_PROGRAM_MAP(canasta_map) @@ -1371,7 +1375,7 @@ static MACHINE_CONFIG_START( canasta ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( lapbylap ) +MACHINE_CONFIG_START(inder_state::lapbylap) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2) MCFG_CPU_PROGRAM_MAP(lapbylap_map) @@ -1395,7 +1399,7 @@ static MACHINE_CONFIG_START( lapbylap ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( inder ) +MACHINE_CONFIG_START(inder_state::inder) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2) MCFG_CPU_PROGRAM_MAP(inder_map) diff --git a/src/mame/drivers/inderp.cpp b/src/mame/drivers/inderp.cpp index 0bcf3f05e12..1b0a3715a22 100644 --- a/src/mame/drivers/inderp.cpp +++ b/src/mame/drivers/inderp.cpp @@ -36,6 +36,7 @@ public: DECLARE_WRITE8_MEMBER(inputs_w); DECLARE_READ8_MEMBER(inputs_r); + void inderp(machine_config &config); private: required_device m_maincpu; required_ioport_array<10> m_inputs; @@ -192,7 +193,7 @@ WRITE_LINE_MEMBER( inderp_state::clock_tick ) m_maincpu->set_input_line(M6504_IRQ_LINE, ASSERT_LINE); } -static MACHINE_CONFIG_START( inderp ) +MACHINE_CONFIG_START(inderp_state::inderp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6504, 434000) // possible calculation of frequency-derived time constant 100k res and 10pf cap MCFG_CPU_PROGRAM_MAP(maincpu_map) diff --git a/src/mame/drivers/indiana.cpp b/src/mame/drivers/indiana.cpp index 8b7e6df2600..949d6678717 100644 --- a/src/mame/drivers/indiana.cpp +++ b/src/mame/drivers/indiana.cpp @@ -38,6 +38,7 @@ public: DECLARE_DRIVER_INIT(indiana); virtual void machine_reset() override; required_device m_maincpu; + void indiana(machine_config &config); }; @@ -86,7 +87,7 @@ static DEVICE_INPUT_DEFAULTS_START( keyboard ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( indiana ) +MACHINE_CONFIG_START(indiana_state::indiana) /* basic machine hardware */ MCFG_CPU_ADD(M68K_TAG, M68030, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(indiana_mem) diff --git a/src/mame/drivers/indigo.cpp b/src/mame/drivers/indigo.cpp index f617b78b1b7..edf5d1869e8 100644 --- a/src/mame/drivers/indigo.cpp +++ b/src/mame/drivers/indigo.cpp @@ -58,6 +58,9 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + static void cdrom_config(device_t *device); + void indigo4k(machine_config &config); + void indigo3k(machine_config &config); private: struct hpc_t { @@ -568,12 +571,13 @@ static INPUT_PORTS_START( indigo ) PORT_BIT ( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( cdrom_config ) - MCFG_DEVICE_MODIFY( "cdda" ) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "^^^^mono", 1.0) -MACHINE_CONFIG_END +void indigo_state::cdrom_config(device_t *device) +{ + device = device->subdevice("cdda"); + MCFG_SOUND_ROUTE(0, "^^^^mono", 1.0) +} -static MACHINE_CONFIG_START( indigo3k ) +MACHINE_CONFIG_START(indigo_state::indigo3k) MCFG_CPU_ADD("maincpu", R3041, 33000000) MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG) MCFG_CPU_PROGRAM_MAP(indigo3k_map) @@ -604,7 +608,7 @@ static MACHINE_CONFIG_START( indigo3k ) MCFG_EEPROM_SERIAL_93C56_ADD("eeprom") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( indigo4k, indigo3k ) +MACHINE_CONFIG_DERIVED(indigo_state::indigo4k, indigo3k) MCFG_CPU_REPLACE("maincpu", R4600BE, 150000000) // Should be R4400 MCFG_MIPS3_ICACHE_SIZE(32768) MCFG_MIPS3_DCACHE_SIZE(32768) diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp index dcbc5affa77..446d6a1a0bb 100644 --- a/src/mame/drivers/indy_indigo2.cpp +++ b/src/mame/drivers/indy_indigo2.cpp @@ -182,7 +182,7 @@ ioport_constructor ioc2_device::device_input_ports() const return INPUT_PORTS_NAME(front_panel); } -MACHINE_CONFIG_MEMBER( ioc2_device::device_add_mconfig ) +MACHINE_CONFIG_START(ioc2_device::device_add_mconfig) MCFG_SCC85230_ADD(SCC_TAG, SCC_PCLK, SCC_RXA_CLK, SCC_TXA_CLK, SCC_RXB_CLK, SCC_TXB_CLK) MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd)) MCFG_Z80SCC_OUT_DTRA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_dtr)) @@ -661,6 +661,10 @@ public: TIMER_CALLBACK_MEMBER(ip22_dma); + static void cdrom_config(device_t *device); + void ip225015(machine_config &config); + void ip224613(machine_config &config); + void ip244415(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -1471,13 +1475,14 @@ static INPUT_PORTS_START( ip225015 ) PORT_INCLUDE( at_keyboard ) /* IN4 - IN11 */ INPUT_PORTS_END -static MACHINE_CONFIG_START( cdrom_config ) - MCFG_DEVICE_MODIFY( "cdda" ) - MCFG_SOUND_ROUTE( 0, "^^^^lspeaker", 1.0 ) - MCFG_SOUND_ROUTE( 1, "^^^^rspeaker", 1.0 ) -MACHINE_CONFIG_END +void ip22_state::cdrom_config(device_t *device) +{ + device = device->subdevice("cdda"); + MCFG_SOUND_ROUTE(0, "^^^^lspeaker", 1.0) + MCFG_SOUND_ROUTE(1, "^^^^rspeaker", 1.0) +} -static MACHINE_CONFIG_START( ip225015 ) +MACHINE_CONFIG_START(ip22_state::ip225015) MCFG_CPU_ADD( "maincpu", R5000BE, 50000000*3 ) //MCFG_MIPS3_ICACHE_SIZE(32768) //MCFG_MIPS3_DCACHE_SIZE(32768) @@ -1517,14 +1522,14 @@ static MACHINE_CONFIG_START( ip225015 ) MCFG_DS1386_8K_ADD(RTC_TAG, 32768) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ip224613, ip225015 ) +MACHINE_CONFIG_DERIVED(ip22_state::ip224613, ip225015) MCFG_CPU_REPLACE( "maincpu", R4600BE, 133333333 ) //MCFG_MIPS3_ICACHE_SIZE(32768) //MCFG_MIPS3_DCACHE_SIZE(32768) MCFG_CPU_PROGRAM_MAP( ip225015_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ip244415, ip225015 ) +MACHINE_CONFIG_DERIVED(ip22_state::ip244415, ip225015) MCFG_CPU_REPLACE( "maincpu", R4600BE, 150000000 ) //MCFG_MIPS3_ICACHE_SIZE(32768) //MCFG_MIPS3_DCACHE_SIZE(32768) diff --git a/src/mame/drivers/instantm.cpp b/src/mame/drivers/instantm.cpp index b08d85685ee..75816441d17 100644 --- a/src/mame/drivers/instantm.cpp +++ b/src/mame/drivers/instantm.cpp @@ -43,6 +43,7 @@ public: DECLARE_WRITE8_MEMBER(port01_w); DECLARE_WRITE_LINE_MEMBER(clock_w); + void instantm(machine_config &config); private: u8 m_port01; bool m_clock_en; @@ -117,7 +118,7 @@ void instantm_state::machine_reset() // OSC1 = XTAL_3_579545MHz -static MACHINE_CONFIG_START( instantm ) +MACHINE_CONFIG_START(instantm_state::instantm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp index dee933173c9..dcfb8ead0bb 100644 --- a/src/mame/drivers/instruct.cpp +++ b/src/mame/drivers/instruct.cpp @@ -77,6 +77,7 @@ public: DECLARE_WRITE8_MEMBER(portfa_w); DECLARE_QUICKLOAD_LOAD_MEMBER(instruct); INTERRUPT_GEN_MEMBER(t2l_int); + void instruct(machine_config &config); private: virtual void machine_reset() override; uint16_t m_lar; @@ -408,7 +409,7 @@ QUICKLOAD_LOAD_MEMBER( instruct_state, instruct ) return result; } -static MACHINE_CONFIG_START( instruct ) +MACHINE_CONFIG_START(instruct_state::instruct) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",S2650, XTAL_3_579545MHz / 4) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/intellec4.cpp b/src/mame/drivers/intellec4.cpp index 5e3bc8139f6..94a9e61e16f 100644 --- a/src/mame/drivers/intellec4.cpp +++ b/src/mame/drivers/intellec4.cpp @@ -100,6 +100,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(sw_prgm_pwr); DECLARE_INPUT_CHANGED_MEMBER(sw_do_enable); + void intellec4(machine_config &config); protected: intellec4_state(machine_config const &mconfig, device_type type, char const *tag) : driver_device(mconfig, type, tag) @@ -307,7 +308,7 @@ DEVICE_INPUT_DEFAULTS_START(tty) DEVICE_INPUT_DEFAULTS("FLOW_CONTROL", 0x0001, 0x0000) DEVICE_INPUT_DEFAULTS_END -MACHINE_CONFIG_START(intellec4) +MACHINE_CONFIG_START(intellec4_state::intellec4) MCFG_DEVICE_ADD("prgbank", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(intellec4_program_banks) MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE) @@ -1007,6 +1008,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(sw_hold); DECLARE_INPUT_CHANGED_MEMBER(sw_one_shot); + void mod4(machine_config &config); protected: virtual void driver_start() override; virtual void driver_reset() override; @@ -1037,7 +1039,7 @@ private: MOD 4-specific configuration ----------------------------------*/ -MACHINE_CONFIG_DERIVED(mod4, intellec4) +MACHINE_CONFIG_DERIVED(mod4_state::mod4, intellec4) MCFG_CPU_ADD("maincpu", I4004, 5185000. / 7) MCFG_I4004_ROM_MAP(intellec4_rom) MCFG_I4004_RAM_MEMORY_MAP(intellec4_ram_memory) @@ -1195,6 +1197,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(sw_stop); DECLARE_INPUT_CHANGED_MEMBER(sw_single_step); + void mod40(machine_config &config); protected: virtual void driver_start() override; virtual void driver_reset() override; @@ -1227,7 +1230,7 @@ private: MOD 40-specific configuration ----------------------------------*/ -MACHINE_CONFIG_DERIVED(mod40, intellec4) +MACHINE_CONFIG_DERIVED(mod40_state::mod40, intellec4) MCFG_CPU_ADD("maincpu", I4040, 5185000. / 7) MCFG_I4040_ROM_MAP(intellec4_rom) MCFG_I4040_RAM_MEMORY_MAP(intellec4_ram_memory) diff --git a/src/mame/drivers/interact.cpp b/src/mame/drivers/interact.cpp index 0c2cde72d9b..181e0bb6915 100644 --- a/src/mame/drivers/interact.cpp +++ b/src/mame/drivers/interact.cpp @@ -76,6 +76,8 @@ public: DECLARE_MACHINE_START(interact); DECLARE_MACHINE_RESET(interact); uint32_t screen_update_interact(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void hector1(machine_config &config); + void interact(machine_config &config); }; @@ -120,7 +122,7 @@ uint32_t interact_state::screen_update_interact(screen_device &screen, bitmap_in return 0; } -static MACHINE_CONFIG_START( interact ) +MACHINE_CONFIG_START(interact_state::interact) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_2MHz) @@ -157,7 +159,7 @@ static MACHINE_CONFIG_START( interact ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hector1 ) +MACHINE_CONFIG_START(interact_state::hector1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_1_75MHz) diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp index a1a80215321..6eead4374ec 100644 --- a/src/mame/drivers/interpro.cpp +++ b/src/mame/drivers/interpro.cpp @@ -448,7 +448,9 @@ static SLOT_INTERFACE_START(interpro_floppies) SLOT_INTERFACE("35hd", FLOPPY_35_HD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START(interpro_serial1) +MACHINE_CONFIG_START(interpro_state::interpro_serial1) + MCFG_SCC85C30_ADD(INTERPRO_SCC1_TAG, XTAL_4_9152MHz, 0, 0, 0, 0) + MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(INTERPRO_SERIAL_PORT1_TAG, rs232_port_device, write_txd)) MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(INTERPRO_SERIAL_PORT2_TAG, rs232_port_device, write_txd)) MCFG_Z80SCC_OUT_INT_CB(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir11_w)) @@ -466,7 +468,8 @@ static MACHINE_CONFIG_START(interpro_serial1) MCFG_RS232_CTS_HANDLER(DEVWRITELINE(INTERPRO_SCC1_TAG, z80scc_device, ctsb_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START(interpro_serial2) +MACHINE_CONFIG_START(interpro_state::interpro_serial2) + MCFG_SCC85C30_ADD(INTERPRO_SCC2_TAG, XTAL_4_9152MHz, 0, 0, 0, 0) MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(INTERPRO_KEYBOARD_PORT_TAG, interpro_keyboard_port_device, write_txd)) MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(INTERPRO_SERIAL_PORT0_TAG, rs232_port_device, write_txd)) MCFG_Z80SCC_OUT_INT_CB(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir11_w)) @@ -494,13 +497,17 @@ static SLOT_INTERFACE_START(sapphire_scsi_devices) SLOT_INTERFACE_INTERNAL(INTERPRO_SCSI_ADAPTER_TAG, NCR53C94) SLOT_INTERFACE_END -static MACHINE_CONFIG_START(interpro_scsi_adapter) +void interpro_state::interpro_scsi_adapter(device_t *device) +{ + devcb_base *devcb; + (void)devcb; MCFG_DEVICE_CLOCK(XTAL_24MHz) MCFG_NCR5390_IRQ_HANDLER(DEVWRITELINE(":" INTERPRO_IOGA_TAG, interpro_ioga_device, ir0_w)) MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":" INTERPRO_IOGA_TAG, interpro_ioga_device, drq_scsi)) -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_START(ioga) +MACHINE_CONFIG_START(interpro_state::ioga) + MCFG_DEVICE_MODIFY(INTERPRO_IOGA_TAG) MCFG_INTERPRO_IOGA_NMI_CB(INPUTLINE(INTERPRO_CPU_TAG, INPUT_LINE_NMI)) MCFG_INTERPRO_IOGA_IRQ_CB(INPUTLINE(INTERPRO_CPU_TAG, INPUT_LINE_IRQ0)) MCFG_INTERPRO_IOGA_IVEC_CB(DEVWRITE8(INTERPRO_CPU_TAG, clipper_device, set_ivec)) @@ -522,7 +529,7 @@ MACHINE_CONFIG_END static INPUT_PORTS_START(interpro) INPUT_PORTS_END -static MACHINE_CONFIG_START(interpro) +MACHINE_CONFIG_START(interpro_state::interpro) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("16M") MCFG_RAM_EXTRA_OPTIONS("32M,64M,128M,256M") @@ -568,7 +575,7 @@ static MACHINE_CONFIG_START(interpro) MCFG_DEFAULT_LAYOUT(layout_interpro) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(turquoise, interpro) +MACHINE_CONFIG_DERIVED(turquoise_state::turquoise, interpro) MCFG_CPU_ADD(INTERPRO_CPU_TAG, CLIPPER_C300, XTAL_12_5MHz) MCFG_CPU_PROGRAM_MAP(c300_insn_map) MCFG_CPU_DATA_MAP(c300_data_map) @@ -609,9 +616,7 @@ static MACHINE_CONFIG_DERIVED(turquoise, interpro) MCFG_FLOPPY_DRIVE_SOUND(false) // serial controllers and ports - MCFG_SCC85C30_ADD(INTERPRO_SCC1_TAG, XTAL_4_9152MHz, 0, 0, 0, 0) MCFG_FRAGMENT_ADD(interpro_serial1) - MCFG_SCC85C30_ADD(INTERPRO_SCC2_TAG, XTAL_4_9152MHz, 0, 0, 0, 0) MCFG_FRAGMENT_ADD(interpro_serial2) // scsi controller @@ -632,7 +637,7 @@ static MACHINE_CONFIG_DERIVED(turquoise, interpro) MCFG_SR_MEMORY(INTERPRO_MMU_TAG "_d", 0, 1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(sapphire, interpro) +MACHINE_CONFIG_DERIVED(sapphire_state::sapphire, interpro) MCFG_CPU_ADD(INTERPRO_CPU_TAG, CLIPPER_C400, XTAL_12_5MHz) MCFG_CPU_PROGRAM_MAP(c400_insn_map) MCFG_CPU_DATA_MAP(c400_data_map) @@ -659,9 +664,7 @@ static MACHINE_CONFIG_DERIVED(sapphire, interpro) MCFG_FLOPPY_DRIVE_SOUND(false) // serial controllers and ports - MCFG_SCC85230_ADD(INTERPRO_SCC1_TAG, XTAL_4_9152MHz, 0, 0, 0, 0) MCFG_FRAGMENT_ADD(interpro_serial1) - MCFG_SCC85C30_ADD(INTERPRO_SCC2_TAG, XTAL_4_9152MHz, 0, 0, 0, 0) MCFG_FRAGMENT_ADD(interpro_serial2) // scsi controller @@ -687,27 +690,27 @@ static MACHINE_CONFIG_DERIVED(sapphire, interpro) MCFG_SR_MEMORY(INTERPRO_MMU_TAG, 0, 1) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(ip2000, turquoise) +MACHINE_CONFIG_DERIVED(turquoise_state::ip2000, turquoise) //MCFG_DEVICE_MODIFY(INTERPRO_CPU_TAG) //MCFG_DEVICE_CLOCK(XTAL_40MHz) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(ip2400, sapphire) +MACHINE_CONFIG_DERIVED(sapphire_state::ip2400, sapphire) //MCFG_DEVICE_MODIFY(INTERPRO_CPU_TAG) //MCFG_DEVICE_CLOCK(XTAL_40MHz) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(ip2500, sapphire) +MACHINE_CONFIG_DERIVED(sapphire_state::ip2500, sapphire) //MCFG_DEVICE_MODIFY(INTERPRO_CPU_TAG) //MCFG_DEVICE_CLOCK(XTAL_50MHz) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(ip2700, sapphire) +MACHINE_CONFIG_DERIVED(sapphire_state::ip2700, sapphire) //MCFG_DEVICE_MODIFY(INTERPRO_CPU_TAG) //MCFG_DEVICE_CLOCK(XTAL_70MHz) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(ip2800, sapphire) +MACHINE_CONFIG_DERIVED(sapphire_state::ip2800, sapphire) //MCFG_DEVICE_MODIFY(INTERPRO_CPU_TAG) //MCFG_DEVICE_CLOCK(XTAL_80MHz) MACHINE_CONFIG_END diff --git a/src/mame/drivers/intrscti.cpp b/src/mame/drivers/intrscti.cpp index 497df9a1f8f..c8ad502e011 100644 --- a/src/mame/drivers/intrscti.cpp +++ b/src/mame/drivers/intrscti.cpp @@ -39,6 +39,7 @@ public: DECLARE_DRIVER_INIT(intrscti); virtual void video_start() override; uint32_t screen_update_intrscti(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void intrscti(machine_config &config); }; void intrscti_state::video_start() @@ -176,7 +177,7 @@ static GFXDECODE_START( intrscti ) GFXDECODE_END -static MACHINE_CONFIG_START( intrscti ) +MACHINE_CONFIG_START(intrscti_state::intrscti) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ? MHz */ diff --git a/src/mame/drivers/intv.cpp b/src/mame/drivers/intv.cpp index 07ca48f91f2..1498f1bc28c 100644 --- a/src/mame/drivers/intv.cpp +++ b/src/mame/drivers/intv.cpp @@ -455,7 +455,7 @@ INTERRUPT_GEN_MEMBER(intv_state::intv_interrupt2) timer_set(m_keyboard->cycles_to_attotime(100), TIMER_INTV_INTERRUPT2_COMPLETE); } -static MACHINE_CONFIG_START( intv ) +MACHINE_CONFIG_START(intv_state::intv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", CP1610, XTAL_3_579545MHz/4) /* Colorburst/4 */ MCFG_CPU_PROGRAM_MAP(intv_mem) @@ -496,12 +496,12 @@ static MACHINE_CONFIG_START( intv ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("ecs_list", "intvecs") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( intv2, intv ) +MACHINE_CONFIG_DERIVED(intv_state::intv2, intv) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(intv2_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( intvoice, intv ) +MACHINE_CONFIG_DERIVED(intv_state::intvoice, intv) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(intvoice_mem) @@ -509,7 +509,7 @@ static MACHINE_CONFIG_DERIVED( intvoice, intv ) MCFG_DEVICE_ADD("voice", INTV_ROM_VOICE, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( intvecs, intv ) +MACHINE_CONFIG_DERIVED(intv_state::intvecs, intv) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(intvecs_mem) @@ -530,7 +530,7 @@ static MACHINE_CONFIG_DERIVED( intvecs, intv ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("intv_list", "intv") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( intvkbd, intv ) +MACHINE_CONFIG_DERIVED(intv_state::intvkbd, intv) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(intvkbd_mem) diff --git a/src/mame/drivers/inufuku.cpp b/src/mame/drivers/inufuku.cpp index 312dfecfea6..a57303ca016 100644 --- a/src/mame/drivers/inufuku.cpp +++ b/src/mame/drivers/inufuku.cpp @@ -330,7 +330,7 @@ void inufuku_state::machine_reset() m_tx_palettebank = 0; } -static MACHINE_CONFIG_START( inufuku ) +MACHINE_CONFIG_START(inufuku_state::inufuku) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 32000000/2) /* 16.00 MHz */ @@ -381,7 +381,7 @@ static MACHINE_CONFIG_START( inufuku ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( _3on3dunk, inufuku ) +MACHINE_CONFIG_DERIVED(inufuku_state::_3on3dunk, inufuku) MCFG_GFXDECODE_MODIFY("gfxdecode", _3on3dunk) MACHINE_CONFIG_END diff --git a/src/mame/drivers/invqix.cpp b/src/mame/drivers/invqix.cpp index f03e5006da0..ddab21e264a 100644 --- a/src/mame/drivers/invqix.cpp +++ b/src/mame/drivers/invqix.cpp @@ -148,6 +148,7 @@ public: DECLARE_WRITE16_MEMBER(vctl_w); + void invqix(machine_config &config); protected: // devices required_device m_maincpu; @@ -327,7 +328,7 @@ static INPUT_PORTS_START( invqix ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( invqix ) +MACHINE_CONFIG_START(invqix_state::invqix) MCFG_CPU_ADD("maincpu", H8S2394, XTAL_20MHz) MCFG_CPU_PROGRAM_MAP(invqix_prg_map) MCFG_CPU_IO_MAP(invqix_io_map) diff --git a/src/mame/drivers/ipc.cpp b/src/mame/drivers/ipc.cpp index f337b963809..29ca62b3225 100644 --- a/src/mame/drivers/ipc.cpp +++ b/src/mame/drivers/ipc.cpp @@ -54,6 +54,7 @@ public: , m_maincpu(*this, "maincpu") { } + void ipc(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -87,7 +88,7 @@ void ipc_state::machine_reset() } -static MACHINE_CONFIG_START( ipc ) +MACHINE_CONFIG_START(ipc_state::ipc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A, XTAL_19_6608MHz / 4) MCFG_CPU_PROGRAM_MAP(ipc_mem) diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp index 6e0974ebbf4..1cb7dc8b10c 100644 --- a/src/mame/drivers/ipds.cpp +++ b/src/mame/drivers/ipds.cpp @@ -37,6 +37,7 @@ public: I8275_DRAW_CHARACTER_MEMBER( crtc_display_pixels ); uint8_t m_term_data; virtual void machine_reset() override; + void ipds(machine_config &config); }; READ8_MEMBER( ipds_state::ipds_b0_r ) @@ -126,7 +127,7 @@ void ipds_state::kbd_put(u8 data) m_term_data = data; } -static MACHINE_CONFIG_START( ipds ) +MACHINE_CONFIG_START(ipds_state::ipds) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A, XTAL_19_6608MHz / 4) MCFG_CPU_PROGRAM_MAP(ipds_mem) diff --git a/src/mame/drivers/iq151.cpp b/src/mame/drivers/iq151.cpp index e42edea0a7c..028e038c8ef 100644 --- a/src/mame/drivers/iq151.cpp +++ b/src/mame/drivers/iq151.cpp @@ -104,6 +104,7 @@ public: INTERRUPT_GEN_MEMBER(iq151_vblank_interrupt); DECLARE_INPUT_CHANGED_MEMBER(iq151_break); TIMER_DEVICE_CALLBACK_MEMBER(cassette_timer); + void iq151(machine_config &config); }; READ8_MEMBER(iq151_state::keyboard_row_r) @@ -381,7 +382,7 @@ static SLOT_INTERFACE_START(iq151_cart) SLOT_INTERFACE("amos3" , IQ151_AMOS3) // AMOS cart 3 SLOT_INTERFACE_END -static MACHINE_CONFIG_START( iq151 ) +MACHINE_CONFIG_START(iq151_state::iq151) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, XTAL_2MHz) MCFG_CPU_PROGRAM_MAP(iq151_mem) diff --git a/src/mame/drivers/iqblock.cpp b/src/mame/drivers/iqblock.cpp index 54fcc6acd6e..23212de108e 100644 --- a/src/mame/drivers/iqblock.cpp +++ b/src/mame/drivers/iqblock.cpp @@ -339,7 +339,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( iqblock ) +MACHINE_CONFIG_START(iqblock_state::iqblock) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz */ diff --git a/src/mame/drivers/iris3130.cpp b/src/mame/drivers/iris3130.cpp index fb6515b8ae2..82b9be114fe 100644 --- a/src/mame/drivers/iris3130.cpp +++ b/src/mame/drivers/iris3130.cpp @@ -93,6 +93,7 @@ public: DECLARE_WRITE_LINE_MEMBER(duarta_irq_handler); DECLARE_WRITE_LINE_MEMBER(duartb_irq_handler); required_device m_maincpu; + void sgi_ip2(machine_config &config); protected: required_shared_ptr m_mainram; required_device m_duarta; @@ -418,7 +419,7 @@ static DEVICE_INPUT_DEFAULTS_START( ip2_terminal ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( sgi_ip2 ) +MACHINE_CONFIG_START(sgi_ip2_state::sgi_ip2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68020, 16000000) MCFG_CPU_PROGRAM_MAP(sgi_ip2_map) diff --git a/src/mame/drivers/irisha.cpp b/src/mame/drivers/irisha.cpp index 61ac0ce094f..92ad685ee51 100644 --- a/src/mame/drivers/irisha.cpp +++ b/src/mame/drivers/irisha.cpp @@ -49,6 +49,7 @@ public: uint32_t screen_update_irisha(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_shared_ptr m_p_videoram; + void irisha(machine_config &config); private: bool m_sg1_line; bool m_keypressed; @@ -357,7 +358,7 @@ void irisha_state::machine_reset() } /* Machine driver */ -static MACHINE_CONFIG_START( irisha ) +MACHINE_CONFIG_START(irisha_state::irisha) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_16MHz / 9) MCFG_CPU_PROGRAM_MAP(irisha_mem) diff --git a/src/mame/drivers/irobot.cpp b/src/mame/drivers/irobot.cpp index 6a297cb5a6e..f9fe0789092 100644 --- a/src/mame/drivers/irobot.cpp +++ b/src/mame/drivers/irobot.cpp @@ -298,7 +298,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( irobot ) +MACHINE_CONFIG_START(irobot_state::irobot) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CLOCK/8) diff --git a/src/mame/drivers/ironhors.cpp b/src/mame/drivers/ironhors.cpp index 29e7a6703fb..a4ce8c816e0 100644 --- a/src/mame/drivers/ironhors.cpp +++ b/src/mame/drivers/ironhors.cpp @@ -373,7 +373,7 @@ Hsync is 15,56khz These clocks make the emulation run too fast. */ -static MACHINE_CONFIG_START( ironhors ) +MACHINE_CONFIG_START(ironhors_state::ironhors) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, 18432000/6) /* 3.072 MHz??? mod by Shingo Suzuki 1999/10/15 */ @@ -439,7 +439,7 @@ READ8_MEMBER(ironhors_state::farwest_soundlatch_r) return m_soundlatch->read(m_soundcpu->space(AS_PROGRAM), 0); } -static MACHINE_CONFIG_DERIVED( farwest, ironhors ) +MACHINE_CONFIG_DERIVED(ironhors_state::farwest, ironhors) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(farwest_master_map) diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp index c777aab8bab..a52272212c9 100644 --- a/src/mame/drivers/isbc.cpp +++ b/src/mame/drivers/isbc.cpp @@ -83,6 +83,12 @@ public: DECLARE_WRITE_LINE_MEMBER(led_ds1_w); DECLARE_WRITE_LINE_MEMBER(led_ds3_w); DECLARE_WRITE_LINE_MEMBER(megabyte_select_w); + void isbc2861(machine_config &config); + void isbc86(machine_config &config); + void rpc86(machine_config &config); + void isbc8605(machine_config &config); + void isbc286(machine_config &config); + void isbc8630(machine_config &config); protected: void machine_reset() override; private: @@ -326,7 +332,7 @@ WRITE_LINE_MEMBER(isbc_state::megabyte_select_w) m_megabyte_enable = !state; } -static MACHINE_CONFIG_START( isbc86 ) +MACHINE_CONFIG_START(isbc_state::isbc86) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, XTAL_5MHz) MCFG_CPU_PROGRAM_MAP(isbc86_mem) @@ -359,7 +365,7 @@ static MACHINE_CONFIG_START( isbc86 ) MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", isbc86_terminal) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rpc86 ) +MACHINE_CONFIG_START(isbc_state::rpc86) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, XTAL_5MHz) MCFG_CPU_PROGRAM_MAP(rpc86_mem) @@ -400,7 +406,7 @@ static MACHINE_CONFIG_START( rpc86 ) //MCFG_ISBX_SLOT_MINTR1_CALLBACK(DEVWRITELINE("pic_0", pic8259_device, ir6_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( isbc8605, rpc86 ) +MACHINE_CONFIG_DERIVED(isbc_state::isbc8605, rpc86) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(isbc8605_io) @@ -409,7 +415,7 @@ static MACHINE_CONFIG_DERIVED( isbc8605, rpc86 ) MCFG_ISBC_208_IRQ(DEVWRITELINE("pic_0", pic8259_device, ir5_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( isbc8630, rpc86 ) +MACHINE_CONFIG_DERIVED(isbc_state::isbc8630, rpc86) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(isbc8630_io) @@ -428,7 +434,7 @@ static MACHINE_CONFIG_DERIVED( isbc8630, rpc86 ) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(isbc_state, megabyte_select_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( isbc286 ) +MACHINE_CONFIG_START(isbc_state::isbc286) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80286, XTAL_16MHz/2) MCFG_CPU_PROGRAM_MAP(isbc286_mem) @@ -522,7 +528,7 @@ static MACHINE_CONFIG_START( isbc286 ) MCFG_ISBC_215_IRQ(DEVWRITELINE("pic_0", pic8259_device, ir5_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( isbc2861, isbc286 ) +MACHINE_CONFIG_DERIVED(isbc_state::isbc2861, isbc286) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(isbc2861_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/isbc8010.cpp b/src/mame/drivers/isbc8010.cpp index a3f662c6a0c..5d5363d011e 100644 --- a/src/mame/drivers/isbc8010.cpp +++ b/src/mame/drivers/isbc8010.cpp @@ -58,6 +58,9 @@ public: DECLARE_WRITE_LINE_MEMBER( usart_clock_tick ); + void isbc8010b(machine_config &config); + void isbc8010a(machine_config &config); + void isbc8010(machine_config &config); private: required_device m_maincpu; required_device m_usart; @@ -159,7 +162,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) // set up terminal to default to DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( isbc8010 ) +MACHINE_CONFIG_START(isbc8010_state::isbc8010) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080A, XTAL_18_432MHz/9) MCFG_CPU_PROGRAM_MAP(isbc8010_mem) @@ -222,13 +225,13 @@ static MACHINE_CONFIG_START( isbc8010 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( isbc8010a, isbc8010 ) +MACHINE_CONFIG_DERIVED(isbc8010_state::isbc8010a, isbc8010) /* basic machine hardware */ MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(isbc8010a_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( isbc8010b, isbc8010 ) +MACHINE_CONFIG_DERIVED(isbc8010_state::isbc8010b, isbc8010) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(isbc8010b_mem) diff --git a/src/mame/drivers/isbc8030.cpp b/src/mame/drivers/isbc8030.cpp index 6ed54209e78..0a07a8e8304 100644 --- a/src/mame/drivers/isbc8030.cpp +++ b/src/mame/drivers/isbc8030.cpp @@ -57,6 +57,7 @@ public: , m_rs232(*this, RS232_TAG) { } + void isbc8030(machine_config &config); private: required_device m_maincpu; required_device m_usart; @@ -85,7 +86,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( isbc8030 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( isbc8030 ) +MACHINE_CONFIG_START(isbc8030_state::isbc8030) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, XTAL_22_1184MHz / 4) MCFG_CPU_PROGRAM_MAP(isbc8030_mem) diff --git a/src/mame/drivers/iskr103x.cpp b/src/mame/drivers/iskr103x.cpp index 638423fdb8d..593f08d3a26 100644 --- a/src/mame/drivers/iskr103x.cpp +++ b/src/mame/drivers/iskr103x.cpp @@ -36,6 +36,8 @@ public: { } required_device m_maincpu; + void iskr1030m(machine_config &config); + void iskr1031(machine_config &config); }; static ADDRESS_MAP_START( iskr1031_map, AS_PROGRAM, 16, iskr103x_state ) @@ -60,7 +62,7 @@ static DEVICE_INPUT_DEFAULTS_START(iskr1031) DEVICE_INPUT_DEFAULTS_END // XXX -static MACHINE_CONFIG_START( iskr1030m ) +MACHINE_CONFIG_START(iskr103x_state::iskr1030m) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, 4772720) MCFG_CPU_PROGRAM_MAP(iskr1031_map) @@ -85,7 +87,7 @@ static MACHINE_CONFIG_START( iskr1030m ) MCFG_RAM_EXTRA_OPTIONS("64K, 128K, 256K, 512K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( iskr1031, iskr1030m ) +MACHINE_CONFIG_DERIVED(iskr103x_state::iskr1031, iskr1030m) MCFG_DEVICE_MODIFY("mb") MCFG_DEVICE_INPUT_DEFAULTS(iskr1031) MCFG_DEVICE_MODIFY("isa1") diff --git a/src/mame/drivers/istellar.cpp b/src/mame/drivers/istellar.cpp index 10fb360e45e..b6004fb85a4 100644 --- a/src/mame/drivers/istellar.cpp +++ b/src/mame/drivers/istellar.cpp @@ -65,6 +65,7 @@ public: required_device m_subcpu; required_device m_gfxdecode; required_device m_palette; + void istellar(machine_config &config); }; @@ -301,7 +302,7 @@ INTERRUPT_GEN_MEMBER(istellar_state::vblank_callback_istellar) /* DRIVER */ -static MACHINE_CONFIG_START( istellar ) +MACHINE_CONFIG_START(istellar_state::istellar) /* main cpu */ MCFG_CPU_ADD("maincpu", Z80, GUESSED_CLOCK) MCFG_CPU_PROGRAM_MAP(z80_0_mem) diff --git a/src/mame/drivers/istrebiteli.cpp b/src/mame/drivers/istrebiteli.cpp index 8f413efc0e2..c9ce9c50364 100644 --- a/src/mame/drivers/istrebiteli.cpp +++ b/src/mame/drivers/istrebiteli.cpp @@ -168,6 +168,7 @@ public: uint8_t m_spr_collision[2]; uint8_t m_spr_xy[8]; uint8_t m_tileram[16]; + void istreb(machine_config &config); }; void istrebiteli_state::machine_start() @@ -413,7 +414,7 @@ static GFXDECODE_START( istrebiteli ) GFXDECODE_ENTRY( "sprite", 0x0200, projectile_layout, 0, 2 ) GFXDECODE_END -static MACHINE_CONFIG_START( istreb ) +MACHINE_CONFIG_START(istrebiteli_state::istreb) /* basic machine hardware */ MCFG_CPU_ADD(I8080_TAG, I8080, XTAL_8MHz / 4) // KR580VM80A MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/iteagle.cpp b/src/mame/drivers/iteagle.cpp index fdcf396c50a..a7cb8504e2e 100644 --- a/src/mame/drivers/iteagle.cpp +++ b/src/mame/drivers/iteagle.cpp @@ -127,6 +127,18 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void gtfore05(machine_config &config); + void gtfore02(machine_config &config); + void gtfore03(machine_config &config); + void gtfore01(machine_config &config); + void gtfore06(machine_config &config); + void gtfore04(machine_config &config); + void iteagle(machine_config &config); + void bbhsc(machine_config &config); + void bbhcotw(machine_config &config); + void virtpool(machine_config &config); + void carnking(machine_config &config); + void bbh2sp(machine_config &config); }; void iteagle_state::machine_start() @@ -148,7 +160,7 @@ void iteagle_state::machine_reset() #define PCI_ID_VIDEO ":pci:09.0" #define PCI_ID_EEPROM ":pci:0a.0" -static MACHINE_CONFIG_START( iteagle ) +MACHINE_CONFIG_START(iteagle_state::iteagle) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", VR4310LE, 133333333) @@ -184,56 +196,56 @@ static MACHINE_CONFIG_START( iteagle ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gtfore01, iteagle ) +MACHINE_CONFIG_DERIVED(iteagle_state::gtfore01, iteagle) MCFG_DEVICE_MODIFY(PCI_ID_FPGA) MCFG_ITEAGLE_FPGA_INIT(0x01000401, 0x0b0b0b) MCFG_DEVICE_MODIFY(PCI_ID_EEPROM) MCFG_ITEAGLE_EEPROM_INIT(0x0401, 0x7) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gtfore02, iteagle ) +MACHINE_CONFIG_DERIVED(iteagle_state::gtfore02, iteagle) MCFG_DEVICE_MODIFY(PCI_ID_FPGA) MCFG_ITEAGLE_FPGA_INIT(0x01000402, 0x020201) MCFG_DEVICE_MODIFY(PCI_ID_EEPROM) MCFG_ITEAGLE_EEPROM_INIT(0x0402, 0x7) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gtfore03, iteagle ) +MACHINE_CONFIG_DERIVED(iteagle_state::gtfore03, iteagle) MCFG_DEVICE_MODIFY(PCI_ID_FPGA) MCFG_ITEAGLE_FPGA_INIT(0x01000403, 0x0a0b0a) MCFG_DEVICE_MODIFY(PCI_ID_EEPROM) MCFG_ITEAGLE_EEPROM_INIT(0x0403, 0x7) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gtfore04, iteagle ) +MACHINE_CONFIG_DERIVED(iteagle_state::gtfore04, iteagle) MCFG_DEVICE_MODIFY(PCI_ID_FPGA) MCFG_ITEAGLE_FPGA_INIT(0x01000404, 0x0a020b) MCFG_DEVICE_MODIFY(PCI_ID_EEPROM) MCFG_ITEAGLE_EEPROM_INIT(0x0404, 0x7) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gtfore05, iteagle ) +MACHINE_CONFIG_DERIVED(iteagle_state::gtfore05, iteagle) MCFG_DEVICE_MODIFY(PCI_ID_FPGA) MCFG_ITEAGLE_FPGA_INIT(0x01000405, 0x0b0a0c) MCFG_DEVICE_MODIFY(PCI_ID_EEPROM) MCFG_ITEAGLE_EEPROM_INIT(0x0405, 0x7); MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gtfore06, iteagle ) +MACHINE_CONFIG_DERIVED(iteagle_state::gtfore06, iteagle) MCFG_DEVICE_MODIFY(PCI_ID_FPGA) MCFG_ITEAGLE_FPGA_INIT(0x01000406, 0x0c0b0d) MCFG_DEVICE_MODIFY(PCI_ID_EEPROM) MCFG_ITEAGLE_EEPROM_INIT(0x0406, 0x9); MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( carnking, iteagle ) +MACHINE_CONFIG_DERIVED(iteagle_state::carnking, iteagle) MCFG_DEVICE_MODIFY(PCI_ID_FPGA) MCFG_ITEAGLE_FPGA_INIT(0x01000a01, 0x0e0a0a) MCFG_DEVICE_MODIFY(PCI_ID_EEPROM) MCFG_ITEAGLE_EEPROM_INIT(0x0a01, 0x9) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbhsc, iteagle ) +MACHINE_CONFIG_DERIVED(iteagle_state::bbhsc, iteagle) MCFG_DEVICE_MODIFY(PCI_ID_FPGA) // 0xXX01XXXX = tournament board MCFG_ITEAGLE_FPGA_INIT(0x02010600, 0x0c0a0a) @@ -241,21 +253,21 @@ static MACHINE_CONFIG_DERIVED( bbhsc, iteagle ) MCFG_ITEAGLE_EEPROM_INIT(0x0000, 0x7) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbh2sp, iteagle ) +MACHINE_CONFIG_DERIVED(iteagle_state::bbh2sp, iteagle) MCFG_DEVICE_MODIFY(PCI_ID_FPGA) MCFG_ITEAGLE_FPGA_INIT(0x02010602, 0x0d0a0a) MCFG_DEVICE_MODIFY(PCI_ID_EEPROM) MCFG_ITEAGLE_EEPROM_INIT(0x0000, 0x7) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbhcotw, iteagle ) +MACHINE_CONFIG_DERIVED(iteagle_state::bbhcotw, iteagle) MCFG_DEVICE_MODIFY(PCI_ID_FPGA) MCFG_ITEAGLE_FPGA_INIT(0x02010603, 0x080704) MCFG_DEVICE_MODIFY(PCI_ID_EEPROM) MCFG_ITEAGLE_EEPROM_INIT(0x0603, 0x9) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( virtpool, iteagle ) +MACHINE_CONFIG_DERIVED(iteagle_state::virtpool, iteagle) // Not sure what the actual value should be // Setting a lower frequency helps delay the tutorial screen premature cut-out MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp index 0751f2a2ba0..f0f2e09f8e4 100644 --- a/src/mame/drivers/itech32.cpp +++ b/src/mame/drivers/itech32.cpp @@ -1671,7 +1671,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( timekill ) +MACHINE_CONFIG_START(itech32_state::timekill) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) @@ -1717,7 +1717,7 @@ static MACHINE_CONFIG_START( timekill ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bloodstm, timekill ) +MACHINE_CONFIG_DERIVED(itech32_state::bloodstm, timekill) /* basic machine hardware */ @@ -1732,7 +1732,7 @@ static MACHINE_CONFIG_DERIVED( bloodstm, timekill ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( drivedge, timekill ) +MACHINE_CONFIG_DERIVED(itech32_state::drivedge, timekill) /* basic machine hardware */ @@ -1760,7 +1760,7 @@ static MACHINE_CONFIG_DERIVED( drivedge, timekill ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sftm, timekill ) +MACHINE_CONFIG_DERIVED(itech32_state::sftm, timekill) /* basic machine hardware */ @@ -1781,7 +1781,7 @@ static MACHINE_CONFIG_DERIVED( sftm, timekill ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tourny, sftm ) +MACHINE_CONFIG_DERIVED(itech32_state::tourny, sftm) /* basic machine hardware */ diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp index e20d83eef9e..101aa7b555f 100644 --- a/src/mame/drivers/itech8.cpp +++ b/src/mame/drivers/itech8.cpp @@ -1665,7 +1665,7 @@ WRITE_LINE_MEMBER(itech8_state::generate_tms34061_interrupt) /************* core pieces ******************/ -static MACHINE_CONFIG_START( itech8_core_lo ) +MACHINE_CONFIG_START(itech8_state::itech8_core_lo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, CLOCK_8MHz) @@ -1699,7 +1699,7 @@ static MACHINE_CONFIG_START( itech8_core_lo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( itech8_core_hi, itech8_core_lo ) +MACHINE_CONFIG_DERIVED(itech8_state::itech8_core_hi, itech8_core_lo) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1707,7 +1707,7 @@ static MACHINE_CONFIG_DERIVED( itech8_core_hi, itech8_core_lo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( itech8_sound_ym2203 ) +MACHINE_CONFIG_START(itech8_state::itech8_sound_ym2203) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", MC6809, CLOCK_8MHz) @@ -1727,7 +1727,7 @@ static MACHINE_CONFIG_START( itech8_sound_ym2203 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( itech8_sound_ym2608b ) +MACHINE_CONFIG_START(itech8_state::itech8_sound_ym2608b) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", MC6809, CLOCK_8MHz) @@ -1741,7 +1741,7 @@ static MACHINE_CONFIG_START( itech8_sound_ym2608b ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( itech8_sound_ym3812 ) +MACHINE_CONFIG_START(itech8_state::itech8_sound_ym3812) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", MC6809, CLOCK_8MHz) @@ -1762,7 +1762,7 @@ static MACHINE_CONFIG_START( itech8_sound_ym3812 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( itech8_sound_ym3812_external ) +MACHINE_CONFIG_START(itech8_state::itech8_sound_ym3812_external) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu", MC6809, CLOCK_8MHz) @@ -1780,7 +1780,7 @@ MACHINE_CONFIG_END /************* full drivers ******************/ -static MACHINE_CONFIG_DERIVED( wfortune, itech8_core_hi ) +MACHINE_CONFIG_DERIVED(itech8_state::wfortune, itech8_core_hi) /* basic machine hardware */ MCFG_FRAGMENT_ADD(itech8_sound_ym2203) @@ -1794,7 +1794,7 @@ static MACHINE_CONFIG_DERIVED( wfortune, itech8_core_hi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( grmatch, itech8_core_hi ) +MACHINE_CONFIG_DERIVED(itech8_state::grmatch, itech8_core_hi) /* basic machine hardware */ MCFG_FRAGMENT_ADD(itech8_sound_ym2608b) @@ -1810,7 +1810,7 @@ static MACHINE_CONFIG_DERIVED( grmatch, itech8_core_hi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( stratab_hi, itech8_core_hi ) +MACHINE_CONFIG_DERIVED(itech8_state::stratab_hi, itech8_core_hi) /* basic machine hardware */ MCFG_FRAGMENT_ADD(itech8_sound_ym2203) @@ -1823,7 +1823,7 @@ static MACHINE_CONFIG_DERIVED( stratab_hi, itech8_core_hi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( stratab_lo, itech8_core_lo ) +MACHINE_CONFIG_DERIVED(itech8_state::stratab_lo, itech8_core_lo) /* basic machine hardware */ MCFG_FRAGMENT_ADD(itech8_sound_ym2203) @@ -1835,7 +1835,7 @@ static MACHINE_CONFIG_DERIVED( stratab_lo, itech8_core_lo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( slikshot_hi, itech8_core_hi ) +MACHINE_CONFIG_DERIVED(itech8_state::slikshot_hi, itech8_core_hi) /* basic machine hardware */ MCFG_FRAGMENT_ADD(itech8_sound_ym2203) @@ -1852,7 +1852,7 @@ static MACHINE_CONFIG_DERIVED( slikshot_hi, itech8_core_hi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( slikshot_lo, itech8_core_lo ) +MACHINE_CONFIG_DERIVED(itech8_state::slikshot_lo, itech8_core_lo) /* basic machine hardware */ MCFG_FRAGMENT_ADD(itech8_sound_ym2203) @@ -1869,7 +1869,7 @@ static MACHINE_CONFIG_DERIVED( slikshot_lo, itech8_core_lo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( slikshot_lo_noz80, itech8_core_lo ) +MACHINE_CONFIG_DERIVED(itech8_state::slikshot_lo_noz80, itech8_core_lo) /* basic machine hardware */ MCFG_FRAGMENT_ADD(itech8_sound_ym2203) @@ -1881,7 +1881,7 @@ static MACHINE_CONFIG_DERIVED( slikshot_lo_noz80, itech8_core_lo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sstrike, slikshot_lo ) +MACHINE_CONFIG_DERIVED(itech8_state::sstrike, slikshot_lo) /* basic machine hardware */ MCFG_MACHINE_START_OVERRIDE(itech8_state,sstrike) @@ -1889,7 +1889,7 @@ static MACHINE_CONFIG_DERIVED( sstrike, slikshot_lo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hstennis_hi, itech8_core_hi ) +MACHINE_CONFIG_DERIVED(itech8_state::hstennis_hi, itech8_core_hi) /* basic machine hardware */ MCFG_FRAGMENT_ADD(itech8_sound_ym3812) @@ -1901,7 +1901,7 @@ static MACHINE_CONFIG_DERIVED( hstennis_hi, itech8_core_hi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hstennis_lo, itech8_core_lo ) +MACHINE_CONFIG_DERIVED(itech8_state::hstennis_lo, itech8_core_lo) /* basic machine hardware */ MCFG_FRAGMENT_ADD(itech8_sound_ym3812) @@ -1913,7 +1913,7 @@ static MACHINE_CONFIG_DERIVED( hstennis_lo, itech8_core_lo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rimrockn, itech8_core_hi ) +MACHINE_CONFIG_DERIVED(itech8_state::rimrockn, itech8_core_hi) /* basic machine hardware */ MCFG_FRAGMENT_ADD(itech8_sound_ym3812_external) @@ -1929,7 +1929,7 @@ static MACHINE_CONFIG_DERIVED( rimrockn, itech8_core_hi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ninclown, itech8_core_hi ) +MACHINE_CONFIG_DERIVED(itech8_state::ninclown, itech8_core_hi) /* basic machine hardware */ MCFG_FRAGMENT_ADD(itech8_sound_ym3812_external) @@ -1946,7 +1946,7 @@ static MACHINE_CONFIG_DERIVED( ninclown, itech8_core_hi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gtg2, itech8_core_lo ) +MACHINE_CONFIG_DERIVED(itech8_state::gtg2, itech8_core_lo) /* basic machine hardware */ MCFG_FRAGMENT_ADD(itech8_sound_ym3812_external) diff --git a/src/mame/drivers/itgambl2.cpp b/src/mame/drivers/itgambl2.cpp index 857aad36c04..78828e2ff4c 100644 --- a/src/mame/drivers/itgambl2.cpp +++ b/src/mame/drivers/itgambl2.cpp @@ -80,6 +80,7 @@ public: uint32_t screen_update_itgambl2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_palette; + void itgambl2(machine_config &config); }; @@ -270,7 +271,7 @@ PALETTE_INIT_MEMBER(itgambl2_state, itgambl2) * Machine Drivers * **************************/ -static MACHINE_CONFIG_START( itgambl2 ) +MACHINE_CONFIG_START(itgambl2_state::itgambl2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H83337, MAIN_CLOCK) diff --git a/src/mame/drivers/itgambl3.cpp b/src/mame/drivers/itgambl3.cpp index 522f43567ec..8d9bf628a91 100644 --- a/src/mame/drivers/itgambl3.cpp +++ b/src/mame/drivers/itgambl3.cpp @@ -66,6 +66,7 @@ public: uint32_t screen_update_itgambl3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_palette; + void itgambl3(machine_config &config); }; @@ -258,7 +259,7 @@ PALETTE_INIT_MEMBER(itgambl3_state, itgambl3) * Machine Drivers * **************************/ -static MACHINE_CONFIG_START( itgambl3 ) +MACHINE_CONFIG_START(itgambl3_state::itgambl3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a M16C core ATM */ diff --git a/src/mame/drivers/itgamble.cpp b/src/mame/drivers/itgamble.cpp index e7a8f8d9d44..a6a3a43ec19 100644 --- a/src/mame/drivers/itgamble.cpp +++ b/src/mame/drivers/itgamble.cpp @@ -74,6 +74,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void mnumber(machine_config &config); + void itgamble(machine_config &config); protected: // devices @@ -208,7 +210,7 @@ void itgamble_state::machine_reset() * Machine Drivers * **************************/ -static MACHINE_CONFIG_START( itgamble ) +MACHINE_CONFIG_START(itgamble_state::itgamble) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H83048, MAIN_CLOCK/2) @@ -233,7 +235,7 @@ static MACHINE_CONFIG_START( itgamble ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mnumber, itgamble ) +MACHINE_CONFIG_DERIVED(itgamble_state::mnumber, itgamble) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(MNUMBER_MAIN_CLOCK/2) /* probably the wrong CPU */ diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp index 0e6bc85a5b3..5177554d3d2 100644 --- a/src/mame/drivers/itt3030.cpp +++ b/src/mame/drivers/itt3030.cpp @@ -250,6 +250,7 @@ public: DECLARE_WRITE_LINE_MEMBER(fdchld_w); DECLARE_PALETTE_INIT(itt3030); + void itt3030(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -657,7 +658,7 @@ PALETTE_INIT_MEMBER(itt3030_state, itt3030) palette.set_pen_color(2, rgb_t::black()); } -static MACHINE_CONFIG_START( itt3030 ) +MACHINE_CONFIG_START(itt3030_state::itt3030) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,XTAL_4MHz) diff --git a/src/mame/drivers/jack.cpp b/src/mame/drivers/jack.cpp index 9bcf5b51ea5..c95f9e913ed 100644 --- a/src/mame/drivers/jack.cpp +++ b/src/mame/drivers/jack.cpp @@ -903,7 +903,7 @@ MACHINE_RESET_MEMBER(jack_state,joinem) /***************************************************************/ -static MACHINE_CONFIG_START( jack ) +MACHINE_CONFIG_START(jack_state::jack) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/6) @@ -941,13 +941,13 @@ static MACHINE_CONFIG_START( jack ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( treahunt, jack ) +MACHINE_CONFIG_DERIVED(jack_state::treahunt, jack) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( striv, jack ) +MACHINE_CONFIG_DERIVED(jack_state::striv, jack) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -970,7 +970,7 @@ INTERRUPT_GEN_MEMBER(jack_state::joinem_vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_DERIVED( joinem, jack ) +MACHINE_CONFIG_DERIVED(jack_state::joinem, jack) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -995,7 +995,7 @@ static MACHINE_CONFIG_DERIVED( joinem, jack ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( unclepoo, joinem ) +MACHINE_CONFIG_DERIVED(jack_state::unclepoo, joinem) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/jackal.cpp b/src/mame/drivers/jackal.cpp index da0d6e28541..142c8fa2fd4 100644 --- a/src/mame/drivers/jackal.cpp +++ b/src/mame/drivers/jackal.cpp @@ -355,7 +355,7 @@ void jackal_state::machine_reset() m_irq_enable = 0; } -static MACHINE_CONFIG_START( jackal ) +MACHINE_CONFIG_START(jackal_state::jackal) /* basic machine hardware */ MCFG_CPU_ADD("master", MC6809E, MASTER_CLOCK/12) // verified on pcb diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp index 8c5d8c0dab8..fe3fd548acb 100644 --- a/src/mame/drivers/jackie.cpp +++ b/src/mame/drivers/jackie.cpp @@ -132,6 +132,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(irq); + void jackie(machine_config &config); }; @@ -596,7 +597,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(jackie_state::irq) m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( jackie ) +MACHINE_CONFIG_START(jackie_state::jackie) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2) diff --git a/src/mame/drivers/jackpool.cpp b/src/mame/drivers/jackpool.cpp index e6fe221f0b9..f6bff691fb4 100644 --- a/src/mame/drivers/jackpool.cpp +++ b/src/mame/drivers/jackpool.cpp @@ -51,6 +51,7 @@ public: required_device m_eeprom; required_device m_gfxdecode; required_device m_palette; + void jackpool(machine_config &config); }; @@ -223,7 +224,7 @@ INTERRUPT_GEN_MEMBER(jackpool_state::jackpool_interrupt) } -static MACHINE_CONFIG_START( jackpool ) +MACHINE_CONFIG_START(jackpool_state::jackpool) MCFG_CPU_ADD("maincpu", M68000, 12000000) // ? MCFG_CPU_PROGRAM_MAP(jackpool_mem) MCFG_CPU_VBLANK_INT_DRIVER("screen", jackpool_state, jackpool_interrupt) // ? diff --git a/src/mame/drivers/jade.cpp b/src/mame/drivers/jade.cpp index 251679a3312..ebfe0f0a445 100644 --- a/src/mame/drivers/jade.cpp +++ b/src/mame/drivers/jade.cpp @@ -33,6 +33,7 @@ public: , m_maincpu(*this, "maincpu") { } + void jade(machine_config &config); private: required_device m_maincpu; }; @@ -57,7 +58,7 @@ static INPUT_PORTS_START( jade ) INPUT_PORTS_END -static MACHINE_CONFIG_START( jade ) +MACHINE_CONFIG_START(jade_state::jade) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp index e62cb6783aa..6e9c5b985e2 100644 --- a/src/mame/drivers/jaguar.cpp +++ b/src/mame/drivers/jaguar.cpp @@ -1801,7 +1801,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( cojagr3k ) +MACHINE_CONFIG_START(jaguar_state::cojagr3k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R3041, R3000_CLOCK) @@ -1838,12 +1838,12 @@ static MACHINE_CONFIG_START( cojagr3k ) MCFG_SOUND_ROUTE_EX(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "rdac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cojagr3k_rom, cojagr3k ) +MACHINE_CONFIG_DERIVED(jaguar_state::cojagr3k_rom, cojagr3k) MCFG_DEVICE_MODIFY("ide:0") MCFG_SLOT_DEFAULT_OPTION(nullptr) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cojag68k, cojagr3k ) +MACHINE_CONFIG_DERIVED(jaguar_state::cojag68k, cojagr3k) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", M68EC020, M68K_CLOCK/2) @@ -1851,7 +1851,7 @@ static MACHINE_CONFIG_DERIVED( cojag68k, cojagr3k ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( jaguar ) +MACHINE_CONFIG_START(jaguar_state::jaguar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, JAGUAR_CLOCK/2) @@ -1896,7 +1896,7 @@ static MACHINE_CONFIG_START( jaguar ) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jaguarcd, jaguar ) +MACHINE_CONFIG_DERIVED(jaguar_state::jaguarcd, jaguar) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(jaguarcd_map) diff --git a/src/mame/drivers/jailbrek.cpp b/src/mame/drivers/jailbrek.cpp index 47da5cd5807..dbc97373c45 100644 --- a/src/mame/drivers/jailbrek.cpp +++ b/src/mame/drivers/jailbrek.cpp @@ -259,7 +259,7 @@ void jailbrek_state::machine_reset() m_nmi_enable = 0; } -static MACHINE_CONFIG_START( jailbrek ) +MACHINE_CONFIG_START(jailbrek_state::jailbrek) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI1, MASTER_CLOCK/12) diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp index 6fc9aad2a42..15fb898f5bf 100644 --- a/src/mame/drivers/jalmah.cpp +++ b/src/mame/drivers/jalmah.cpp @@ -232,6 +232,8 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void urashima(machine_config &config); + void jalmah(machine_config &config); }; @@ -1418,7 +1420,7 @@ void jalmah_state::machine_reset() } } -static MACHINE_CONFIG_START( jalmah ) +MACHINE_CONFIG_START(jalmah_state::jalmah) MCFG_CPU_ADD("maincpu" , M68000, 12000000) /* 68000-8 */ MCFG_CPU_PROGRAM_MAP(jalmah) MCFG_CPU_VBLANK_INT_DRIVER("screen", jalmah_state, irq2_line_hold) @@ -1445,7 +1447,7 @@ static MACHINE_CONFIG_START( jalmah ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( urashima, jalmah ) +MACHINE_CONFIG_DERIVED(jalmah_state::urashima, jalmah) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(urashima) diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp index b84beb3d989..0c3f9276787 100644 --- a/src/mame/drivers/jangou.cpp +++ b/src/mame/drivers/jangou.cpp @@ -109,6 +109,10 @@ public: DECLARE_WRITE_LINE_MEMBER(jngolady_vclk_cb); std::unique_ptr m_tmp_bitmap; + void jngolady(machine_config &config); + void roylcrdn(machine_config &config); + void cntrygrl(machine_config &config); + void jangou(machine_config &config); }; @@ -838,7 +842,7 @@ MACHINE_RESET_MEMBER(jangou_state,jngolady) } /* Note: All frequencies and dividers are unverified */ -static MACHINE_CONFIG_START( jangou ) +MACHINE_CONFIG_START(jangou_state::jangou) /* basic machine hardware */ MCFG_CPU_ADD("cpu0", Z80, MASTER_CLOCK / 8) @@ -875,7 +879,7 @@ static MACHINE_CONFIG_START( jangou ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jngolady, jangou ) +MACHINE_CONFIG_DERIVED(jangou_state::jngolady, jangou) /* basic machine hardware */ @@ -901,7 +905,7 @@ static MACHINE_CONFIG_DERIVED( jngolady, jangou ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cntrygrl, jangou ) +MACHINE_CONFIG_DERIVED(jangou_state::cntrygrl, jangou) /* basic machine hardware */ @@ -919,7 +923,7 @@ static MACHINE_CONFIG_DERIVED( cntrygrl, jangou ) MCFG_DEVICE_REMOVE("soundlatch") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( roylcrdn, jangou ) +MACHINE_CONFIG_DERIVED(jangou_state::roylcrdn, jangou) /* basic machine hardware */ diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp index df5fd004b31..84fbd4e9fb7 100644 --- a/src/mame/drivers/jankenmn.cpp +++ b/src/mame/drivers/jankenmn.cpp @@ -173,6 +173,7 @@ public: DECLARE_WRITE8_MEMBER(lamps3_w); DECLARE_CUSTOM_INPUT_MEMBER(hopper_status_r); + void jankenmn(machine_config &config); }; @@ -362,7 +363,7 @@ static const z80_daisy_config daisy_chain[] = * Machine Config * *********************************************/ -static MACHINE_CONFIG_START( jankenmn ) +MACHINE_CONFIG_START(jankenmn_state::jankenmn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 2.5 MHz */ MCFG_Z80_DAISY_CHAIN(daisy_chain) diff --git a/src/mame/drivers/jantotsu.cpp b/src/mame/drivers/jantotsu.cpp index afa91d7ff59..5b2a775f98d 100644 --- a/src/mame/drivers/jantotsu.cpp +++ b/src/mame/drivers/jantotsu.cpp @@ -143,6 +143,7 @@ public: required_device m_maincpu; required_device m_adpcm; required_device m_palette; + void jantotsu(machine_config &config); }; @@ -494,7 +495,7 @@ void jantotsu_state::machine_reset() m_adpcm_trigger = 0; } -static MACHINE_CONFIG_START( jantotsu ) +MACHINE_CONFIG_START(jantotsu_state::jantotsu) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,MAIN_CLOCK/4) diff --git a/src/mame/drivers/jchan.cpp b/src/mame/drivers/jchan.cpp index 513431fc66d..7be522b936d 100644 --- a/src/mame/drivers/jchan.cpp +++ b/src/mame/drivers/jchan.cpp @@ -222,6 +222,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(vblank); + void jchan(machine_config &config); }; @@ -577,7 +578,7 @@ INPUT_PORTS_END /* machine driver */ -static MACHINE_CONFIG_START( jchan ) +MACHINE_CONFIG_START(jchan_state::jchan) MCFG_CPU_ADD("maincpu", M68000, 16000000) MCFG_CPU_PROGRAM_MAP(jchan_main) diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp index 096d73fbf49..9c850a40e9e 100644 --- a/src/mame/drivers/jclub2.cpp +++ b/src/mame/drivers/jclub2.cpp @@ -169,6 +169,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void jclub2(machine_config &config); private: required_device m_st0020; }; @@ -198,6 +199,7 @@ public: DECLARE_WRITE32_MEMBER(cmd2_word_w); DECLARE_READ32_MEMBER(cmd_stat_word_r); + void jclub2o(machine_config &config); private: uint8_t m_cmd1; uint8_t m_cmd2; @@ -235,6 +237,7 @@ public: DECLARE_DRIVER_INIT(darkhors); DECLARE_VIDEO_START(darkhors); + void darkhors(machine_config &config); private: required_shared_ptr m_tmapram; required_shared_ptr m_tmapscroll; @@ -1110,7 +1113,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(common_state::scanline_irq) } // Older hardware (ST-0020 + ST-0016) -static MACHINE_CONFIG_START( jclub2o ) +MACHINE_CONFIG_START(jclub2o_state::jclub2o) MCFG_CPU_ADD("gamecpu", M68EC020, 12000000) MCFG_CPU_PROGRAM_MAP(jclub2o_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", common_state, scanline_irq, "screen", 0, 1) @@ -1149,7 +1152,7 @@ MACHINE_CONFIG_END // Newer hardware (ST-0032) -static MACHINE_CONFIG_START( jclub2 ) +MACHINE_CONFIG_START(jclub2_state::jclub2) MCFG_CPU_ADD("gamecpu", M68EC020, 12000000) MCFG_CPU_PROGRAM_MAP(jclub2_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", common_state, scanline_irq, "screen", 0, 1) @@ -1184,7 +1187,7 @@ static MACHINE_CONFIG_START( jclub2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( darkhors ) +MACHINE_CONFIG_START(darkhors_state::darkhors) MCFG_CPU_ADD("gamecpu", M68EC020, 12000000) // 36MHz/3 ?? MCFG_CPU_PROGRAM_MAP(darkhors_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", common_state, scanline_irq, "screen", 0, 1) diff --git a/src/mame/drivers/jedi.cpp b/src/mame/drivers/jedi.cpp index 1591d0809cb..ece7c810e60 100644 --- a/src/mame/drivers/jedi.cpp +++ b/src/mame/drivers/jedi.cpp @@ -335,7 +335,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( jedi ) +MACHINE_CONFIG_START(jedi_state::jedi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, JEDI_MAIN_CPU_CLOCK) diff --git a/src/mame/drivers/jeutel.cpp b/src/mame/drivers/jeutel.cpp index 82817b4f7fa..9508d4a5085 100644 --- a/src/mame/drivers/jeutel.cpp +++ b/src/mame/drivers/jeutel.cpp @@ -45,6 +45,7 @@ public: DECLARE_WRITE8_MEMBER(ppi0b_w); DECLARE_WRITE8_MEMBER(sndcmd_w); TIMER_DEVICE_CALLBACK_MEMBER(timer_a); + void jeutel(machine_config &config); private: bool m_timer_a; uint8_t m_sndcmd; @@ -184,7 +185,7 @@ DRIVER_INIT_MEMBER( jeutel_state, jeutel ) { } -static MACHINE_CONFIG_START( jeutel ) +MACHINE_CONFIG_START(jeutel_state::jeutel) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3300000) MCFG_CPU_PROGRAM_MAP(jeutel_map) diff --git a/src/mame/drivers/joctronic.cpp b/src/mame/drivers/joctronic.cpp index 50c5ba9a4fa..2e2d194de6b 100644 --- a/src/mame/drivers/joctronic.cpp +++ b/src/mame/drivers/joctronic.cpp @@ -59,6 +59,9 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void slalom03(machine_config &config); + void joctronic(machine_config &config); + void bldyrolr(machine_config &config); private: required_device m_maincpu; required_device m_soundcpu; @@ -312,7 +315,7 @@ void joctronic_state::machine_reset() static INPUT_PORTS_START( joctronic ) INPUT_PORTS_END -static MACHINE_CONFIG_START( joctronic ) +MACHINE_CONFIG_START(joctronic_state::joctronic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) // 3 MHz - uses WAIT MCFG_CPU_PROGRAM_MAP(maincpu_map) // 139 @@ -358,7 +361,7 @@ static MACHINE_CONFIG_START( joctronic ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( slalom03 ) +MACHINE_CONFIG_START(joctronic_state::slalom03) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) // 6 MHz - uses WAIT MCFG_CPU_PROGRAM_MAP(slalom03_maincpu_map) // 138, 368, 32 @@ -411,7 +414,7 @@ static MACHINE_CONFIG_START( slalom03 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bldyrolr, slalom03 ) +MACHINE_CONFIG_DERIVED(joctronic_state::bldyrolr, slalom03) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bldyrolr_maincpu_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp index 08ace215a71..52b453178ad 100644 --- a/src/mame/drivers/jokrwild.cpp +++ b/src/mame/drivers/jokrwild.cpp @@ -106,6 +106,7 @@ public: uint32_t screen_update_jokrwild(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void jokrwild(machine_config &config); }; @@ -402,7 +403,7 @@ WRITE8_MEMBER(jokrwild_state::testb_w) * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( jokrwild ) +MACHINE_CONFIG_START(jokrwild_state::jokrwild) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/2) /* guess */ diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp index aef633e7937..c9896479013 100644 --- a/src/mame/drivers/jollyjgr.cpp +++ b/src/mame/drivers/jollyjgr.cpp @@ -174,6 +174,8 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_bm_palette; + void fspider(machine_config &config); + void jollyjgr(machine_config &config); }; @@ -670,7 +672,7 @@ void jollyjgr_state::machine_reset() m_tilemap_bank = 0; } -static MACHINE_CONFIG_START( jollyjgr ) +MACHINE_CONFIG_START(jollyjgr_state::jollyjgr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/6) /* 3MHz verified */ MCFG_CPU_PROGRAM_MAP(jollyjgr_map) @@ -696,7 +698,7 @@ static MACHINE_CONFIG_START( jollyjgr ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fspider, jollyjgr ) +MACHINE_CONFIG_DERIVED(jollyjgr_state::fspider, jollyjgr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(fspider_map) diff --git a/src/mame/drivers/jongkyo.cpp b/src/mame/drivers/jongkyo.cpp index 082da98218e..8a3913a79e0 100644 --- a/src/mame/drivers/jongkyo.cpp +++ b/src/mame/drivers/jongkyo.cpp @@ -66,6 +66,7 @@ public: DECLARE_PALETTE_INIT(jongkyo); uint32_t screen_update_jongkyo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void jongkyo(machine_config &config); }; @@ -490,7 +491,7 @@ void jongkyo_state::machine_reset() } -static MACHINE_CONFIG_START( jongkyo ) +MACHINE_CONFIG_START(jongkyo_state::jongkyo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SEGA_315_5084,JONGKYO_CLOCK/4) diff --git a/src/mame/drivers/jonos.cpp b/src/mame/drivers/jonos.cpp index 76ccdb1853e..7ab12b0f3b1 100644 --- a/src/mame/drivers/jonos.cpp +++ b/src/mame/drivers/jonos.cpp @@ -37,6 +37,7 @@ public: u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void kbd_put(u8 data); + void jonos(machine_config &config); private: u8 m_framecnt; u8 m_term_data; @@ -169,7 +170,7 @@ static GFXDECODE_START( jonos ) GFXDECODE_END -static MACHINE_CONFIG_START( jonos ) +MACHINE_CONFIG_START(jonos_state::jonos) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(jonos_mem) diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp index 2ecc062c077..3ad5e051c1d 100644 --- a/src/mame/drivers/joystand.cpp +++ b/src/mame/drivers/joystand.cpp @@ -203,6 +203,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; INTERRUPT_GEN_MEMBER(joystand_interrupt); + void joystand(machine_config &config); }; const rgb_t joystand_state::BG15_TRANSPARENT = 0x99999999; @@ -579,7 +580,7 @@ INTERRUPT_GEN_MEMBER(joystand_state::joystand_interrupt) m_tmp68301->external_interrupt_1(); } -static MACHINE_CONFIG_START( joystand ) +MACHINE_CONFIG_START(joystand_state::joystand) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // !! TMP68301 !! diff --git a/src/mame/drivers/jp.cpp b/src/mame/drivers/jp.cpp index d66d3ba3477..22d1773e01a 100644 --- a/src/mame/drivers/jp.cpp +++ b/src/mame/drivers/jp.cpp @@ -57,6 +57,8 @@ public: IRQ_CALLBACK_MEMBER(sound_int_cb); DECLARE_DRIVER_INIT(jp); + void jp(machine_config &config); + void jps(machine_config &config); private: void update_display(); virtual void machine_start() override; @@ -320,7 +322,7 @@ DRIVER_INIT_MEMBER( jp_state, jp ) { } -static MACHINE_CONFIG_START( jp ) +MACHINE_CONFIG_START(jp_state::jp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(jp_map) @@ -395,7 +397,7 @@ IRQ_CALLBACK_MEMBER(jp_state::sound_int_cb) return 0xff; } -static MACHINE_CONFIG_DERIVED( jps, jp ) +MACHINE_CONFIG_DERIVED(jp_state::jps, jp) MCFG_CPU_ADD("soundcpu", Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(jp_sound_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(jp_state, sound_int_cb) diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp index 5b07067699c..84b8bf988fe 100644 --- a/src/mame/drivers/jpmimpct.cpp +++ b/src/mame/drivers/jpmimpct.cpp @@ -835,7 +835,7 @@ WRITE_LINE_MEMBER(jpmimpct_state::tms_irq) * *************************************/ -static MACHINE_CONFIG_START( jpmimpct ) +MACHINE_CONFIG_START(jpmimpct_state::jpmimpct) MCFG_CPU_ADD("maincpu", M68000, 8000000) MCFG_CPU_PROGRAM_MAP(m68k_program_map) @@ -1307,7 +1307,7 @@ INPUT_PORTS_END * *************************************/ -MACHINE_CONFIG_START( impctawp ) +MACHINE_CONFIG_START(jpmimpct_state::impctawp) MCFG_CPU_ADD("maincpu",M68000, 8000000) MCFG_CPU_PROGRAM_MAP(awp68k_program_map) diff --git a/src/mame/drivers/jpmimpctsw.cpp b/src/mame/drivers/jpmimpctsw.cpp index d3821917b22..d93efa8b315 100644 --- a/src/mame/drivers/jpmimpctsw.cpp +++ b/src/mame/drivers/jpmimpctsw.cpp @@ -71,7 +71,6 @@ -MACHINE_CONFIG_EXTERN( impctawp ); INPUT_PORTS_EXTERN( tbirds ); diff --git a/src/mame/drivers/jpmmps.cpp b/src/mame/drivers/jpmmps.cpp index 1c965064a8f..d83988c841c 100644 --- a/src/mame/drivers/jpmmps.cpp +++ b/src/mame/drivers/jpmmps.cpp @@ -150,6 +150,7 @@ public: uint8_t m_psg_latch; virtual void machine_reset() override; + void jpmmps(machine_config &config); protected: // devices @@ -239,7 +240,7 @@ void jpmmps_state::machine_reset() cpu->reset_line(ASSERT_LINE); } -static MACHINE_CONFIG_START( jpmmps ) +MACHINE_CONFIG_START(jpmmps_state::jpmmps) // CPU TMS9995, standard variant; no line connections MCFG_TMS99xx_ADD("maincpu", TMS9995, MAIN_CLOCK, jpmmps_map, jpmmps_io_map) diff --git a/src/mame/drivers/jpms80.cpp b/src/mame/drivers/jpms80.cpp index 75e910baa07..fcbacf080a8 100644 --- a/src/mame/drivers/jpms80.cpp +++ b/src/mame/drivers/jpms80.cpp @@ -61,6 +61,7 @@ public: DECLARE_WRITE_LINE_MEMBER(watchdog_w); DECLARE_WRITE_LINE_MEMBER(io_enable_w); + void jpms80(machine_config &config); protected: // devices @@ -126,7 +127,7 @@ void jpms80_state::machine_reset() cpu->reset_line(ASSERT_LINE); } -static MACHINE_CONFIG_START( jpms80 ) +MACHINE_CONFIG_START(jpms80_state::jpms80) // CPU TMS9995, standard variant; no line connections MCFG_TMS99xx_ADD("maincpu", TMS9995, MAIN_CLOCK, jpms80_map, jpms80_io_map) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/jpmsru.cpp b/src/mame/drivers/jpmsru.cpp index b64a708524a..23ffce88394 100644 --- a/src/mame/drivers/jpmsru.cpp +++ b/src/mame/drivers/jpmsru.cpp @@ -30,6 +30,8 @@ public: m_maincpu(*this, "maincpu") { } + void jpmsru(machine_config &config); + void jpmsru_4(machine_config &config); protected: // devices @@ -63,11 +65,11 @@ ADDRESS_MAP_END static INPUT_PORTS_START( jpmsru ) INPUT_PORTS_END -static MACHINE_CONFIG_START( jpmsru ) +MACHINE_CONFIG_START(jpmsru_state::jpmsru) MCFG_TMS99xx_ADD("maincpu", TMS9980A, MAIN_CLOCK, jpmsru_map, jpmsru_io) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( jpmsru_4 ) +MACHINE_CONFIG_START(jpmsru_state::jpmsru_4) MCFG_TMS99xx_ADD("maincpu", TMS9980A, MAIN_CLOCK, jpmsru_4_map, jpmsru_io) MACHINE_CONFIG_END diff --git a/src/mame/drivers/jpmsys5.cpp b/src/mame/drivers/jpmsys5.cpp index 6404d4bc634..bcd55f7ccf8 100644 --- a/src/mame/drivers/jpmsys5.cpp +++ b/src/mame/drivers/jpmsys5.cpp @@ -616,7 +616,7 @@ MACHINE_RESET_MEMBER(jpmsys5_state,jpmsys5v) * *************************************/ -static MACHINE_CONFIG_START( jpmsys5v ) +MACHINE_CONFIG_START(jpmsys5_state::jpmsys5v) MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(68000_map) @@ -832,7 +832,7 @@ MACHINE_RESET_MEMBER(jpmsys5_state,jpmsys5) *************************************/ // later (incompatible with earlier revision) motherboards used a YM2413 -MACHINE_CONFIG_START( jpmsys5_ym ) +MACHINE_CONFIG_START(jpmsys5_state::jpmsys5_ym) MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(68000_awp_map) @@ -886,7 +886,7 @@ MACHINE_CONFIG_START( jpmsys5_ym ) MACHINE_CONFIG_END // the first rev PCB used an SAA1099 -MACHINE_CONFIG_START( jpmsys5 ) +MACHINE_CONFIG_START(jpmsys5_state::jpmsys5) MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(68000_awp_map_saa) diff --git a/src/mame/drivers/jpmsys5sw.cpp b/src/mame/drivers/jpmsys5sw.cpp index f1ff1c6c530..bc0389d6619 100644 --- a/src/mame/drivers/jpmsys5sw.cpp +++ b/src/mame/drivers/jpmsys5sw.cpp @@ -39,8 +39,6 @@ #include "j5wsc.lh" -MACHINE_CONFIG_EXTERN( jpmsys5 ); -MACHINE_CONFIG_EXTERN( jpmsys5_ym ); INPUT_PORTS_EXTERN( popeye ); /* SAA based board */ diff --git a/src/mame/drivers/jpmsys7.cpp b/src/mame/drivers/jpmsys7.cpp index 8f7c2a323ed..d256c8eff11 100644 --- a/src/mame/drivers/jpmsys7.cpp +++ b/src/mame/drivers/jpmsys7.cpp @@ -33,6 +33,7 @@ public: , m_maincpu(*this, "maincpu") { } + void jpmsys7(machine_config &config); protected: // devices @@ -52,7 +53,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( jpmsys7 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( jpmsys7 ) +MACHINE_CONFIG_START(jpmsys7_state::jpmsys7) MCFG_CPU_ADD("maincpu", MCF5206E, 40000000) // seems to be a Coldfire of some kind MCFG_CPU_PROGRAM_MAP(jpmsys7_map) MCFG_MCF5206E_PERIPHERAL_ADD("maincpu_onboard") diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp index f02c726db43..8d6af7149df 100644 --- a/src/mame/drivers/jr100.cpp +++ b/src/mame/drivers/jr100.cpp @@ -72,6 +72,7 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER(jr100); + void jr100(machine_config &config); protected: required_device m_via; required_device m_cassette; @@ -365,7 +366,7 @@ QUICKLOAD_LOAD_MEMBER( jr100_state,jr100) return image_init_result::PASS; } -static MACHINE_CONFIG_START( jr100 ) +MACHINE_CONFIG_START(jr100_state::jr100) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6802, XTAL_14_31818MHz / 4) // clock devided internaly by 4 diff --git a/src/mame/drivers/jr200.cpp b/src/mame/drivers/jr200.cpp index 1050335963b..8e2e631304b 100644 --- a/src/mame/drivers/jr200.cpp +++ b/src/mame/drivers/jr200.cpp @@ -75,6 +75,7 @@ public: uint32_t screen_update_jr200(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(timer_d_callback); + void jr200(machine_config &config); protected: required_device m_maincpu; required_device m_beeper; @@ -532,7 +533,7 @@ void jr200_state::machine_reset() } -static MACHINE_CONFIG_START( jr200 ) +MACHINE_CONFIG_START(jr200_state::jr200) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6802, XTAL_14_31818MHz / 4) /* MN1800A, ? Mhz assumption that it is same as JR-100*/ MCFG_CPU_PROGRAM_MAP(jr200_mem) diff --git a/src/mame/drivers/jrpacman.cpp b/src/mame/drivers/jrpacman.cpp index caed76f7cf8..0d53c87a836 100644 --- a/src/mame/drivers/jrpacman.cpp +++ b/src/mame/drivers/jrpacman.cpp @@ -118,6 +118,7 @@ public: DECLARE_WRITE_LINE_MEMBER(irq_mask_w); DECLARE_DRIVER_INIT(jrpacman); INTERRUPT_GEN_MEMBER(vblank_irq); + void jrpacman(machine_config &config); }; @@ -270,7 +271,7 @@ INTERRUPT_GEN_MEMBER(jrpacman_state::vblank_irq) device.execute().set_input_line(0, HOLD_LINE); } -static MACHINE_CONFIG_START( jrpacman ) +MACHINE_CONFIG_START(jrpacman_state::jrpacman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp index 68fb8f58a94..4e9e48a0dfa 100644 --- a/src/mame/drivers/jtc.cpp +++ b/src/mame/drivers/jtc.cpp @@ -53,6 +53,8 @@ public: int m_centronics_busy; DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void basic(machine_config &config); + void jtc(machine_config &config); }; @@ -62,6 +64,7 @@ public: jtces88_state(const machine_config &mconfig, device_type type, const char *tag) : jtc_state(mconfig, type, tag) { } + void jtces88(machine_config &config); }; @@ -74,6 +77,7 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void jtces23(machine_config &config); }; @@ -95,6 +99,7 @@ public: std::unique_ptr m_color_ram_r; std::unique_ptr m_color_ram_g; std::unique_ptr m_color_ram_b; + void jtces40(machine_config &config); }; @@ -712,7 +717,7 @@ static GFXDECODE_START( jtces40 ) GFXDECODE_ENTRY( UB8830D_TAG, 0x1000, jtces40_charlayout, 0, 8 ) GFXDECODE_END -static MACHINE_CONFIG_START( basic ) +MACHINE_CONFIG_START(jtc_state::basic) /* basic machine hardware */ MCFG_CPU_ADD(UB8830D_TAG, UB8830D, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(jtc_mem) @@ -737,7 +742,7 @@ static MACHINE_CONFIG_START( basic ) MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(jtc_state, write_centronics_busy)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jtc, basic ) +MACHINE_CONFIG_DERIVED(jtc_state::jtc, basic) /* video hardware */ MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(50) @@ -754,7 +759,7 @@ static MACHINE_CONFIG_DERIVED( jtc, basic ) MCFG_RAM_DEFAULT_SIZE("2K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jtces88, jtc ) +MACHINE_CONFIG_DERIVED(jtces88_state::jtces88, jtc) /* basic machine hardware */ MCFG_CPU_MODIFY(UB8830D_TAG) MCFG_CPU_PROGRAM_MAP(jtc_es1988_mem) @@ -764,7 +769,7 @@ static MACHINE_CONFIG_DERIVED( jtces88, jtc ) MCFG_RAM_DEFAULT_SIZE("4K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jtces23, basic ) +MACHINE_CONFIG_DERIVED(jtces23_state::jtces23, basic) /* basic machine hardware */ MCFG_CPU_MODIFY(UB8830D_TAG) MCFG_CPU_PROGRAM_MAP(jtc_es23_mem) @@ -786,7 +791,7 @@ static MACHINE_CONFIG_DERIVED( jtces23, basic ) MCFG_RAM_DEFAULT_SIZE("4K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jtces40, basic ) +MACHINE_CONFIG_DERIVED(jtces40_state::jtces40, basic) /* basic machine hardware */ MCFG_CPU_MODIFY(UB8830D_TAG) MCFG_CPU_PROGRAM_MAP(jtc_es40_mem) diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp index 93bf71f8549..00a2acde6d7 100644 --- a/src/mame/drivers/jubilee.cpp +++ b/src/mame/drivers/jubilee.cpp @@ -230,6 +230,7 @@ public: INTERRUPT_GEN_MEMBER(jubileep_interrupt); required_device m_maincpu; required_device m_gfxdecode; + void jubileep(machine_config &config); }; @@ -656,7 +657,7 @@ GFXDECODE_END * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( jubileep ) +MACHINE_CONFIG_START(jubilee_state::jubileep) // Main CPU TMS9980A, no line connections. MCFG_TMS99xx_ADD("maincpu", TMS9980A, CPU_CLOCK, jubileep_map, jubileep_cru_map) diff --git a/src/mame/drivers/juicebox.cpp b/src/mame/drivers/juicebox.cpp index 0ad95457959..78a49f9ddf8 100644 --- a/src/mame/drivers/juicebox.cpp +++ b/src/mame/drivers/juicebox.cpp @@ -65,6 +65,7 @@ public: DECLARE_READ32_MEMBER(s3c44b0_gpio_port_r); DECLARE_WRITE32_MEMBER(s3c44b0_gpio_port_w); DECLARE_WRITE16_MEMBER(s3c44b0_i2s_data_w); + void juicebox(machine_config &config); }; inline void juicebox_state::verboselog(int n_level, const char *s_fmt, ...) @@ -301,7 +302,7 @@ DRIVER_INIT_MEMBER(juicebox_state,juicebox) // do nothing } -static MACHINE_CONFIG_START( juicebox ) +MACHINE_CONFIG_START(juicebox_state::juicebox) MCFG_CPU_ADD("maincpu", ARM7, 66000000) MCFG_CPU_PROGRAM_MAP(juicebox_map) diff --git a/src/mame/drivers/jungleyo.cpp b/src/mame/drivers/jungleyo.cpp index 12c7a5f3de9..db5b4a22fbf 100644 --- a/src/mame/drivers/jungleyo.cpp +++ b/src/mame/drivers/jungleyo.cpp @@ -59,6 +59,7 @@ public: uint32_t screen_update_jungleyo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void jungleyo(machine_config &config); }; void jungleyo_state::video_start() @@ -111,7 +112,7 @@ static GFXDECODE_START( jungleyo ) GFXDECODE_END -static MACHINE_CONFIG_START( jungleyo ) +MACHINE_CONFIG_START(jungleyo_state::jungleyo) MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(jungleyo_map) diff --git a/src/mame/drivers/junior.cpp b/src/mame/drivers/junior.cpp index f0dc2bc4074..0c03af60afe 100644 --- a/src/mame/drivers/junior.cpp +++ b/src/mame/drivers/junior.cpp @@ -55,6 +55,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(junior_reset); TIMER_DEVICE_CALLBACK_MEMBER(junior_update_leds); required_device m_maincpu; + void junior(machine_config &config); }; @@ -213,7 +214,7 @@ void junior_state::machine_reset() } -static MACHINE_CONFIG_START( junior ) +MACHINE_CONFIG_START(junior_state::junior) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6502, XTAL_1MHz) MCFG_CPU_PROGRAM_MAP(junior_mem) diff --git a/src/mame/drivers/junofrst.cpp b/src/mame/drivers/junofrst.cpp index 2b7d3878f1f..82e0cb86eb3 100644 --- a/src/mame/drivers/junofrst.cpp +++ b/src/mame/drivers/junofrst.cpp @@ -132,6 +132,7 @@ public: DECLARE_MACHINE_RESET(junofrst); INTERRUPT_GEN_MEMBER(_30hz_irq); + void junofrst(machine_config &config); }; @@ -384,7 +385,7 @@ INTERRUPT_GEN_MEMBER(junofrst_state::_30hz_irq) device.execute().set_input_line(0, ASSERT_LINE); } -static MACHINE_CONFIG_START( junofrst ) +MACHINE_CONFIG_START(junofrst_state::junofrst) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI1, 1500000) /* 1.5 MHz ??? */ diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp index 244c6d90d80..2f87656fd65 100644 --- a/src/mame/drivers/jupace.cpp +++ b/src/mame/drivers/jupace.cpp @@ -128,6 +128,7 @@ public: DECLARE_WRITE8_MEMBER(ald_w); DECLARE_SNAPSHOT_LOAD_MEMBER( ace ); + void ace(machine_config &config); private: required_device m_maincpu; required_device m_ppi; @@ -746,7 +747,7 @@ void ace_state::machine_start() // MACHINE_CONFIG( ace ) //------------------------------------------------- -static MACHINE_CONFIG_START( ace ) +MACHINE_CONFIG_START(ace_state::ace) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_6_5MHz/2) MCFG_CPU_PROGRAM_MAP(ace_mem) diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp index fb40dd79e20..b7da6e92ed3 100644 --- a/src/mame/drivers/jupiter.cpp +++ b/src/mame/drivers/jupiter.cpp @@ -55,6 +55,7 @@ public: DECLARE_DRIVER_INIT(jupiter2); + void jupiter2(machine_config &config); private: virtual void machine_start() override; required_device m_maincpu; @@ -80,6 +81,7 @@ public: DECLARE_READ8_MEMBER(key_r); DECLARE_READ8_MEMBER(ff_r); + void jupiter3(machine_config &config); private: virtual void machine_reset() override; uint8_t m_term_data; @@ -267,7 +269,7 @@ void jupiter3_state::machine_reset() // MACHINE_CONFIG( jupiter ) //------------------------------------------------- -static MACHINE_CONFIG_START( jupiter2 ) +MACHINE_CONFIG_START(jupiter2_state::jupiter2) // basic machine hardware MCFG_CPU_ADD(MCM6571AP_TAG, M6800, 2000000) MCFG_CPU_PROGRAM_MAP(jupiter2_mem) @@ -303,7 +305,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( jupiter3 ) //------------------------------------------------- -static MACHINE_CONFIG_START( jupiter3 ) +MACHINE_CONFIG_START(jupiter3_state::jupiter3) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) MCFG_CPU_PROGRAM_MAP(jupiter3_mem) diff --git a/src/mame/drivers/jvh.cpp b/src/mame/drivers/jvh.cpp index 80ad903632e..86774213bef 100644 --- a/src/mame/drivers/jvh.cpp +++ b/src/mame/drivers/jvh.cpp @@ -21,6 +21,8 @@ public: m_maincpu(*this, "maincpu") { } + void jvh2(machine_config &config); + void jvh(machine_config &config); protected: // devices @@ -109,7 +111,7 @@ DRIVER_INIT_MEMBER(jvh_state,jvh) { } -static MACHINE_CONFIG_START( jvh ) +MACHINE_CONFIG_START(jvh_state::jvh) // CPU TMS9980A; no line connections MCFG_TMS99xx_ADD("maincpu", TMS9980A, 1000000, jvh_map, escape_io) @@ -120,7 +122,7 @@ static MACHINE_CONFIG_START( jvh ) MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("soundcpu", M6802_IRQ_LINE)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( jvh2 ) +MACHINE_CONFIG_START(jvh_state::jvh2) // CPU TMS9980At; no line connections MCFG_TMS99xx_ADD("maincpu", TMS9980A, 1000000, jvh_map, movmastr_io) diff --git a/src/mame/drivers/k1003.cpp b/src/mame/drivers/k1003.cpp index 653973acecc..f4d12fdf502 100644 --- a/src/mame/drivers/k1003.cpp +++ b/src/mame/drivers/k1003.cpp @@ -59,6 +59,7 @@ public: DECLARE_WRITE8_MEMBER(disp_2_w); DECLARE_WRITE8_MEMBER(disp_w); + void k1003(machine_config &config); private: uint8_t m_disp_1; uint8_t m_disp_2; @@ -136,7 +137,7 @@ void k1003_state::machine_reset() { } -static MACHINE_CONFIG_START( k1003 ) +MACHINE_CONFIG_START(k1003_state::k1003) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8008, 800000) MCFG_CPU_PROGRAM_MAP(k1003_mem) diff --git a/src/mame/drivers/k28.cpp b/src/mame/drivers/k28.cpp index 965bf62f0b3..de463c240ae 100644 --- a/src/mame/drivers/k28.cpp +++ b/src/mame/drivers/k28.cpp @@ -92,6 +92,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(power_on); void power_off(); + void k28(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -450,7 +451,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( k28 ) +MACHINE_CONFIG_START(k28_state::k28) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8021, XTAL_3_579545MHz) diff --git a/src/mame/drivers/k8915.cpp b/src/mame/drivers/k8915.cpp index 9603825faf0..c8ccf869f5d 100644 --- a/src/mame/drivers/k8915.cpp +++ b/src/mame/drivers/k8915.cpp @@ -32,6 +32,7 @@ public: DECLARE_DRIVER_INIT(k8915); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void k8915(machine_config &config); private: uint8_t m_framecnt; virtual void machine_reset() override; @@ -126,7 +127,7 @@ uint32_t k8915_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } -static MACHINE_CONFIG_START( k8915 ) +MACHINE_CONFIG_START(k8915_state::k8915) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4_9152MHz / 2) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp index 210f346b2e5..b38eeb80e92 100644 --- a/src/mame/drivers/kaneko16.cpp +++ b/src/mame/drivers/kaneko16.cpp @@ -1867,7 +1867,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(kaneko16_state::kaneko16_interrupt) 6-7] rte */ -static MACHINE_CONFIG_START( berlwall ) +MACHINE_CONFIG_START(kaneko16_berlwall_state::berlwall) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12 */ @@ -1926,7 +1926,7 @@ MACHINE_CONFIG_END Bakuretsu Breaker ***************************************************************************/ -static MACHINE_CONFIG_START( bakubrkr ) +MACHINE_CONFIG_START(kaneko16_state::bakubrkr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */ @@ -2001,7 +2001,7 @@ MACHINE_CONFIG_END 6-7] busy loop */ -static MACHINE_CONFIG_START( blazeon ) +MACHINE_CONFIG_START(kaneko16_state::blazeon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,12000000) /* TMP68HC000-12 */ @@ -2055,7 +2055,7 @@ MACHINE_CONFIG_END Wing Force ***************************************************************************/ -static MACHINE_CONFIG_START( wingforc ) +MACHINE_CONFIG_START(kaneko16_state::wingforc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* TMP68HC000N-16 */ @@ -2121,7 +2121,7 @@ MACHINE_CONFIG_END VIDEO_UPDATE_AFTER_VBLANK fixes the mangled/wrong colored sprites */ -static MACHINE_CONFIG_START( gtmr ) +MACHINE_CONFIG_START(kaneko16_gtmr_state::gtmr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */ @@ -2179,7 +2179,7 @@ static MACHINE_CONFIG_START( gtmr ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gtmre, gtmr ) +MACHINE_CONFIG_DERIVED(kaneko16_gtmr_state::gtmre, gtmr) MCFG_DEVICE_MODIFY("toybox") MCFG_TOYBOX_TABLE_TYPE(ALT) MACHINE_CONFIG_END @@ -2188,7 +2188,7 @@ MACHINE_CONFIG_END Great 1000 Miles Rally 2 ***************************************************************************/ -static MACHINE_CONFIG_DERIVED( gtmr2, gtmre ) +MACHINE_CONFIG_DERIVED(kaneko16_gtmr_state::gtmr2, gtmre) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2199,7 +2199,7 @@ MACHINE_CONFIG_END Blood Warrior ***************************************************************************/ -static MACHINE_CONFIG_DERIVED( bloodwar, gtmr ) +MACHINE_CONFIG_DERIVED(kaneko16_gtmr_state::bloodwar, gtmr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2220,7 +2220,7 @@ MACHINE_CONFIG_END Bonk's Adventure ***************************************************************************/ -static MACHINE_CONFIG_DERIVED( bonkadv, gtmr ) +MACHINE_CONFIG_DERIVED(kaneko16_gtmr_state::bonkadv, gtmr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2244,7 +2244,7 @@ MACHINE_CONFIG_END Magical Crystal ***************************************************************************/ -static MACHINE_CONFIG_START( mgcrystl ) +MACHINE_CONFIG_START(kaneko16_state::mgcrystl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb, TMP68HC000N-12 @U31 and X2 is 12MHz */ @@ -2373,7 +2373,7 @@ static ADDRESS_MAP_START( shogwarr_oki2_map, 0, 8, kaneko16_shogwarr_state ) AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("bank11") ADDRESS_MAP_END -static MACHINE_CONFIG_START( shogwarr ) +MACHINE_CONFIG_START(kaneko16_shogwarr_state::shogwarr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) @@ -2449,7 +2449,7 @@ static ADDRESS_MAP_START( brapboys_oki2_map, 0, 8, kaneko16_shogwarr_state ) AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank11") ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( brapboys, shogwarr ) +MACHINE_CONFIG_DERIVED(kaneko16_shogwarr_state::brapboys, shogwarr) MCFG_SOUND_MODIFY("oki2") MCFG_DEVICE_ADDRESS_MAP(0, brapboys_oki2_map) diff --git a/src/mame/drivers/kangaroo.cpp b/src/mame/drivers/kangaroo.cpp index 01dc3ac888c..688d115db8f 100644 --- a/src/mame/drivers/kangaroo.cpp +++ b/src/mame/drivers/kangaroo.cpp @@ -426,7 +426,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( nomcu ) +MACHINE_CONFIG_START(kangaroo_state::nomcu) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4) @@ -457,7 +457,7 @@ static MACHINE_CONFIG_START( nomcu ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mcu, nomcu ) +MACHINE_CONFIG_DERIVED(kangaroo_state::mcu, nomcu) MCFG_MACHINE_START_OVERRIDE(kangaroo_state,kangaroo_mcu) diff --git a/src/mame/drivers/karnov.cpp b/src/mame/drivers/karnov.cpp index 20009115d13..456f523227a 100644 --- a/src/mame/drivers/karnov.cpp +++ b/src/mame/drivers/karnov.cpp @@ -802,7 +802,7 @@ void karnov_state::machine_reset() } -static MACHINE_CONFIG_START( karnov ) +MACHINE_CONFIG_START(karnov_state::karnov) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */ @@ -847,7 +847,7 @@ static MACHINE_CONFIG_START( karnov ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( karnovjbl, karnov ) +MACHINE_CONFIG_DERIVED(karnov_state::karnovjbl, karnov) /* X-TALs: Top board next to #9 is 20.000 MHz Top board next to the microcontroller is 6.000 MHz @@ -872,7 +872,7 @@ static ADDRESS_MAP_START( chelnovjbl_mcu_io_map, AS_IO, 8, karnov_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( chelnovjbl, karnov ) +MACHINE_CONFIG_DERIVED(karnov_state::chelnovjbl, karnov) MCFG_CPU_ADD("mcu", I8031, 2000000) // ??mhz MCFG_CPU_PROGRAM_MAP(chelnovjbl_mcu_map) MCFG_CPU_IO_MAP(chelnovjbl_mcu_io_map) @@ -881,7 +881,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wndrplnt ) +MACHINE_CONFIG_START(karnov_state::wndrplnt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */ diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp index cf1bddcac47..1d6be0b7a2b 100644 --- a/src/mame/drivers/kas89.cpp +++ b/src/mame/drivers/kas89.cpp @@ -258,6 +258,7 @@ public: virtual void machine_reset() override; TIMER_DEVICE_CALLBACK_MEMBER(kas89_nmi_cb); TIMER_DEVICE_CALLBACK_MEMBER(kas89_sound_nmi_cb); + void kas89(machine_config &config); }; @@ -753,7 +754,7 @@ INPUT_PORTS_END * Machine Driver * **************************************/ -static MACHINE_CONFIG_START( kas89 ) +MACHINE_CONFIG_START(kas89_state::kas89) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* Confirmed */ diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp index 50179c729c8..673e64df215 100644 --- a/src/mame/drivers/kaypro.cpp +++ b/src/mame/drivers/kaypro.cpp @@ -191,7 +191,7 @@ static SLOT_INTERFACE_START( kaypro_floppies ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( kayproii ) +MACHINE_CONFIG_START(kaypro_state::kayproii) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz / 8) MCFG_CPU_PROGRAM_MAP(kaypro_map) @@ -269,7 +269,7 @@ static MACHINE_CONFIG_START( kayproii ) MCFG_SOFTWARE_LIST_ADD("flop_list","kayproii") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kayproiv, kayproii ) +MACHINE_CONFIG_DERIVED(kaypro_state::kayproiv, kayproii) MCFG_DEVICE_REMOVE("z80pio_s") MCFG_DEVICE_ADD("z80pio_s", Z80PIO, 2500000) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) @@ -282,7 +282,7 @@ static MACHINE_CONFIG_DERIVED( kayproiv, kayproii ) MCFG_FLOPPY_DRIVE_ADD("fdc:1", kaypro_floppies, "525dd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( kaypro484 ) +MACHINE_CONFIG_START(kaypro_state::kaypro484) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(kaypro_map) @@ -367,16 +367,16 @@ static MACHINE_CONFIG_START( kaypro484 ) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kaypro10, kaypro484 ) +MACHINE_CONFIG_DERIVED(kaypro_state::kaypro10, kaypro484) MCFG_DEVICE_REMOVE("fdc:1") // only has 1 floppy drive // need to add hard drive & controller MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kaypronew2, kaypro484 ) +MACHINE_CONFIG_DERIVED(kaypro_state::kaypronew2, kaypro484) MCFG_DEVICE_REMOVE("fdc:1") // only has 1 floppy drive MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kaypro284, kaypro484 ) +MACHINE_CONFIG_DERIVED(kaypro_state::kaypro284, kaypro484) MCFG_DEVICE_REMOVE("fdc:0") MCFG_DEVICE_REMOVE("fdc:1") MCFG_FLOPPY_DRIVE_ADD("fdc:0", kaypro_floppies, "525ssdd", floppy_image_device::default_floppy_formats) @@ -385,7 +385,7 @@ static MACHINE_CONFIG_DERIVED( kaypro284, kaypro484 ) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( omni2, kayproiv ) +MACHINE_CONFIG_DERIVED(kaypro_state::omni2, kayproiv) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(kaypro_state, screen_update_omni2) MACHINE_CONFIG_END diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp index 72661bfbdb1..804aec0d06d 100644 --- a/src/mame/drivers/kc.cpp +++ b/src/mame/drivers/kc.cpp @@ -90,7 +90,7 @@ extern SLOT_INTERFACE_START(kc85_exp) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( kc85_3 ) +MACHINE_CONFIG_START(kc_state::kc85_3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, KC85_3_CLOCK) MCFG_CPU_PROGRAM_MAP(kc85_3_mem) @@ -174,7 +174,7 @@ static MACHINE_CONFIG_START( kc85_3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( kc85_4 ) +MACHINE_CONFIG_START(kc85_4_state::kc85_4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, KC85_4_CLOCK) MCFG_CPU_PROGRAM_MAP(kc85_4_mem) @@ -257,7 +257,7 @@ static MACHINE_CONFIG_START( kc85_4 ) MCFG_RAM_DEFAULT_SIZE("64K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kc85_5, kc85_4 ) +MACHINE_CONFIG_DERIVED(kc85_4_state::kc85_5, kc85_4) /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("256K") diff --git a/src/mame/drivers/kchamp.cpp b/src/mame/drivers/kchamp.cpp index 2e1592ca2a7..5a0d74c2fb0 100644 --- a/src/mame/drivers/kchamp.cpp +++ b/src/mame/drivers/kchamp.cpp @@ -394,7 +394,7 @@ void kchamp_state::machine_reset() m_sound_nmi_enable = 0; } -static MACHINE_CONFIG_START( kchampvs ) +MACHINE_CONFIG_START(kchamp_state::kchampvs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* verified on pcb */ @@ -454,7 +454,7 @@ MACHINE_CONFIG_END * 1 Player Version * ********************/ -static MACHINE_CONFIG_START( kchamp ) +MACHINE_CONFIG_START(kchamp_state::kchamp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 12MHz / 4 = 3.0 MHz */ diff --git a/src/mame/drivers/kdt6.cpp b/src/mame/drivers/kdt6.cpp index 4a1cef39929..52f23c6a4b1 100644 --- a/src/mame/drivers/kdt6.cpp +++ b/src/mame/drivers/kdt6.cpp @@ -105,6 +105,7 @@ public: DECLARE_WRITE_LINE_MEMBER(rs232b_rx_w); DECLARE_WRITE_LINE_MEMBER(siob_tx_w); + void psi98(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -608,7 +609,7 @@ static const z80_daisy_config daisy_chain_intf[] = { nullptr } }; -static MACHINE_CONFIG_START( psi98 ) +MACHINE_CONFIG_START(kdt6_state::psi98) MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(psi98_mem) MCFG_CPU_IO_MAP(psi98_io) diff --git a/src/mame/drivers/kenseim.cpp b/src/mame/drivers/kenseim.cpp index cf91c13865b..565ad8b09cb 100644 --- a/src/mame/drivers/kenseim.cpp +++ b/src/mame/drivers/kenseim.cpp @@ -250,6 +250,7 @@ public: int mole_state_a[6]; int mole_state_b[6]; + void kenseim(machine_config &config); }; @@ -470,7 +471,7 @@ static const z80_daisy_config daisy_chain_gamecpu[] = { nullptr } }; -static MACHINE_CONFIG_DERIVED( kenseim, cps1_12MHz ) +MACHINE_CONFIG_DERIVED(kenseim_state::kenseim, cps1_12MHz) /* basic machine hardware */ MCFG_CPU_ADD("gamecpu", TMPZ84C011, XTAL_16MHz/2) // tmpz84c011-8 diff --git a/src/mame/drivers/kickgoal.cpp b/src/mame/drivers/kickgoal.cpp index e41012c22fd..cd3f087cbd0 100644 --- a/src/mame/drivers/kickgoal.cpp +++ b/src/mame/drivers/kickgoal.cpp @@ -628,7 +628,7 @@ void kickgoal_state::machine_reset() m_m6295_key_delay = 0; } -static MACHINE_CONFIG_START( kickgoal ) +MACHINE_CONFIG_START(kickgoal_state::kickgoal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */ @@ -667,7 +667,7 @@ static MACHINE_CONFIG_START( kickgoal ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( actionhw ) +MACHINE_CONFIG_START(kickgoal_state::actionhw) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */ diff --git a/src/mame/drivers/kim1.cpp b/src/mame/drivers/kim1.cpp index 1c620f98f28..d71128cf118 100644 --- a/src/mame/drivers/kim1.cpp +++ b/src/mame/drivers/kim1.cpp @@ -245,7 +245,7 @@ void kim1_state::machine_reset() // MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( kim1 ) +MACHINE_CONFIG_START(kim1_state::kim1) // basic machine hardware MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz */ MCFG_CPU_PROGRAM_MAP(kim1_map) diff --git a/src/mame/drivers/kingdrby.cpp b/src/mame/drivers/kingdrby.cpp index 36f94ac3055..273ab9f89b0 100644 --- a/src/mame/drivers/kingdrby.cpp +++ b/src/mame/drivers/kingdrby.cpp @@ -130,6 +130,9 @@ public: required_device m_soundcpu; required_device m_gfxdecode; required_device m_palette; + void kingdrbb(machine_config &config); + void cowrace(machine_config &config); + void kingdrby(machine_config &config); }; @@ -926,7 +929,7 @@ PALETTE_INIT_MEMBER(kingdrby_state,kingdrbb) } } -static MACHINE_CONFIG_START( kingdrby ) +MACHINE_CONFIG_START(kingdrby_state::kingdrby) MCFG_CPU_ADD("master", Z80, CLK_2) MCFG_CPU_PROGRAM_MAP(master_map) MCFG_CPU_IO_MAP(master_io_map) @@ -982,7 +985,7 @@ static MACHINE_CONFIG_START( kingdrby ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kingdrbb, kingdrby ) +MACHINE_CONFIG_DERIVED(kingdrby_state::kingdrbb, kingdrby) MCFG_CPU_MODIFY("slave") MCFG_CPU_PROGRAM_MAP(slave_1986_map) @@ -1005,7 +1008,7 @@ static MACHINE_CONFIG_DERIVED( kingdrbb, kingdrby ) /* actually unused */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cowrace, kingdrbb ) +MACHINE_CONFIG_DERIVED(kingdrby_state::cowrace, kingdrbb) MCFG_CPU_MODIFY("soundcpu") MCFG_CPU_PROGRAM_MAP(cowrace_sound_map) diff --git a/src/mame/drivers/kingobox.cpp b/src/mame/drivers/kingobox.cpp index f6f117c04c9..1d4cddedb94 100644 --- a/src/mame/drivers/kingobox.cpp +++ b/src/mame/drivers/kingobox.cpp @@ -453,7 +453,7 @@ void kingofb_state::machine_reset() kingofb_f800_w(machine().dummy_space(), 0, 0); // LS174 reset } -static MACHINE_CONFIG_START( kingofb ) +MACHINE_CONFIG_START(kingofb_state::kingofb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */ @@ -512,7 +512,7 @@ MACHINE_CONFIG_END /* Ring King */ -static MACHINE_CONFIG_START( ringking ) +MACHINE_CONFIG_START(kingofb_state::ringking) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */ diff --git a/src/mame/drivers/kingpin.cpp b/src/mame/drivers/kingpin.cpp index 27cb6ce9abf..6f54abe7e70 100644 --- a/src/mame/drivers/kingpin.cpp +++ b/src/mame/drivers/kingpin.cpp @@ -56,6 +56,7 @@ public: required_device m_soundlatch; DECLARE_WRITE8_MEMBER(sound_nmi_w); + void kingpin(machine_config &config); }; @@ -127,7 +128,7 @@ static INPUT_PORTS_START( kingpin ) INPUT_PORTS_END -static MACHINE_CONFIG_START( kingpin ) +MACHINE_CONFIG_START(kingpin_state::kingpin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) diff --git a/src/mame/drivers/kinst.cpp b/src/mame/drivers/kinst.cpp index eb4fa1e5a02..5c2eb0be2fb 100644 --- a/src/mame/drivers/kinst.cpp +++ b/src/mame/drivers/kinst.cpp @@ -230,6 +230,7 @@ public: required_device m_ata; required_device m_dcs; + void kinst(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -691,7 +692,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( kinst ) +MACHINE_CONFIG_START(kinst_state::kinst) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R4600LE, MASTER_CLOCK*2) diff --git a/src/mame/drivers/kissproto.cpp b/src/mame/drivers/kissproto.cpp index 60a8c68dd86..5d41c8cf979 100644 --- a/src/mame/drivers/kissproto.cpp +++ b/src/mame/drivers/kissproto.cpp @@ -19,6 +19,7 @@ public: m_maincpu(*this, "maincpu") { } + void kissp(machine_config &config); protected: // devices @@ -46,7 +47,7 @@ DRIVER_INIT_MEMBER(kissp_state,kissp) { } -static MACHINE_CONFIG_START( kissp ) +MACHINE_CONFIG_START(kissp_state::kissp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8035, 6000000/15) MCFG_CPU_PROGRAM_MAP(kissp_map) diff --git a/src/mame/drivers/klax.cpp b/src/mame/drivers/klax.cpp index c4c5665641a..3b975278f6d 100644 --- a/src/mame/drivers/klax.cpp +++ b/src/mame/drivers/klax.cpp @@ -191,7 +191,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( klax ) +MACHINE_CONFIG_START(klax_state::klax) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) @@ -236,7 +236,7 @@ static ADDRESS_MAP_START( bootleg_sound_map, AS_PROGRAM, 8, klax_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( klax2bl, klax ) +MACHINE_CONFIG_DERIVED(klax_state::klax2bl, klax) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(klax2bl_map) diff --git a/src/mame/drivers/kncljoe.cpp b/src/mame/drivers/kncljoe.cpp index 2fb515f9c1a..728a96fa184 100644 --- a/src/mame/drivers/kncljoe.cpp +++ b/src/mame/drivers/kncljoe.cpp @@ -252,7 +252,7 @@ void kncljoe_state::machine_reset() m_flipscreen = 0; } -static MACHINE_CONFIG_START( kncljoe ) +MACHINE_CONFIG_START(kncljoe_state::kncljoe) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_6MHz) /* verified on pcb */ diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp index 462ebcdfa0a..f936126606c 100644 --- a/src/mame/drivers/koftball.cpp +++ b/src/mame/drivers/koftball.cpp @@ -73,6 +73,7 @@ public: virtual void video_start() override; uint32_t screen_update_koftball(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(bmc_interrupt); + void koftball(machine_config &config); }; @@ -229,7 +230,7 @@ static GFXDECODE_START( koftball ) GFXDECODE_END -static MACHINE_CONFIG_START( koftball ) +MACHINE_CONFIG_START(koftball_state::koftball) MCFG_CPU_ADD("maincpu", M68000, XTAL_21_4772MHz / 2) MCFG_CPU_PROGRAM_MAP(koftball_mem) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", koftball_state, bmc_interrupt, "screen", 0, 1) diff --git a/src/mame/drivers/koikoi.cpp b/src/mame/drivers/koikoi.cpp index 1f8ccecccab..53020bb0ff4 100644 --- a/src/mame/drivers/koikoi.cpp +++ b/src/mame/drivers/koikoi.cpp @@ -82,6 +82,7 @@ public: uint32_t screen_update_koikoi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void koikoi(machine_config &config); }; @@ -347,7 +348,7 @@ void koikoi_state::machine_reset() m_ioram[i] = 0; } -static MACHINE_CONFIG_START( koikoi ) +MACHINE_CONFIG_START(koikoi_state::koikoi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,KOIKOI_CRYSTAL/4) /* ?? */ diff --git a/src/mame/drivers/konamigq.cpp b/src/mame/drivers/konamigq.cpp index d5fa61e8106..58e1a952f81 100644 --- a/src/mame/drivers/konamigq.cpp +++ b/src/mame/drivers/konamigq.cpp @@ -123,6 +123,7 @@ public: void scsi_dma_read( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); void scsi_dma_write( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); + void konamigq(machine_config &config); }; /* EEPROM */ @@ -311,7 +312,7 @@ MACHINE_RESET_MEMBER(konamigq_state,konamigq) { } -static MACHINE_CONFIG_START( konamigq ) +MACHINE_CONFIG_START(konamigq_state::konamigq) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", CXD8530BQ, XTAL_67_7376MHz) MCFG_CPU_PROGRAM_MAP(konamigq_map) @@ -319,8 +320,8 @@ static MACHINE_CONFIG_START( konamigq ) MCFG_RAM_MODIFY("maincpu:ram") MCFG_RAM_DEFAULT_SIZE("4M") - MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&konamigq_state::scsi_dma_read, (konamigq_state *) owner ) ) - MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&konamigq_state::scsi_dma_write, (konamigq_state *) owner ) ) + MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&konamigq_state::scsi_dma_read, this ) ) + MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&konamigq_state::scsi_dma_write, this ) ) MCFG_CPU_ADD("soundcpu", M68000, XTAL_32MHz/4) /* 8MHz - measured */ MCFG_CPU_PROGRAM_MAP(konamigq_sound_map) diff --git a/src/mame/drivers/konamigv.cpp b/src/mame/drivers/konamigv.cpp index 63981751eb4..ba63654c662 100644 --- a/src/mame/drivers/konamigv.cpp +++ b/src/mame/drivers/konamigv.cpp @@ -159,6 +159,12 @@ public: void scsi_dma_read( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); void scsi_dma_write( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); + static void cdrom_config(device_t *device); + void tmosh(machine_config &config); + void simpbowl(machine_config &config); + void kdeadeye(machine_config &config); + void btchamp(machine_config &config); + void konamigv(machine_config &config); protected: virtual void driver_start() override; @@ -307,13 +313,14 @@ void konamigv_state::driver_start() save_item(NAME(m_flash_address)); } -static MACHINE_CONFIG_START( cdrom_config ) - MCFG_DEVICE_MODIFY( "cdda" ) - MCFG_SOUND_ROUTE( 0, "^^^^lspeaker", 1.0 ) - MCFG_SOUND_ROUTE( 1, "^^^^rspeaker", 1.0 ) -MACHINE_CONFIG_END +void konamigv_state::cdrom_config(device_t *device) +{ + device = device->subdevice("cdda"); + MCFG_SOUND_ROUTE(0, "^^^^lspeaker", 1.0) + MCFG_SOUND_ROUTE(1, "^^^^rspeaker", 1.0) +} -static MACHINE_CONFIG_START( konamigv ) +MACHINE_CONFIG_START(konamigv_state::konamigv) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", CXD8530BQ, XTAL_67_7376MHz ) MCFG_CPU_PROGRAM_MAP( konamigv_map ) @@ -321,8 +328,8 @@ static MACHINE_CONFIG_START( konamigv ) MCFG_RAM_MODIFY("maincpu:ram") MCFG_RAM_DEFAULT_SIZE("2M") - MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&konamigv_state::scsi_dma_read, (konamigv_state *) owner ) ) - MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&konamigv_state::scsi_dma_write, (konamigv_state *) owner ) ) + MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&konamigv_state::scsi_dma_read, this ) ) + MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&konamigv_state::scsi_dma_write, this ) ) MCFG_DEVICE_ADD("mb89371", MB89371, 0) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -472,7 +479,7 @@ DRIVER_INIT_MEMBER(konamigv_state,simpbowl) m_flash8[3] = machine().device("flash3"); } -static MACHINE_CONFIG_DERIVED( simpbowl, konamigv ) +MACHINE_CONFIG_DERIVED(konamigv_state::simpbowl, konamigv) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( simpbowl_map ) @@ -511,7 +518,7 @@ WRITE16_MEMBER(konamigv_state::btc_trackball_w) } } -static MACHINE_CONFIG_DERIVED( btchamp, konamigv ) +MACHINE_CONFIG_DERIVED(konamigv_state::btchamp, konamigv) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( btchamp_map ) @@ -568,7 +575,7 @@ WRITE16_MEMBER(konamigv_state::tokimeki_serial_w) } -static MACHINE_CONFIG_DERIVED( tmosh, konamigv ) +MACHINE_CONFIG_DERIVED(konamigv_state::tmosh, konamigv) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( tmosh_map ) MACHINE_CONFIG_END @@ -583,7 +590,7 @@ CD: A01 */ -static MACHINE_CONFIG_DERIVED( kdeadeye, konamigv ) +MACHINE_CONFIG_DERIVED(konamigv_state::kdeadeye, konamigv) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( kdeadeye_map ) diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp index 424eba01254..2edd7b60279 100644 --- a/src/mame/drivers/konamigx.cpp +++ b/src/mame/drivers/konamigx.cpp @@ -1603,7 +1603,7 @@ WRITE_LINE_MEMBER(konamigx_state::hblank_irq_ack_w) m_gx_syncen |= 0x40; } -static MACHINE_CONFIG_START( konamigx ) +MACHINE_CONFIG_START(konamigx_state::konamigx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(gx_type2_map) @@ -1692,17 +1692,17 @@ static MACHINE_CONFIG_START( konamigx ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( konamigx_bios, konamigx ) +MACHINE_CONFIG_DERIVED(konamigx_state::konamigx_bios, konamigx) MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CONFIG("gfx1", K056832_BPP_4, 0, 0, "k055555") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gokuparo, konamigx ) +MACHINE_CONFIG_DERIVED(konamigx_state::gokuparo, konamigx) MCFG_DEVICE_MODIFY("k055673") MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX, -46, -23) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sexyparo, konamigx ) +MACHINE_CONFIG_DERIVED(konamigx_state::sexyparo, konamigx) MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CB(konamigx_state, alpha_tile_callback) @@ -1710,12 +1710,12 @@ static MACHINE_CONFIG_DERIVED( sexyparo, konamigx ) MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX, -42, -23) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tbyahhoo, konamigx ) +MACHINE_CONFIG_DERIVED(konamigx_state::tbyahhoo, konamigx) MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CONFIG("gfx1", K056832_BPP_5, 0, 0, "k055555") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dragoonj, konamigx ) +MACHINE_CONFIG_DERIVED(konamigx_state::dragoonj, konamigx) MCFG_SCREEN_MODIFY("screen") MCFG_VIDEO_START_OVERRIDE(konamigx_state, dragoonj) @@ -1730,7 +1730,7 @@ static MACHINE_CONFIG_DERIVED( dragoonj, konamigx ) MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_RNG, -53, -23) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( le2, konamigx ) +MACHINE_CONFIG_DERIVED(konamigx_state::le2, konamigx) MCFG_VIDEO_START_OVERRIDE(konamigx_state, le2) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", konamigx_state, konamigx_type2_scanline, "screen", 0, 1) @@ -1742,7 +1742,7 @@ static MACHINE_CONFIG_DERIVED( le2, konamigx ) MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_LE2, -46, -23) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( konamigx_6bpp, konamigx ) +MACHINE_CONFIG_DERIVED(konamigx_state::konamigx_6bpp, konamigx) MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_6bpp) MCFG_DEVICE_MODIFY("k056832") @@ -1752,7 +1752,7 @@ static MACHINE_CONFIG_DERIVED( konamigx_6bpp, konamigx ) MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX, -46, -23) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( salmndr2, konamigx ) +MACHINE_CONFIG_DERIVED(konamigx_state::salmndr2, konamigx) MCFG_DEVICE_MODIFY("k056832") MCFG_K056832_CONFIG("gfx1", K056832_BPP_6, 1, 0, "none") @@ -1761,7 +1761,7 @@ static MACHINE_CONFIG_DERIVED( salmndr2, konamigx ) MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX6, -48, -23) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( opengolf, konamigx ) +MACHINE_CONFIG_DERIVED(konamigx_state::opengolf, konamigx) 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) @@ -1779,7 +1779,7 @@ static MACHINE_CONFIG_DERIVED( opengolf, konamigx ) MCFG_ADC083X_INPUT_CB(konamigx_state, adc0834_callback) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( racinfrc, konamigx ) +MACHINE_CONFIG_DERIVED(konamigx_state::racinfrc, konamigx) MCFG_SCREEN_MODIFY("screen") //MCFG_SCREEN_RAW_PARAMS(6000000, 384+24+64+40, 0, 383, 224+16+8+16, 0, 223) //MCFG_SCREEN_VISIBLE_AREA(32, 32+384-1, 16, 16+224-1) @@ -1803,7 +1803,7 @@ static MACHINE_CONFIG_DERIVED( racinfrc, konamigx ) MCFG_ADC083X_INPUT_CB(konamigx_state, adc0834_callback) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gxtype3, konamigx ) +MACHINE_CONFIG_DERIVED(konamigx_state::gxtype3, konamigx) MCFG_DEVICE_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(gx_type3_map) @@ -1843,7 +1843,7 @@ static MACHINE_CONFIG_DERIVED( gxtype3, konamigx ) MCFG_SCREEN_UPDATE_DRIVER(konamigx_state, screen_update_konamigx_right) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gxtype4, konamigx ) +MACHINE_CONFIG_DERIVED(konamigx_state::gxtype4, konamigx) MCFG_DEVICE_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(gx_type4_map) @@ -1884,7 +1884,7 @@ static MACHINE_CONFIG_DERIVED( gxtype4, konamigx ) MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX6, -79, -24) // -23 looks better in intro MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gxtype4_vsn, gxtype4 ) +MACHINE_CONFIG_DERIVED(konamigx_state::gxtype4_vsn, gxtype4) MCFG_DEFAULT_LAYOUT(layout_dualhsxs) //MCFG_SCREEN_MODIFY("screen") @@ -1908,14 +1908,14 @@ static MACHINE_CONFIG_DERIVED( gxtype4_vsn, gxtype4 ) MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX6, -132, -23) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gxtype4sd2, gxtype4 ) +MACHINE_CONFIG_DERIVED(konamigx_state::gxtype4sd2, gxtype4) MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type4_sd2) MCFG_DEVICE_MODIFY("k055673") MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX6, -81, -23) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( winspike, konamigx ) +MACHINE_CONFIG_DERIVED(konamigx_state::winspike, konamigx) //MCFG_SCREEN_MODIFY("screen") //MCFG_SCREEN_VISIBLE_AREA(38, 38+384-1, 16, 16+224-1) diff --git a/src/mame/drivers/konamim2.cpp b/src/mame/drivers/konamim2.cpp index 7a8e0cf4ee3..179bae8bf07 100644 --- a/src/mame/drivers/konamim2.cpp +++ b/src/mame/drivers/konamim2.cpp @@ -279,6 +279,8 @@ public: void cde_dma_transfer(address_space &space, int channel, int next); required_device m_maincpu; required_device m_subcpu; + void m2(machine_config &config); + void _3do_m2(machine_config &config); }; @@ -1284,7 +1286,7 @@ void konamim2_state::machine_reset() cde_init(); } -static MACHINE_CONFIG_START( m2 ) +MACHINE_CONFIG_START(konamim2_state::m2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC602, 66000000) /* actually PPC602, 66MHz */ @@ -1317,8 +1319,7 @@ static MACHINE_CONFIG_START( m2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED ( 3do_m2, m2 ) - +MACHINE_CONFIG_DERIVED(konamim2_state::_3do_m2, m2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(3do_m2_main_m) @@ -1326,7 +1327,6 @@ static MACHINE_CONFIG_DERIVED ( 3do_m2, m2 ) MCFG_CPU_PROGRAM_MAP(3do_m2_main_s) MCFG_SOFTWARE_LIST_ADD("cd_list","3do_m2") - MACHINE_CONFIG_END @@ -1473,4 +1473,4 @@ GAME( 1998, evilngt, 0, m2, m2, konamim2_state, m2, ROT0, "Konami", "Evi GAME( 1998, evilngte, evilngt, m2, m2, konamim2_state, m2, ROT0, "Konami", "Evil Night (ver EAA)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) GAME( 1998, hellngt, evilngt, m2, m2, konamim2_state, m2, ROT0, "Konami", "Hell Night (ver EAA)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) -CONS( 199?, 3do_m2, 0, 0, 3do_m2, m2, konamim2_state, 0, "3DO", "3DO M2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) +CONS( 199?, 3do_m2, 0, 0, _3do_m2, m2, konamim2_state, 0, "3DO", "3DO M2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/drivers/konendev.cpp b/src/mame/drivers/konendev.cpp index 9e583f34f53..19ea604fddb 100644 --- a/src/mame/drivers/konendev.cpp +++ b/src/mame/drivers/konendev.cpp @@ -53,6 +53,7 @@ public: m_eeprom(*this, "eeprom") { } + void konendev(machine_config &config); protected: // devices required_device m_maincpu; @@ -299,7 +300,7 @@ INTERRUPT_GEN_MEMBER(konendev_state::vbl_interrupt) device.execute().set_input_line(INPUT_LINE_IRQ3, ASSERT_LINE); } -static MACHINE_CONFIG_START( konendev ) +MACHINE_CONFIG_START(konendev_state::konendev) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC403GCX, 32000000) // Clock unknown MCFG_CPU_PROGRAM_MAP(konendev_map) diff --git a/src/mame/drivers/konin.cpp b/src/mame/drivers/konin.cpp index 3d4f5aec2af..cc5a3efd4bf 100644 --- a/src/mame/drivers/konin.cpp +++ b/src/mame/drivers/konin.cpp @@ -63,6 +63,7 @@ public: DECLARE_WRITE8_MEMBER(picu_b_w); DECLARE_WRITE_LINE_MEMBER(picu_r3_w); + void konin(machine_config &config); private: virtual void machine_start() override; required_device m_maincpu; @@ -109,7 +110,7 @@ void konin_state::machine_start() { } -static MACHINE_CONFIG_START( konin ) +MACHINE_CONFIG_START(konin_state::konin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(konin_mem) diff --git a/src/mame/drivers/konmedal.cpp b/src/mame/drivers/konmedal.cpp index 72c558a1316..c3f7bc9d615 100644 --- a/src/mame/drivers/konmedal.cpp +++ b/src/mame/drivers/konmedal.cpp @@ -79,6 +79,9 @@ public: DECLARE_READ8_MEMBER(shuri_irq_r); DECLARE_WRITE8_MEMBER(shuri_irq_w); + void shuriboy(machine_config &config); + void ddboy(machine_config &config); + void tsukande(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -368,7 +371,7 @@ void konmedal_state::machine_reset() m_control = m_control2 = m_shuri_irq = 0; } -static MACHINE_CONFIG_START( tsukande ) +MACHINE_CONFIG_START(konmedal_state::tsukande) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_14_31818MHz/2) // z84c0008pec 8mhz part, 14.31818Mhz xtal verified on PCB, divisor unknown MCFG_CPU_PROGRAM_MAP(medal_main) @@ -401,7 +404,7 @@ static MACHINE_CONFIG_START( tsukande ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ddboy ) +MACHINE_CONFIG_START(konmedal_state::ddboy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_14_31818MHz/2) // z84c0008pec 8mhz part, 14.31818Mhz xtal verified on PCB, divisor unknown MCFG_CPU_PROGRAM_MAP(ddboy_main) @@ -530,7 +533,7 @@ WRITE8_MEMBER(konmedal_state::shuri_vrom_bank_w) m_vrom_base |= (data << 10); } -static MACHINE_CONFIG_START( shuriboy ) +MACHINE_CONFIG_START(konmedal_state::shuriboy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 3) // divisor unknown MCFG_CPU_PROGRAM_MAP(shuriboy_main) diff --git a/src/mame/drivers/kontest.cpp b/src/mame/drivers/kontest.cpp index 22f3610345d..06dcd274011 100644 --- a/src/mame/drivers/kontest.cpp +++ b/src/mame/drivers/kontest.cpp @@ -52,6 +52,7 @@ public: // member functions DECLARE_WRITE8_MEMBER(control_w); + void kontest(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -247,7 +248,7 @@ void kontest_state::machine_reset() m_control = 0; } -static MACHINE_CONFIG_START( kontest ) +MACHINE_CONFIG_START(kontest_state::kontest) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,MAIN_CLOCK/8) diff --git a/src/mame/drivers/kopunch.cpp b/src/mame/drivers/kopunch.cpp index 2ca5856dcb4..b6116917591 100644 --- a/src/mame/drivers/kopunch.cpp +++ b/src/mame/drivers/kopunch.cpp @@ -229,7 +229,7 @@ void kopunch_state::machine_start() save_item(NAME(m_scrollx)); } -static MACHINE_CONFIG_START( kopunch ) +MACHINE_CONFIG_START(kopunch_state::kopunch) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, 4000000) // 4 MHz? diff --git a/src/mame/drivers/kramermc.cpp b/src/mame/drivers/kramermc.cpp index 9197df36af2..1d91d721110 100644 --- a/src/mame/drivers/kramermc.cpp +++ b/src/mame/drivers/kramermc.cpp @@ -109,7 +109,7 @@ static INPUT_PORTS_START( kramermc ) INPUT_PORTS_END /* Machine driver */ -static MACHINE_CONFIG_START( kramermc ) +MACHINE_CONFIG_START(kramermc_state::kramermc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 1500000) MCFG_CPU_PROGRAM_MAP(kramermc_mem) diff --git a/src/mame/drivers/kron.cpp b/src/mame/drivers/kron.cpp index 6af2118dba0..4ac1aeaff5a 100644 --- a/src/mame/drivers/kron.cpp +++ b/src/mame/drivers/kron.cpp @@ -146,6 +146,7 @@ kron180_state(const machine_config &mconfig, device_type type, const char *tag) DECLARE_WRITE8_MEMBER( txen_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } DECLARE_WRITE8_MEMBER( kbd_reset_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } DECLARE_WRITE8_MEMBER( dreq_w ){ LOGIO(("%s %02x = %02x\n", FUNCNAME, offset, data)); } + void kron180(machine_config &config); protected: required_device m_maincpu; required_shared_ptr m_videoram; @@ -290,7 +291,7 @@ WRITE_LINE_MEMBER(kron180_state::keyb_interrupt) /* * Machine configuration */ -static MACHINE_CONFIG_START (kron180) +MACHINE_CONFIG_START(kron180_state::kron180) /* basic machine hardware */ MCFG_CPU_ADD ("maincpu", Z180, XTAL_12_288MHz) MCFG_CPU_PROGRAM_MAP (kron180_mem) diff --git a/src/mame/drivers/krz2000.cpp b/src/mame/drivers/krz2000.cpp index 7cb6fcb538a..2e6130c3b50 100644 --- a/src/mame/drivers/krz2000.cpp +++ b/src/mame/drivers/krz2000.cpp @@ -38,6 +38,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void k2000(machine_config &config); }; void k2000_state::machine_start() @@ -54,7 +55,7 @@ static ADDRESS_MAP_START( k2000_map, AS_PROGRAM, 16, k2000_state ) AM_RANGE(0xfffc00, 0xffffff) AM_DEVREADWRITE("tmp68301", tmp68301_device, regs_r, regs_w) // TMP68301 Registers ADDRESS_MAP_END -static MACHINE_CONFIG_START( k2000 ) +MACHINE_CONFIG_START(k2000_state::k2000) MCFG_CPU_ADD("maincpu", M68301, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(k2000_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback) diff --git a/src/mame/drivers/ksayakyu.cpp b/src/mame/drivers/ksayakyu.cpp index af92a7c8cd2..5d1c83576d6 100644 --- a/src/mame/drivers/ksayakyu.cpp +++ b/src/mame/drivers/ksayakyu.cpp @@ -256,7 +256,7 @@ void ksayakyu_state::machine_reset() m_flipscreen = 0; } -static MACHINE_CONFIG_START( ksayakyu ) +MACHINE_CONFIG_START(ksayakyu_state::ksayakyu) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,MAIN_CLOCK/8) //divider is guessed diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp index be8544e1f04..6561f5a124a 100644 --- a/src/mame/drivers/ksys573.cpp +++ b/src/mame/drivers/ksys573.cpp @@ -468,6 +468,61 @@ public: required_ioport m_analog3; optional_ioport m_pads; + void gtfrk10mb(machine_config &config); + void ddr(machine_config &config); + void pnchmn(machine_config &config); + void gtrfrk7m(machine_config &config); + void ddr3m(machine_config &config); + void hyperbbc(machine_config &config); + void pnchmn2(machine_config &config); + void ddrsolo(machine_config &config); + void ddr3mp(machine_config &config); + void dsftkd(machine_config &config); + void dsfdcta(machine_config &config); + void mamboagga(machine_config &config); + void gunmania(machine_config &config); + void hypbbc2p(machine_config &config); + void gtrfrk2m(machine_config &config); + void gtrfrk5m(machine_config &config); + void ddrs2k(machine_config &config); + void salarymc(machine_config &config); + void ddr2ml(machine_config &config); + void konami573(machine_config &config); + void drmn2m(machine_config &config); + void gtrfrk3m(machine_config &config); + void mamboagg(machine_config &config); + void gtrfrks(machine_config &config); + void gchgchmp(machine_config &config); + void ddr5m(machine_config &config); + void drmn4m(machine_config &config); + void fbaitbc(machine_config &config); + void ddr4ms(machine_config &config); + void dsfdr(machine_config &config); + void konami573x(machine_config &config); + void ddrusa(machine_config &config); + void dsem(machine_config &config); + void dmx(machine_config &config); + void drmn(machine_config &config); + void k573d(machine_config &config); + void k573a(machine_config &config); + void pccard1_16mb(machine_config &config); + void pccard1_32mb(machine_config &config); + void pccard2_32mb(machine_config &config); + void pccard2_64mb(machine_config &config); + void cassx(machine_config &config); + void cassxi(machine_config &config); + void cassy(machine_config &config); + void cassyi(machine_config &config); + void cassyyi(machine_config &config); + void casszi(machine_config &config); + void cassxzi(machine_config &config); + + static void punchmania_cassette_install(device_t *device); + static void salarymc_cassette_install(device_t *device); + static void hyperbbc_cassette_install(device_t *device); + static void hyprbbc2_cassette_install(device_t *device); + static void hypbbc2p_cassette_install(device_t *device); + static void cr589_config(device_t *device); protected: virtual void driver_start() override; @@ -1494,12 +1549,14 @@ WRITE_LINE_MEMBER( ksys573_state::salarymc_lamp_clk ) m_salarymc_lamp_clk = state; } -static MACHINE_CONFIG_START( salarymc_cassette_install ) - MCFG_DEVICE_MODIFY( DEVICE_SELF ) +void ksys573_state::salarymc_cassette_install(device_t *device) +{ + devcb_base *devcb; + (void)devcb; MCFG_KONAMI573_CASSETTE_Y_D5_HANDLER( DEVWRITELINE( ":", ksys573_state, salarymc_lamp_clk ) ) MCFG_KONAMI573_CASSETTE_Y_D6_HANDLER( DEVWRITELINE( ":", ksys573_state, salarymc_lamp_rst ) ) MCFG_KONAMI573_CASSETTE_Y_D7_HANDLER( DEVWRITELINE( ":", ksys573_state, salarymc_lamp_d ) ) -MACHINE_CONFIG_END +} DRIVER_INIT_MEMBER( ksys573_state, salarymc ) { @@ -1575,8 +1632,10 @@ WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_strobe3 ) m_hyperbbc_lamp_strobe3 = state; } -static MACHINE_CONFIG_START( hyperbbc_cassette_install ) - MCFG_DEVICE_MODIFY( DEVICE_SELF ) +void ksys573_state::hyperbbc_cassette_install(device_t *device) +{ + devcb_base *devcb; + (void)devcb; MCFG_KONAMI573_CASSETTE_Y_D0_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe3 ) ) // line shared with x76f100 sda MCFG_KONAMI573_CASSETTE_Y_D1_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe2 ) ) // line shared with x76f100 scl MCFG_KONAMI573_CASSETTE_Y_D3_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe1 ) ) // line shared with x76f100 rst @@ -1584,16 +1643,18 @@ static MACHINE_CONFIG_START( hyperbbc_cassette_install ) MCFG_KONAMI573_CASSETTE_Y_D5_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_blue ) ) MCFG_KONAMI573_CASSETTE_Y_D6_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_red ) ) MCFG_KONAMI573_CASSETTE_Y_D7_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_start ) ) -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_START( hypbbc2p_cassette_install ) - MCFG_DEVICE_MODIFY( DEVICE_SELF ) +void ksys573_state::hypbbc2p_cassette_install(device_t *device) +{ + devcb_base *devcb; + (void)devcb; MCFG_KONAMI573_CASSETTE_Y_D0_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe2 ) ) // line shared with x76f100 sda MCFG_KONAMI573_CASSETTE_Y_D3_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe1 ) ) // line shared with x76f100 rst MCFG_KONAMI573_CASSETTE_Y_D4_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_green ) ) MCFG_KONAMI573_CASSETTE_Y_D5_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_blue ) ) MCFG_KONAMI573_CASSETTE_Y_D6_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_red ) ) -MACHINE_CONFIG_END +} DRIVER_INIT_MEMBER( ksys573_state, hyperbbc ) { @@ -1699,11 +1760,12 @@ ADC083X_INPUT_CB(konami573_cassette_xi_device::punchmania_inputs_callback) } -static MACHINE_CONFIG_START( punchmania_cassette_install ) - MCFG_DEVICE_MODIFY( "adc0838" ) - MCFG_ADC083X_INPUT_CB( konami573_cassette_xi_device, punchmania_inputs_callback ) -MACHINE_CONFIG_END - +void ksys573_state::punchmania_cassette_install(device_t *device) +{ + auto game = downcast(device); + auto adc0838 = device->subdevice("adc0838"); + adc083x_device::set_input_callback(*adc0838, adc083x_device::input_delegate(FUNC(konami573_cassette_xi_device::punchmania_inputs_callback), game)); +} int pad_light[ 6 ]; @@ -1990,13 +2052,14 @@ ADC083X_INPUT_CB(ksys573_state::analogue_inputs_callback) return 0; } -static MACHINE_CONFIG_START( cr589_config ) - MCFG_DEVICE_MODIFY( "cdda" ) +void ksys573_state::cr589_config(device_t *device) +{ + device = device->subdevice("cdda"); MCFG_SOUND_ROUTE( 0, "^^^^lspeaker", 1.0 ) MCFG_SOUND_ROUTE( 1, "^^^^rspeaker", 1.0 ) -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_START( konami573 ) +MACHINE_CONFIG_START(ksys573_state::konami573) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz ) MCFG_CPU_PROGRAM_MAP( konami573_map ) @@ -2004,8 +2067,8 @@ static MACHINE_CONFIG_START( konami573 ) MCFG_RAM_MODIFY( "maincpu:ram" ) MCFG_RAM_DEFAULT_SIZE( "4M" ) - MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&ksys573_state::cdrom_dma_read, (ksys573_state *) owner ) ) - MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&ksys573_state::cdrom_dma_write, (ksys573_state *) owner ) ) + MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&ksys573_state::cdrom_dma_read, this ) ) + MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&ksys573_state::cdrom_dma_write, this ) ) MCFG_MACHINE_RESET_OVERRIDE( ksys573_state, konami573 ) @@ -2043,7 +2106,7 @@ static MACHINE_CONFIG_START( konami573 ) /* video hardware */ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL_53_693175MHz ) - MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate(&ksys573_state::sys573_vblank, (ksys573_state *) owner )) + MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate(&ksys573_state::sys573_vblank, this )) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO( "lspeaker", "rspeaker" ) @@ -2059,37 +2122,37 @@ static MACHINE_CONFIG_START( konami573 ) MACHINE_CONFIG_END // Variants with additional digital sound board -static MACHINE_CONFIG_DERIVED( k573d, konami573 ) +MACHINE_CONFIG_DERIVED(ksys573_state::k573d, konami573) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( konami573d_map ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_ADD( "k573dio", XTAL_19_6608MHz ) MACHINE_CONFIG_END // Variants with additional analogue i/o board -static MACHINE_CONFIG_DERIVED( k573a, konami573 ) +MACHINE_CONFIG_DERIVED(ksys573_state::k573a, konami573) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( konami573a_map ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pccard1_16mb ) +MACHINE_CONFIG_START(ksys573_state::pccard1_16mb) MCFG_DEVICE_MODIFY( "pccard1" ) MCFG_SLOT_OPTION_ADD( "16mb", LINEAR_FLASH_PCCARD_16MB ) MCFG_SLOT_DEFAULT_OPTION( "16mb" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pccard1_32mb ) +MACHINE_CONFIG_START(ksys573_state::pccard1_32mb) MCFG_DEVICE_MODIFY( "pccard1" ) MCFG_SLOT_OPTION_ADD( "32mb", LINEAR_FLASH_PCCARD_32MB ) MCFG_SLOT_DEFAULT_OPTION( "32mb" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pccard2_32mb ) +MACHINE_CONFIG_START(ksys573_state::pccard2_32mb) MCFG_DEVICE_MODIFY( "pccard2" ) MCFG_SLOT_OPTION_ADD( "32mb", LINEAR_FLASH_PCCARD_32MB ) MCFG_SLOT_DEFAULT_OPTION( "32mb" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pccard2_64mb ) +MACHINE_CONFIG_START(ksys573_state::pccard2_64mb) MCFG_DEVICE_MODIFY( "pccard2" ) MCFG_SLOT_OPTION_ADD( "64mb", LINEAR_FLASH_PCCARD_64MB ) MCFG_SLOT_DEFAULT_OPTION( "64mb" ) @@ -2106,44 +2169,44 @@ MACHINE_CONFIG_END // // Up to two carts can be used -static MACHINE_CONFIG_START( cassx ) +MACHINE_CONFIG_START(ksys573_state::cassx) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_X ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cassxi ) +MACHINE_CONFIG_START(ksys573_state::cassxi) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_XI ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cassy ) +MACHINE_CONFIG_START(ksys573_state::cassy) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_Y ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cassyi ) +MACHINE_CONFIG_START(ksys573_state::cassyi) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_YI ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cassyyi ) +MACHINE_CONFIG_START(ksys573_state::cassyyi) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_YI ) MCFG_SLOT_OPTION_ADD( "install", KONAMI573_CASSETTE_YI ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( casszi ) +MACHINE_CONFIG_START(ksys573_state::casszi) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_ZI ) MCFG_SLOT_DEFAULT_OPTION( "game" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cassxzi ) +MACHINE_CONFIG_START(ksys573_state::cassxzi) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_SLOT_OPTION_ADD( "game", KONAMI573_CASSETTE_ZI ) MCFG_SLOT_OPTION_ADD( "install", KONAMI573_CASSETTE_XI ) @@ -2152,18 +2215,18 @@ MACHINE_CONFIG_END // Dance Dance Revolution -static MACHINE_CONFIG_DERIVED( ddr, k573a ) +MACHINE_CONFIG_DERIVED(ksys573_state::ddr, k573a) MCFG_FRAGMENT_ADD( cassx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ddr2ml, k573a ) +MACHINE_CONFIG_DERIVED(ksys573_state::ddr2ml, k573a) MCFG_DEVICE_ADD( "k573mcr", KONAMI_573_MEMORY_CARD_READER, 0 ) MCFG_FRAGMENT_ADD( pccard1_16mb ) MCFG_FRAGMENT_ADD( cassx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ddr3m, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::ddr3m, k573d) MCFG_DEVICE_MODIFY( "k573dio" ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddr_output_callback ) ) @@ -2171,7 +2234,7 @@ static MACHINE_CONFIG_DERIVED( ddr3m, k573d ) MCFG_FRAGMENT_ADD( cassyyi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ddr3mp, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::ddr3mp, k573d) MCFG_DEVICE_MODIFY( "k573dio" ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddr_output_callback ) ) @@ -2179,14 +2242,14 @@ static MACHINE_CONFIG_DERIVED( ddr3mp, k573d ) MCFG_FRAGMENT_ADD( cassxzi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ddrusa, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::ddrusa, k573d) MCFG_DEVICE_MODIFY( "k573dio" ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddr_output_callback ) ) MCFG_FRAGMENT_ADD( casszi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ddr5m, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::ddr5m, k573d) MCFG_DEVICE_MODIFY( "k573dio" ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddr_output_callback ) ) @@ -2196,23 +2259,23 @@ MACHINE_CONFIG_END // Dancing Stage -static MACHINE_CONFIG_DERIVED( dsfdcta, k573a ) +MACHINE_CONFIG_DERIVED(ksys573_state::dsfdcta, k573a) MCFG_FRAGMENT_ADD( pccard2_32mb ) MCFG_FRAGMENT_ADD( cassyyi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dsftkd, k573a ) +MACHINE_CONFIG_DERIVED(ksys573_state::dsftkd, k573a) MCFG_FRAGMENT_ADD( cassyi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dsfdr, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::dsfdr, k573d) MCFG_DEVICE_MODIFY( "k573dio" ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddr_output_callback ) ) MCFG_FRAGMENT_ADD( cassxzi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dsem, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::dsem, k573d) MCFG_DEVICE_MODIFY( "k573dio" ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddr_output_callback ) ) @@ -2221,21 +2284,21 @@ MACHINE_CONFIG_END // Dance Dance Revolution Solo -static MACHINE_CONFIG_DERIVED( ddrsolo, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::ddrsolo, k573d) MCFG_DEVICE_MODIFY( "k573dio" ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddrsolo_output_callback ) ) MCFG_FRAGMENT_ADD( cassyi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ddrs2k, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::ddrs2k, k573d) MCFG_DEVICE_MODIFY( "k573dio" ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddrsolo_output_callback ) ) MCFG_FRAGMENT_ADD( cassyyi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ddr4ms, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::ddr4ms, k573d) MCFG_DEVICE_MODIFY( "k573dio" ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddrsolo_output_callback ) ) @@ -2245,18 +2308,18 @@ MACHINE_CONFIG_END // DrumMania -static MACHINE_CONFIG_DERIVED( drmn, k573a ) +MACHINE_CONFIG_DERIVED(ksys573_state::drmn, k573a) MCFG_FRAGMENT_ADD( cassx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( drmn2m, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::drmn2m, k573d) MCFG_DEVICE_MODIFY( "k573dio" ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, drmn_output_callback ) ) MCFG_FRAGMENT_ADD( cassxzi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( drmn4m, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::drmn4m, k573d) MCFG_DEVICE_MODIFY( "k573dio" ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, drmn_output_callback ) ) @@ -2267,41 +2330,41 @@ MACHINE_CONFIG_END // Guitar Freaks -static MACHINE_CONFIG_DERIVED( gtrfrks, k573a ) +MACHINE_CONFIG_DERIVED(ksys573_state::gtrfrks, k573a) MCFG_FRAGMENT_ADD( cassx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gtrfrk2m, k573a ) +MACHINE_CONFIG_DERIVED(ksys573_state::gtrfrk2m, k573a) MCFG_FRAGMENT_ADD( cassyi ) MCFG_FRAGMENT_ADD( pccard1_32mb ) // HACK: The installation tries to check and erase 32mb but only flashes 16mb. MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gtrfrk3m, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::gtrfrk3m, k573d) MCFG_FRAGMENT_ADD( cassxzi ) MCFG_FRAGMENT_ADD( pccard1_16mb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gtrfrk5m, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::gtrfrk5m, k573d) MCFG_FRAGMENT_ADD( casszi ) MCFG_FRAGMENT_ADD( pccard1_32mb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gtrfrk7m, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::gtrfrk7m, k573d) MCFG_FRAGMENT_ADD( casszi ) MCFG_FRAGMENT_ADD( pccard1_32mb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gtfrk10mb, gtrfrk7m ) +MACHINE_CONFIG_DERIVED(ksys573_state::gtfrk10mb, gtrfrk7m) MCFG_DEVICE_ADD( "k573npu", KONAMI_573_NETWORK_PCB_UNIT, 0 ) MACHINE_CONFIG_END // Miscellaneous -static MACHINE_CONFIG_DERIVED( konami573x, konami573 ) +MACHINE_CONFIG_DERIVED(ksys573_state::konami573x, konami573) MCFG_FRAGMENT_ADD( cassx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fbaitbc, konami573 ) +MACHINE_CONFIG_DERIVED(ksys573_state::fbaitbc, konami573) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( fbaitbc_map ) @@ -2311,33 +2374,33 @@ static MACHINE_CONFIG_DERIVED( fbaitbc, konami573 ) MCFG_FRAGMENT_ADD( cassx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hyperbbc, konami573 ) +MACHINE_CONFIG_DERIVED(ksys573_state::hyperbbc, konami573) MCFG_FRAGMENT_ADD( cassy ) // The game doesn't check the security chip MCFG_DEVICE_MODIFY( "cassette" ) MCFG_DEVICE_CARD_MACHINE_CONFIG( "game", hyperbbc_cassette_install ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hypbbc2p, konami573 ) +MACHINE_CONFIG_DERIVED(ksys573_state::hypbbc2p, konami573) MCFG_FRAGMENT_ADD( cassy ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_DEVICE_CARD_MACHINE_CONFIG( "game", hypbbc2p_cassette_install ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( salarymc, konami573 ) +MACHINE_CONFIG_DERIVED(ksys573_state::salarymc, konami573) MCFG_FRAGMENT_ADD( cassyi ) MCFG_DEVICE_MODIFY( "cassette" ) MCFG_DEVICE_CARD_MACHINE_CONFIG( "game", salarymc_cassette_install ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gchgchmp, konami573 ) +MACHINE_CONFIG_DERIVED(ksys573_state::gchgchmp, konami573) MCFG_FRAGMENT_ADD( pccard1_16mb ) MCFG_FRAGMENT_ADD( cassx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pnchmn, konami573 ) +MACHINE_CONFIG_DERIVED(ksys573_state::pnchmn, konami573) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( konami573a_map ) @@ -2348,11 +2411,11 @@ static MACHINE_CONFIG_DERIVED( pnchmn, konami573 ) MCFG_DEVICE_CARD_MACHINE_CONFIG( "game", punchmania_cassette_install ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pnchmn2, pnchmn ) +MACHINE_CONFIG_DERIVED(ksys573_state::pnchmn2, pnchmn) MCFG_FRAGMENT_ADD( pccard2_64mb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gunmania, konami573 ) +MACHINE_CONFIG_DERIVED(ksys573_state::gunmania, konami573) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( gunmania_map ) @@ -2360,21 +2423,21 @@ static MACHINE_CONFIG_DERIVED( gunmania, konami573 ) MCFG_FRAGMENT_ADD( pccard2_32mb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dmx, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::dmx, k573d) MCFG_DEVICE_MODIFY( "k573dio" ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, dmx_output_callback ) ) MCFG_FRAGMENT_ADD( casszi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mamboagg, k573d ) +MACHINE_CONFIG_DERIVED(ksys573_state::mamboagg, k573d) MCFG_DEVICE_MODIFY( "k573dio" ) MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, mamboagg_output_callback ) ) MCFG_FRAGMENT_ADD( casszi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mamboagga, mamboagg ) +MACHINE_CONFIG_DERIVED(ksys573_state::mamboagga, mamboagg) MCFG_DEVICE_ADD( "k573npu", KONAMI_573_NETWORK_PCB_UNIT, 0 ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp index a2ac5aaddca..2bd60e4cce3 100644 --- a/src/mame/drivers/kungfur.cpp +++ b/src/mame/drivers/kungfur.cpp @@ -96,6 +96,7 @@ public: required_device m_maincpu; required_device m_adpcm1; required_device m_adpcm2; + void kungfur(machine_config &config); }; @@ -284,7 +285,7 @@ void kungfur_state::machine_reset() m_control = 0; } -static MACHINE_CONFIG_START( kungfur ) +MACHINE_CONFIG_START(kungfur_state::kungfur) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 8000000/2) // 4MHz? diff --git a/src/mame/drivers/kurukuru.cpp b/src/mame/drivers/kurukuru.cpp index 952db18ff01..34b3929b1a7 100644 --- a/src/mame/drivers/kurukuru.cpp +++ b/src/mame/drivers/kurukuru.cpp @@ -426,6 +426,8 @@ public: virtual void machine_start() override; virtual void machine_reset() override; DECLARE_WRITE_LINE_MEMBER(kurukuru_msm5205_vck); + void ppj(machine_config &config); + void kurukuru(machine_config &config); }; #define MAIN_CLOCK XTAL_21_4772MHz @@ -848,7 +850,7 @@ void kurukuru_state::machine_reset() * Machine Driver * *************************************************/ -static MACHINE_CONFIG_START( kurukuru ) +MACHINE_CONFIG_START(kurukuru_state::kurukuru) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, CPU_CLOCK) @@ -886,7 +888,7 @@ static MACHINE_CONFIG_START( kurukuru ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ppj ) +MACHINE_CONFIG_START(kurukuru_state::ppj) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, CPU_CLOCK) diff --git a/src/mame/drivers/kyocera.cpp b/src/mame/drivers/kyocera.cpp index 8614d1bc70e..372986c4191 100644 --- a/src/mame/drivers/kyocera.cpp +++ b/src/mame/drivers/kyocera.cpp @@ -1339,7 +1339,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(tandy200_state::tandy200_tp_tick) m_tp = !m_tp; } -static MACHINE_CONFIG_START( kc85 ) +MACHINE_CONFIG_START(kc85_state::kc85) /* basic machine hardware */ MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL_4_9152MHz) MCFG_CPU_PROGRAM_MAP(kc85_mem) @@ -1389,7 +1389,7 @@ static MACHINE_CONFIG_START( kc85 ) MCFG_RAM_EXTRA_OPTIONS("32K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pc8201 ) +MACHINE_CONFIG_START(pc8201_state::pc8201) /* basic machine hardware */ MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL_4_9152MHz) MCFG_CPU_PROGRAM_MAP(pc8201_mem) @@ -1443,13 +1443,13 @@ static MACHINE_CONFIG_START( pc8201 ) MCFG_RAM_EXTRA_OPTIONS("32K,64K,96K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc8300, pc8201 ) +MACHINE_CONFIG_DERIVED(pc8201_state::pc8300, pc8201) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("32K") MCFG_RAM_EXTRA_OPTIONS("64K,96K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( trsm100 ) +MACHINE_CONFIG_START(trsm100_state::trsm100) /* basic machine hardware */ MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL_4_9152MHz) MCFG_CPU_PROGRAM_MAP(kc85_mem) @@ -1498,13 +1498,13 @@ static MACHINE_CONFIG_START( trsm100 ) MCFG_RAM_EXTRA_OPTIONS("16K,24K,32K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tandy102, trsm100 ) +MACHINE_CONFIG_DERIVED(trsm100_state::tandy102, trsm100) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("24K") MCFG_RAM_EXTRA_OPTIONS("32K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tandy200 ) +MACHINE_CONFIG_START(tandy200_state::tandy200) /* basic machine hardware */ MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL_4_9152MHz) MCFG_CPU_PROGRAM_MAP(tandy200_mem) diff --git a/src/mame/drivers/kyugo.cpp b/src/mame/drivers/kyugo.cpp index 2c5ef7b4162..a3e31809299 100644 --- a/src/mame/drivers/kyugo.cpp +++ b/src/mame/drivers/kyugo.cpp @@ -507,7 +507,7 @@ INTERRUPT_GEN_MEMBER(kyugo_state::vblank_irq) } -static MACHINE_CONFIG_START( kyugo_base ) +MACHINE_CONFIG_START(kyugo_state::kyugo_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */ @@ -551,14 +551,14 @@ static MACHINE_CONFIG_START( kyugo_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gyrodine, kyugo_base ) +MACHINE_CONFIG_DERIVED(kyugo_state::gyrodine, kyugo_base) /* add watchdog */ MCFG_WATCHDOG_ADD("watchdog") MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(gyrodine_main_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( repulse, kyugo_base ) +MACHINE_CONFIG_DERIVED(kyugo_state::repulse, kyugo_base) /* basic machine hardware */ MCFG_CPU_MODIFY("sub") @@ -566,7 +566,7 @@ static MACHINE_CONFIG_DERIVED( repulse, kyugo_base ) MCFG_CPU_IO_MAP(repulse_sub_portmap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( srdmissn, kyugo_base ) +MACHINE_CONFIG_DERIVED(kyugo_state::srdmissn, kyugo_base) /* basic machine hardware */ MCFG_CPU_MODIFY("sub") @@ -574,7 +574,7 @@ static MACHINE_CONFIG_DERIVED( srdmissn, kyugo_base ) MCFG_CPU_IO_MAP(srdmissn_sub_portmap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( flashgala, kyugo_base ) +MACHINE_CONFIG_DERIVED(kyugo_state::flashgala, kyugo_base) /* basic machine hardware */ MCFG_CPU_MODIFY("sub") @@ -582,7 +582,7 @@ static MACHINE_CONFIG_DERIVED( flashgala, kyugo_base ) MCFG_CPU_IO_MAP(flashgala_sub_portmap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( legend, kyugo_base ) +MACHINE_CONFIG_DERIVED(kyugo_state::legend, kyugo_base) /* basic machine hardware */ MCFG_CPU_MODIFY("sub") diff --git a/src/mame/drivers/labyrunr.cpp b/src/mame/drivers/labyrunr.cpp index c12b3d8696e..59631029fd1 100644 --- a/src/mame/drivers/labyrunr.cpp +++ b/src/mame/drivers/labyrunr.cpp @@ -163,7 +163,7 @@ void labyrunr_state::machine_start() membank("bank1")->configure_entries(0, 6, &ROM[0x10000], 0x4000); } -static MACHINE_CONFIG_START( labyrunr ) +MACHINE_CONFIG_START(labyrunr_state::labyrunr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8? */ diff --git a/src/mame/drivers/ladybug.cpp b/src/mame/drivers/ladybug.cpp index 03810f42619..61379b9413d 100644 --- a/src/mame/drivers/ladybug.cpp +++ b/src/mame/drivers/ladybug.cpp @@ -514,7 +514,7 @@ MACHINE_START_MEMBER(ladybug_state,ladybug) { } -static MACHINE_CONFIG_START( ladybug ) +MACHINE_CONFIG_START(ladybug_state::ladybug) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */ @@ -551,7 +551,7 @@ static MACHINE_CONFIG_START( ladybug ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dorodon, ladybug ) +MACHINE_CONFIG_DERIVED(ladybug_state::dorodon, ladybug) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ladyfrog.cpp b/src/mame/drivers/ladyfrog.cpp index b79d16c0c6a..c2dbb12196d 100644 --- a/src/mame/drivers/ladyfrog.cpp +++ b/src/mame/drivers/ladyfrog.cpp @@ -286,7 +286,7 @@ void ladyfrog_state::machine_reset() m_snd_data = 0; } -static MACHINE_CONFIG_START( ladyfrog ) +MACHINE_CONFIG_START(ladyfrog_state::ladyfrog) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,XTAL_8MHz/2) @@ -343,7 +343,7 @@ static MACHINE_CONFIG_START( ladyfrog ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( toucheme, ladyfrog ) +MACHINE_CONFIG_DERIVED(ladyfrog_state::toucheme, ladyfrog) MCFG_VIDEO_START_OVERRIDE(ladyfrog_state,toucheme) MACHINE_CONFIG_END diff --git a/src/mame/drivers/laser3k.cpp b/src/mame/drivers/laser3k.cpp index 665693ce2e2..effec0d7b18 100644 --- a/src/mame/drivers/laser3k.cpp +++ b/src/mame/drivers/laser3k.cpp @@ -111,6 +111,7 @@ public: DECLARE_READ_LINE_MEMBER(ay3600_control_r); DECLARE_WRITE_LINE_MEMBER(ay3600_data_ready_w); + void laser3k(machine_config &config); private: uint8_t m_bank0val, m_bank1val, m_bank2val, m_bank3val; int m_flash; @@ -960,7 +961,7 @@ PALETTE_INIT_MEMBER(laser3k_state, laser3k) palette.set_pen_colors(0, laser3k_palette, ARRAY_LENGTH(laser3k_palette)); } -static MACHINE_CONFIG_START( laser3k ) +MACHINE_CONFIG_START(laser3k_state::laser3k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1021800) MCFG_CPU_PROGRAM_MAP(laser3k_map) diff --git a/src/mame/drivers/laserbas.cpp b/src/mame/drivers/laserbas.cpp index d7ff870878b..6c77e0f27e1 100644 --- a/src/mame/drivers/laserbas.cpp +++ b/src/mame/drivers/laserbas.cpp @@ -125,6 +125,7 @@ public: required_device m_dac4; required_device m_dac5; required_device m_dac6; + void laserbas(machine_config &config); }; TIMER_DEVICE_CALLBACK_MEMBER( laserbas_state::laserbas_scanline ) @@ -405,7 +406,7 @@ INPUT_PORTS_END #define CLOCK 16680000 #define PIT_CLOCK (CLOCK/16) // 12 divider ? -static MACHINE_CONFIG_START( laserbas ) +MACHINE_CONFIG_START(laserbas_state::laserbas) MCFG_CPU_ADD("maincpu", Z80, CLOCK / 4) MCFG_CPU_PROGRAM_MAP(laserbas_memory) diff --git a/src/mame/drivers/laserbat.cpp b/src/mame/drivers/laserbat.cpp index 0911b7c4273..12eff821edf 100644 --- a/src/mame/drivers/laserbat.cpp +++ b/src/mame/drivers/laserbat.cpp @@ -461,7 +461,7 @@ void laserbat_state_base::device_timer(emu_timer &timer, device_timer_id id, int } -static MACHINE_CONFIG_START( laserbat_base ) +MACHINE_CONFIG_START(laserbat_state_base::laserbat_base) // basic machine hardware MCFG_CPU_ADD("maincpu", S2650, XTAL_14_31818MHz/4) @@ -494,7 +494,7 @@ static MACHINE_CONFIG_START( laserbat_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( laserbat, laserbat_base ) +MACHINE_CONFIG_DERIVED(laserbat_state::laserbat, laserbat_base) // video hardware MCFG_PALETTE_ADD("palette", 256) @@ -526,7 +526,7 @@ static MACHINE_CONFIG_DERIVED( laserbat, laserbat_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( catnmous, laserbat_base ) +MACHINE_CONFIG_DERIVED(catnmous_state::catnmous, laserbat_base) // video hardware MCFG_PALETTE_ADD("palette", 256) diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp index 2cf4d92ba2a..4da1ee51eb6 100644 --- a/src/mame/drivers/lasso.cpp +++ b/src/mame/drivers/lasso.cpp @@ -481,7 +481,7 @@ MACHINE_RESET_MEMBER(lasso_state,wwjgtin) m_track_enable = 0; } -static MACHINE_CONFIG_START( base ) +MACHINE_CONFIG_START(lasso_state::base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 11289000/16) /* guess */ @@ -516,7 +516,7 @@ static MACHINE_CONFIG_START( base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lasso, base ) +MACHINE_CONFIG_DERIVED(lasso_state::lasso, base) /* basic machine hardware */ MCFG_CPU_ADD("blitter", M6502, 11289000/16) /* guess */ @@ -526,7 +526,7 @@ static MACHINE_CONFIG_DERIVED( lasso, base ) MCFG_PALETTE_INIT_OWNER(lasso_state, lasso) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( chameleo, base ) +MACHINE_CONFIG_DERIVED(lasso_state::chameleo, base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -543,7 +543,7 @@ static MACHINE_CONFIG_DERIVED( chameleo, base ) MCFG_SCREEN_UPDATE_DRIVER(lasso_state, screen_update_chameleo) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wwjgtin, base ) +MACHINE_CONFIG_DERIVED(lasso_state::wwjgtin, base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -572,7 +572,7 @@ static MACHINE_CONFIG_DERIVED( wwjgtin, base ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pinbo, base ) +MACHINE_CONFIG_DERIVED(lasso_state::pinbo, base) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", M6502, XTAL_18MHz/24) diff --git a/src/mame/drivers/lastbank.cpp b/src/mame/drivers/lastbank.cpp index 6e0fd7ef103..e2b24a5ef76 100644 --- a/src/mame/drivers/lastbank.cpp +++ b/src/mame/drivers/lastbank.cpp @@ -86,6 +86,7 @@ public: uint8_t ram_bank_r(uint16_t offset, uint8_t bank_num); void ram_bank_w(uint16_t offset, uint8_t data, uint8_t bank_num); TIMER_DEVICE_CALLBACK_MEMBER(lastbank_irq_scanline); + void lastbank(machine_config &config); }; void lastbank_state::video_start() @@ -528,7 +529,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(lastbank_state::lastbank_irq_scanline) } } -static MACHINE_CONFIG_START( lastbank ) +MACHINE_CONFIG_START(lastbank_state::lastbank) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,MASTER_CLOCK/4) //!!! TC0091LVC !!! diff --git a/src/mame/drivers/lastduel.cpp b/src/mame/drivers/lastduel.cpp index 2199a1f60ca..5b9babea151 100644 --- a/src/mame/drivers/lastduel.cpp +++ b/src/mame/drivers/lastduel.cpp @@ -483,7 +483,7 @@ void lastduel_state::machine_reset() m_scroll[i] = 0; } -static MACHINE_CONFIG_START( lastduel ) +MACHINE_CONFIG_START(lastduel_state::lastduel) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) // Unconfirmed - could be 8MHz @@ -528,7 +528,7 @@ static MACHINE_CONFIG_START( lastduel ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( madgear ) +MACHINE_CONFIG_START(lastduel_state::madgear) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) diff --git a/src/mame/drivers/lastfght.cpp b/src/mame/drivers/lastfght.cpp index bf605ba03d3..1ad331d952b 100644 --- a/src/mame/drivers/lastfght.cpp +++ b/src/mame/drivers/lastfght.cpp @@ -102,6 +102,7 @@ public: DECLARE_DRIVER_INIT(lastfght); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void lastfght(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -545,7 +546,7 @@ void lastfght_state::machine_reset() m_c00006 = 0; } -static MACHINE_CONFIG_START( lastfght ) +MACHINE_CONFIG_START(lastfght_state::lastfght) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H83044, 32000000/2) diff --git a/src/mame/drivers/laz_aftrshok.cpp b/src/mame/drivers/laz_aftrshok.cpp index e3fcd308fea..cba2b183c0e 100644 --- a/src/mame/drivers/laz_aftrshok.cpp +++ b/src/mame/drivers/laz_aftrshok.cpp @@ -45,6 +45,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void aftrshok(machine_config &config); // required_device m_maincpu; }; @@ -62,7 +63,7 @@ void aftrshok_state::machine_reset() } -static MACHINE_CONFIG_START( aftrshok ) +MACHINE_CONFIG_START(aftrshok_state::aftrshok) /* basic machine hardware */ // MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown diff --git a/src/mame/drivers/laz_awetoss.cpp b/src/mame/drivers/laz_awetoss.cpp index 637dcc01953..541eeeb5fd9 100644 --- a/src/mame/drivers/laz_awetoss.cpp +++ b/src/mame/drivers/laz_awetoss.cpp @@ -25,6 +25,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void awetoss(machine_config &config); // required_device m_maincpu; }; @@ -42,7 +43,7 @@ void awetoss_state::machine_reset() } -static MACHINE_CONFIG_START( awetoss ) +MACHINE_CONFIG_START(awetoss_state::awetoss) /* basic machine hardware */ // MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown diff --git a/src/mame/drivers/laz_ribrac.cpp b/src/mame/drivers/laz_ribrac.cpp index 35332cc3c89..27e1c1b45a5 100644 --- a/src/mame/drivers/laz_ribrac.cpp +++ b/src/mame/drivers/laz_ribrac.cpp @@ -29,6 +29,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void laz_ribrac(machine_config &config); // required_device m_maincpu; }; @@ -46,7 +47,7 @@ void laz_ribrac_state::machine_reset() } -static MACHINE_CONFIG_START( laz_ribrac ) +MACHINE_CONFIG_START(laz_ribrac_state::laz_ribrac) /* basic machine hardware */ // MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown diff --git a/src/mame/drivers/lazercmd.cpp b/src/mame/drivers/lazercmd.cpp index 8dd2c9f33f5..d3cf2134cbc 100644 --- a/src/mame/drivers/lazercmd.cpp +++ b/src/mame/drivers/lazercmd.cpp @@ -622,7 +622,7 @@ void lazercmd_state::machine_reset() } -static MACHINE_CONFIG_START( lazercmd ) +MACHINE_CONFIG_START(lazercmd_state::lazercmd) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/12) /* 666 kHz? */ @@ -661,7 +661,7 @@ static MACHINE_CONFIG_START( lazercmd ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( medlanes ) +MACHINE_CONFIG_START(lazercmd_state::medlanes) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/12) /* 666 kHz */ @@ -696,7 +696,7 @@ static MACHINE_CONFIG_START( medlanes ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bbonk ) +MACHINE_CONFIG_START(lazercmd_state::bbonk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/12) /* 666 kHz */ diff --git a/src/mame/drivers/lb186.cpp b/src/mame/drivers/lb186.cpp index bab75030513..3e6a9ee8d83 100644 --- a/src/mame/drivers/lb186.cpp +++ b/src/mame/drivers/lb186.cpp @@ -32,6 +32,8 @@ public: DECLARE_READ8_MEMBER(scsi_dack_r); DECLARE_WRITE8_MEMBER(scsi_dack_w); DECLARE_FLOPPY_FORMATS( floppy_formats ); + void lb186(machine_config &config); + static void ncr5380(device_t *device); }; WRITE8_MEMBER(lb186_state::scsi_dack_w) @@ -103,11 +105,14 @@ static SLOT_INTERFACE_START( lb186_floppies ) SLOT_INTERFACE("525dd", FLOPPY_525_DD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( ncr5380 ) +void lb186_state::ncr5380(device_t *device) +{ + devcb_base *devcb; + (void)devcb; MCFG_DEVICE_CLOCK(10000000) MCFG_NCR5380N_IRQ_HANDLER(DEVWRITELINE(":maincpu", i80186_cpu_device, int1_w)) MCFG_NCR5380N_DRQ_HANDLER(DEVWRITELINE(":maincpu", i80186_cpu_device, drq0_w)) -MACHINE_CONFIG_END +} static SLOT_INTERFACE_START( scsi_devices ) SLOT_INTERFACE("harddisk", NSCSI_HARDDISK) @@ -119,7 +124,7 @@ FLOPPY_FORMATS_MEMBER( lb186_state::floppy_formats ) FLOPPY_NASLITE_FORMAT FLOPPY_FORMATS_END -static MACHINE_CONFIG_START( lb186 ) +MACHINE_CONFIG_START(lb186_state::lb186) MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz / 2) MCFG_CPU_PROGRAM_MAP(lb186_map) MCFG_CPU_IO_MAP(lb186_io) @@ -152,7 +157,7 @@ static MACHINE_CONFIG_START( lb186 ) MCFG_NSCSI_ADD("scsibus:5", scsi_devices, nullptr, false) MCFG_NSCSI_ADD("scsibus:6", scsi_devices, nullptr, false) MCFG_NSCSI_ADD("scsibus:7", scsi_devices, "ncr5380", true) - MCFG_DEVICE_CARD_MACHINE_CONFIG("ncr5380", ncr5380) + MCFG_DEVICE_CARD_MACHINE_CONFIG("ncr5380", lb186_state::ncr5380) MACHINE_CONFIG_END ROM_START( lb186 ) diff --git a/src/mame/drivers/lbeach.cpp b/src/mame/drivers/lbeach.cpp index 2ecda224a5a..e40adf926e6 100644 --- a/src/mame/drivers/lbeach.cpp +++ b/src/mame/drivers/lbeach.cpp @@ -79,6 +79,7 @@ public: virtual void video_start() override; DECLARE_PALETTE_INIT(lbeach); uint32_t screen_update_lbeach(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void lbeach(machine_config &config); }; @@ -324,7 +325,7 @@ void lbeach_state::machine_reset() { } -static MACHINE_CONFIG_START( lbeach ) +MACHINE_CONFIG_START(lbeach_state::lbeach) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_16MHz / 32) // Motorola MC6800P, 500kHz diff --git a/src/mame/drivers/lc80.cpp b/src/mame/drivers/lc80.cpp index 10335127097..f8b8394fd5b 100644 --- a/src/mame/drivers/lc80.cpp +++ b/src/mame/drivers/lc80.cpp @@ -325,7 +325,7 @@ void lc80_state::machine_start() /* Machine Driver */ -static MACHINE_CONFIG_START( lc80 ) +MACHINE_CONFIG_START(lc80_state::lc80) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, 900000) /* UD880D */ MCFG_CPU_PROGRAM_MAP(lc80_mem) @@ -364,7 +364,7 @@ static MACHINE_CONFIG_START( lc80 ) MCFG_RAM_EXTRA_OPTIONS("2K,3K,4K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( lc80_2 ) +MACHINE_CONFIG_START(lc80_state::lc80_2) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, 1800000) /* UD880D */ MCFG_CPU_PROGRAM_MAP(lc80_mem) diff --git a/src/mame/drivers/lcmate2.cpp b/src/mame/drivers/lcmate2.cpp index 868aaa38909..33c2bdd3a1f 100644 --- a/src/mame/drivers/lcmate2.cpp +++ b/src/mame/drivers/lcmate2.cpp @@ -62,6 +62,7 @@ public: DECLARE_WRITE8_MEMBER( speaker_w ); DECLARE_WRITE8_MEMBER( bankswitch_w ); DECLARE_PALETTE_INIT(lcmate2); + void lcmate2(machine_config &config); }; WRITE8_MEMBER( lcmate2_state::speaker_w ) @@ -223,7 +224,7 @@ static GFXDECODE_START( lcmate2 ) GFXDECODE_END -static MACHINE_CONFIG_START( lcmate2 ) +MACHINE_CONFIG_START(lcmate2_state::lcmate2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) // confirmed MCFG_CPU_PROGRAM_MAP(lcmate2_mem) diff --git a/src/mame/drivers/ldplayer.cpp b/src/mame/drivers/ldplayer.cpp index eac15f4d01f..34214b9457c 100644 --- a/src/mame/drivers/ldplayer.cpp +++ b/src/mame/drivers/ldplayer.cpp @@ -38,6 +38,8 @@ public: // callback hook static chd_file *get_disc_static(device_t *dummy, laserdisc_device &device) { return device.machine().driver_data()->get_disc(); } + void ldplayer_ntsc(machine_config &config); + protected: // device overrides virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -105,6 +107,7 @@ public: m_command_buffer_in(0), m_command_buffer_out(0) { } + void pr8210(machine_config &config); protected: // device overrides virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -142,6 +145,7 @@ public: : ldplayer_state(mconfig, type, tag), m_laserdisc(*this, "laserdisc") { } + void ldv1000(machine_config &config); protected: required_device m_laserdisc; @@ -620,11 +624,11 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( ldplayer_ntsc ) +MACHINE_CONFIG_START(ldplayer_state::ldplayer_ntsc) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ldv1000, ldplayer_ntsc ) +MACHINE_CONFIG_DERIVED(ldv1000_state::ldv1000, ldplayer_ntsc) MCFG_LASERDISC_LDV1000_ADD("laserdisc") MCFG_LASERDISC_GET_DISC(laserdisc_device::get_disc_delegate(&ldplayer_state::get_disc_static, device)) MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc") @@ -636,7 +640,7 @@ static MACHINE_CONFIG_DERIVED( ldv1000, ldplayer_ntsc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pr8210, ldplayer_ntsc ) +MACHINE_CONFIG_DERIVED(pr8210_state::pr8210, ldplayer_ntsc) MCFG_LASERDISC_PR8210_ADD("laserdisc") MCFG_LASERDISC_GET_DISC(laserdisc_device::get_disc_delegate(&ldplayer_state::get_disc_static, device)) MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc") diff --git a/src/mame/drivers/leapster.cpp b/src/mame/drivers/leapster.cpp index 1da556328b0..3456be99658 100644 --- a/src/mame/drivers/leapster.cpp +++ b/src/mame/drivers/leapster.cpp @@ -241,6 +241,7 @@ public: printf("leapster_aux004b_w %04x\n", data); } + void leapster(machine_config &config); protected: required_device m_maincpu; required_device m_cart; @@ -301,7 +302,7 @@ static ADDRESS_MAP_START( leapster_aux, AS_IO, 32, leapster_state ) AM_RANGE(0x00000004b, 0x00000004b) AM_WRITE(leapster_aux004b_w) // this address isn't used by ARC internal stuff afaik, so probably leapster specific ADDRESS_MAP_END -static MACHINE_CONFIG_START( leapster ) +MACHINE_CONFIG_START(leapster_state::leapster) /* basic machine hardware */ // CPU is ArcTangent-A5 '5.1' (ARCompact core) MCFG_CPU_ADD("maincpu", ARCA5, 96000000/10) diff --git a/src/mame/drivers/learnwin.cpp b/src/mame/drivers/learnwin.cpp index 2ed966255c2..c7e46dc036e 100644 --- a/src/mame/drivers/learnwin.cpp +++ b/src/mame/drivers/learnwin.cpp @@ -63,6 +63,7 @@ public: bitmap.fill(rgb_t::black(), cliprect); return 0; } + void learnwin(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -137,7 +138,7 @@ void learnwin_state::machine_reset() } -static MACHINE_CONFIG_START( learnwin ) +MACHINE_CONFIG_START(learnwin_state::learnwin) /* video hardware */ // MCFG_SCREEN_ADD("screen", LCD) diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp index e8646105192..31570893b94 100644 --- a/src/mame/drivers/legionna.cpp +++ b/src/mame/drivers/legionna.cpp @@ -1146,7 +1146,7 @@ GFXDECODE_END /*****************************************************************************/ -static MACHINE_CONFIG_START( legionna ) +MACHINE_CONFIG_START(legionna_state::legionna) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */ @@ -1197,7 +1197,7 @@ static MACHINE_CONFIG_START( legionna ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( heatbrl ) +MACHINE_CONFIG_START(legionna_state::heatbrl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */ @@ -1249,7 +1249,7 @@ static MACHINE_CONFIG_START( heatbrl ) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( godzilla ) +MACHINE_CONFIG_START(legionna_state::godzilla) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 20000000/2) @@ -1303,7 +1303,7 @@ static MACHINE_CONFIG_START( godzilla ) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( denjinmk ) +MACHINE_CONFIG_START(legionna_state::denjinmk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 20000000/2) @@ -1356,7 +1356,7 @@ static MACHINE_CONFIG_START( denjinmk ) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( grainbow ) +MACHINE_CONFIG_START(legionna_state::grainbow) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 20000000/2) @@ -1410,7 +1410,7 @@ static MACHINE_CONFIG_START( grainbow ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cupsoc ) +MACHINE_CONFIG_START(legionna_state::cupsoc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,20000000/2) @@ -1462,7 +1462,7 @@ static MACHINE_CONFIG_START( cupsoc ) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cupsocs, cupsoc ) +MACHINE_CONFIG_DERIVED(legionna_state::cupsocs, cupsoc) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(cupsocs_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/leland.cpp b/src/mame/drivers/leland.cpp index 8bce9f67177..e842500bdb1 100644 --- a/src/mame/drivers/leland.cpp +++ b/src/mame/drivers/leland.cpp @@ -940,7 +940,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( leland ) +MACHINE_CONFIG_START(leland_state::leland) /* basic machine hardware */ MCFG_CPU_ADD("master", Z80, MASTER_CLOCK/2) @@ -986,7 +986,7 @@ static MACHINE_CONFIG_START( leland ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( redline, leland ) +MACHINE_CONFIG_DERIVED(leland_state::redline, leland) /* basic machine hardware */ MCFG_CPU_MODIFY("master") @@ -1002,7 +1002,7 @@ static MACHINE_CONFIG_DERIVED( redline, leland ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quarterb, redline ) +MACHINE_CONFIG_DERIVED(leland_state::quarterb, redline) /* basic machine hardware */ MCFG_CPU_MODIFY("audiocpu") @@ -1014,7 +1014,7 @@ static MACHINE_CONFIG_DERIVED( quarterb, redline ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lelandi, quarterb ) +MACHINE_CONFIG_DERIVED(leland_state::lelandi, quarterb) /* basic machine hardware */ MCFG_CPU_MODIFY("slave") @@ -1022,7 +1022,7 @@ static MACHINE_CONFIG_DERIVED( lelandi, quarterb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ataxx ) +MACHINE_CONFIG_START(leland_state::ataxx) /* basic machine hardware */ MCFG_CPU_ADD("master", Z80, 6000000) @@ -1055,7 +1055,7 @@ static MACHINE_CONFIG_START( ataxx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wsf, ataxx ) +MACHINE_CONFIG_DERIVED(leland_state::wsf, ataxx) MCFG_CPU_MODIFY("audiocpu") MCFG_80186_TMROUT1_HANDLER(DEVWRITELINE("custom", leland_80186_sound_device, i80186_tmr1_w)) diff --git a/src/mame/drivers/lemmings.cpp b/src/mame/drivers/lemmings.cpp index 023acc82e7c..af3dd719dd8 100644 --- a/src/mame/drivers/lemmings.cpp +++ b/src/mame/drivers/lemmings.cpp @@ -218,7 +218,7 @@ void lemmings_state::machine_start() { } -static MACHINE_CONFIG_START( lemmings ) +MACHINE_CONFIG_START(lemmings_state::lemmings) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14000000) diff --git a/src/mame/drivers/lethal.cpp b/src/mame/drivers/lethal.cpp index 228a734aef6..95c72ebc68f 100644 --- a/src/mame/drivers/lethal.cpp +++ b/src/mame/drivers/lethal.cpp @@ -486,7 +486,7 @@ void lethal_state::machine_reset() m_bank4000->set_bank(0); } -static MACHINE_CONFIG_START( lethalen ) +MACHINE_CONFIG_START(lethal_state::lethalen) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK/2) /* verified on pcb */ @@ -542,7 +542,7 @@ static MACHINE_CONFIG_START( lethalen ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lethalej, lethalen ) +MACHINE_CONFIG_DERIVED(lethal_state::lethalej, lethalen) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(224, 512-1, 16, 240-1) diff --git a/src/mame/drivers/lethalj.cpp b/src/mame/drivers/lethalj.cpp index 5d233730c9f..6106b74c146 100644 --- a/src/mame/drivers/lethalj.cpp +++ b/src/mame/drivers/lethalj.cpp @@ -629,7 +629,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( gameroom ) +MACHINE_CONFIG_START(lethalj_state::gameroom) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS34010, MASTER_CLOCK) @@ -663,7 +663,7 @@ static MACHINE_CONFIG_START( gameroom ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lethalj, gameroom ) +MACHINE_CONFIG_DERIVED(lethalj_state::lethalj, gameroom) MCFG_CPU_MODIFY("maincpu") MCFG_TMS340X0_PIXEL_CLOCK(VIDEO_CLOCK_LETHALJ) /* pixel clock */ diff --git a/src/mame/drivers/lft.cpp b/src/mame/drivers/lft.cpp index 315a6bf97e5..66afb4962cb 100644 --- a/src/mame/drivers/lft.cpp +++ b/src/mame/drivers/lft.cpp @@ -27,6 +27,7 @@ public: DECLARE_READ16_MEMBER(keyin_r); DECLARE_READ16_MEMBER(status_r); + void lft(machine_config &config); private: uint8_t m_term_data; virtual void machine_reset() override; @@ -83,7 +84,7 @@ void lft_state::machine_reset() m_term_data = 0; } -static MACHINE_CONFIG_START( lft ) +MACHINE_CONFIG_START(lft_state::lft) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80186, 4000000) // no idea MCFG_CPU_PROGRAM_MAP(lft_mem) diff --git a/src/mame/drivers/lg-dvd.cpp b/src/mame/drivers/lg-dvd.cpp index c393a4cdaa5..b4c2892d9dc 100644 --- a/src/mame/drivers/lg-dvd.cpp +++ b/src/mame/drivers/lg-dvd.cpp @@ -17,6 +17,7 @@ public: , m_maincpu(*this, "maincpu") { } + void lg(machine_config &config); protected: required_device m_maincpu; }; @@ -28,7 +29,7 @@ static ADDRESS_MAP_START( lg_dvd_map, AS_PROGRAM, 8, lg_dvd_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_REGION("maincpu", 0) ADDRESS_MAP_END -static MACHINE_CONFIG_START( lg ) +MACHINE_CONFIG_START(lg_dvd_state::lg) MCFG_CPU_ADD( "maincpu", I80C52, XTAL_16MHz ) MCFG_CPU_PROGRAM_MAP( lg_dvd_map ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/lgp.cpp b/src/mame/drivers/lgp.cpp index a18a7cdf148..975dd38e1bf 100644 --- a/src/mame/drivers/lgp.cpp +++ b/src/mame/drivers/lgp.cpp @@ -98,6 +98,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void lgp(machine_config &config); }; @@ -397,7 +398,7 @@ PALETTE_INIT_MEMBER(lgp_state, lgp) } /* DRIVER */ -static MACHINE_CONFIG_START( lgp ) +MACHINE_CONFIG_START(lgp_state::lgp) /* main cpu */ MCFG_CPU_ADD("maincpu", Z80, CPU_PCB_CLOCK) MCFG_CPU_PROGRAM_MAP(main_program_map) diff --git a/src/mame/drivers/liberate.cpp b/src/mame/drivers/liberate.cpp index 74a9e70e563..06524cc4282 100644 --- a/src/mame/drivers/liberate.cpp +++ b/src/mame/drivers/liberate.cpp @@ -728,7 +728,7 @@ MACHINE_RESET_MEMBER(liberate_state,liberate) m_bank = 0; } -static MACHINE_CONFIG_START( liberate_base ) +MACHINE_CONFIG_START(liberate_state::liberate_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",DECO16, 2000000) @@ -772,12 +772,12 @@ static MACHINE_CONFIG_START( liberate_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( liberate, liberate_base ) +MACHINE_CONFIG_DERIVED(liberate_state::liberate, liberate_base) MCFG_DEVICE_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( liberatb, liberate_base ) +MACHINE_CONFIG_DERIVED(liberate_state::liberatb, liberate_base) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", M6502, 2000000) @@ -785,14 +785,14 @@ static MACHINE_CONFIG_DERIVED( liberatb, liberate_base ) MCFG_CPU_VBLANK_INT_DRIVER("screen", liberate_state, deco16_interrupt) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( boomrang, liberate_base ) +MACHINE_CONFIG_DERIVED(liberate_state::boomrang, liberate_base) MCFG_VIDEO_START_OVERRIDE(liberate_state,boomrang) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(liberate_state, screen_update_boomrang) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( prosoccr, liberate_base ) +MACHINE_CONFIG_DERIVED(liberate_state::prosoccr, liberate_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -815,7 +815,7 @@ static MACHINE_CONFIG_DERIVED( prosoccr, liberate_base ) MCFG_VIDEO_START_OVERRIDE(liberate_state,prosoccr) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( prosport ) +MACHINE_CONFIG_START(liberate_state::prosport) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", DECO16, 2000000) diff --git a/src/mame/drivers/liberatr.cpp b/src/mame/drivers/liberatr.cpp index 7ea048cddf6..2a12b3639a2 100644 --- a/src/mame/drivers/liberatr.cpp +++ b/src/mame/drivers/liberatr.cpp @@ -427,7 +427,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( liberatr ) +MACHINE_CONFIG_START(liberatr_state::liberatr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* 1.25Mhz divided from 20Mhz master clock */ @@ -471,7 +471,7 @@ static MACHINE_CONFIG_START( liberatr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( liberat2, liberatr ) +MACHINE_CONFIG_DERIVED(liberatr_state::liberat2, liberatr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/lilith.cpp b/src/mame/drivers/lilith.cpp index 6af40142897..5a58dac3198 100644 --- a/src/mame/drivers/lilith.cpp +++ b/src/mame/drivers/lilith.cpp @@ -18,6 +18,7 @@ public: // , m_maincpu(*this, "maincpu") { } +void lilith(machine_config &config); private: // required_device m_maincpu; }; @@ -31,7 +32,7 @@ private: static INPUT_PORTS_START( lilith ) INPUT_PORTS_END -static MACHINE_CONFIG_START( lilith ) +MACHINE_CONFIG_START(lilith_state::lilith) MACHINE_CONFIG_END ROM_START( lilith ) diff --git a/src/mame/drivers/limenko.cpp b/src/mame/drivers/limenko.cpp index 7edbf9d2b3f..369c524c0bc 100644 --- a/src/mame/drivers/limenko.cpp +++ b/src/mame/drivers/limenko.cpp @@ -114,6 +114,8 @@ public: void draw_single_sprite(bitmap_ind16 &dest_bmp,const rectangle &clip,gfx_element *gfx,uint32_t code,uint32_t color,int flipx,int flipy,int sx,int sy,int priority); void draw_sprites(uint32_t *sprites, const rectangle &cliprect, int count); void copy_sprites(bitmap_ind16 &bitmap, bitmap_ind16 &sprites_bitmap, bitmap_ind8 &priority_bitmap, const rectangle &cliprect); + void limenko(machine_config &config); + void spotty(machine_config &config); }; /***************************************************************************************************** @@ -730,7 +732,7 @@ GFXDECODE_END *****************************************************************************************************/ -static MACHINE_CONFIG_START( limenko ) +MACHINE_CONFIG_START(limenko_state::limenko) MCFG_CPU_ADD("maincpu", E132XN, 20000000*4) /* 4x internal multiplier */ MCFG_CPU_PROGRAM_MAP(limenko_map) MCFG_CPU_IO_MAP(limenko_io_map) @@ -766,7 +768,7 @@ static MACHINE_CONFIG_START( limenko ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( spotty ) +MACHINE_CONFIG_START(limenko_state::spotty) MCFG_CPU_ADD("maincpu", GMS30C2232, 20000000) /* 20 MHz, no internal multiplier */ MCFG_CPU_PROGRAM_MAP(spotty_map) MCFG_CPU_IO_MAP(spotty_io_map) diff --git a/src/mame/drivers/lindbergh.cpp b/src/mame/drivers/lindbergh.cpp index 7adade8ccf7..939a77b5b41 100644 --- a/src/mame/drivers/lindbergh.cpp +++ b/src/mame/drivers/lindbergh.cpp @@ -375,6 +375,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void lindbergh(machine_config &config); }; lindbergh_state::lindbergh_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) @@ -389,7 +390,7 @@ void lindbergh_state::machine_reset() { } -static MACHINE_CONFIG_START(lindbergh) +MACHINE_CONFIG_START(lindbergh_state::lindbergh) MCFG_CPU_ADD("maincpu", PENTIUM4, 28000000U*5) /* Actually Celeron D at 2,8 GHz */ MCFG_PCI_ROOT_ADD( ":pci") diff --git a/src/mame/drivers/lisa.cpp b/src/mame/drivers/lisa.cpp index f92056d33ac..a4e11c7d68c 100644 --- a/src/mame/drivers/lisa.cpp +++ b/src/mame/drivers/lisa.cpp @@ -95,7 +95,7 @@ static const floppy_interface lisa_floppy_interface = ***************************************************************************/ /* Lisa1 and Lisa 2 machine */ -static MACHINE_CONFIG_START( lisa ) +MACHINE_CONFIG_START(lisa_state::lisa) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 5093760) /* 20.37504 MHz / 4 */ MCFG_CPU_PROGRAM_MAP(lisa_map) @@ -163,7 +163,7 @@ static MACHINE_CONFIG_START( lisa ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lisa210, lisa ) +MACHINE_CONFIG_DERIVED(lisa_state::lisa210, lisa) MCFG_CPU_MODIFY( "fdccpu" ) MCFG_CPU_PROGRAM_MAP(lisa210_fdc_map) @@ -178,7 +178,7 @@ static MACHINE_CONFIG_DERIVED( lisa210, lisa ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( macxl, lisa210 ) +MACHINE_CONFIG_DERIVED(lisa_state::macxl, lisa210) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE( 768/* ???? */, 447/* ???? */) MCFG_SCREEN_VISIBLE_AREA(0, 608-1, 0, 431-1) diff --git a/src/mame/drivers/littlerb.cpp b/src/mame/drivers/littlerb.cpp index e980c345763..7e9d7075b66 100644 --- a/src/mame/drivers/littlerb.cpp +++ b/src/mame/drivers/littlerb.cpp @@ -105,6 +105,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(littlerb_sound_cb); DECLARE_DRIVER_INIT(littlerb); + void littlerb(machine_config &config); }; @@ -250,7 +251,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(littlerb_state::littlerb_sound_step_cb) m_soundframe++; } -static MACHINE_CONFIG_START( littlerb ) +MACHINE_CONFIG_START(littlerb_state::littlerb) MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 10MHz rated part, near 16Mhz XTAL MCFG_CPU_PROGRAM_MAP(littlerb_main) diff --git a/src/mame/drivers/lkage.cpp b/src/mame/drivers/lkage.cpp index 62fbf1fdad2..d0f411e383a 100644 --- a/src/mame/drivers/lkage.cpp +++ b/src/mame/drivers/lkage.cpp @@ -482,7 +482,7 @@ void lkage_state::machine_reset() m_soundnmi->in_w<1>(0); } -static MACHINE_CONFIG_START( lkage ) +MACHINE_CONFIG_START(lkage_state::lkage) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK) @@ -535,7 +535,7 @@ static MACHINE_CONFIG_START( lkage ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( lkageb ) +MACHINE_CONFIG_START(lkage_state::lkageb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,MAIN_CPU_CLOCK) diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp index ade1d3c994c..7c797394aa6 100644 --- a/src/mame/drivers/llc.cpp +++ b/src/mame/drivers/llc.cpp @@ -195,7 +195,7 @@ static GFXDECODE_START( llc2 ) GFXDECODE_END /* Machine driver */ -static MACHINE_CONFIG_START( llc1 ) +MACHINE_CONFIG_START(llc_state::llc1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3MHz) MCFG_Z80_DAISY_CHAIN(llc1_daisy_chain) @@ -239,7 +239,7 @@ static MACHINE_CONFIG_START( llc1 ) MCFG_GENERIC_KEYBOARD_CB(PUT(llc_state, kbd_put)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( llc2 ) +MACHINE_CONFIG_START(llc_state::llc2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3MHz) MCFG_Z80_DAISY_CHAIN(llc2_daisy_chain) diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp index 9dc1be38a12..1b5dd1e3f6b 100644 --- a/src/mame/drivers/lockon.cpp +++ b/src/mame/drivers/lockon.cpp @@ -480,7 +480,7 @@ void lockon_state::machine_reset() m_main_inten = 0; } -static MACHINE_CONFIG_START( lockon ) +MACHINE_CONFIG_START(lockon_state::lockon) MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz / 2) MCFG_CPU_PROGRAM_MAP(main_v30) diff --git a/src/mame/drivers/lola8a.cpp b/src/mame/drivers/lola8a.cpp index 5252dcd1066..7db10ad9176 100644 --- a/src/mame/drivers/lola8a.cpp +++ b/src/mame/drivers/lola8a.cpp @@ -56,6 +56,7 @@ public: DECLARE_READ8_MEMBER(keyboard_r); MC6845_UPDATE_ROW(crtc_update_row); + void lola8a(machine_config &config); private: uint8_t m_portb; virtual void machine_reset() override { m_maincpu->set_pc(0x8000); } @@ -257,7 +258,7 @@ WRITE_LINE_MEMBER(lola8a_state::crtc_vsync) m_maincpu->set_input_line(I8085_RST75_LINE, state? ASSERT_LINE : CLEAR_LINE); } -static MACHINE_CONFIG_START( lola8a ) +MACHINE_CONFIG_START(lola8a_state::lola8a) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, XTAL_4_9152MHz) MCFG_CPU_PROGRAM_MAP(lola8a_mem) diff --git a/src/mame/drivers/looping.cpp b/src/mame/drivers/looping.cpp index f886e1915c0..1cc218cd33c 100644 --- a/src/mame/drivers/looping.cpp +++ b/src/mame/drivers/looping.cpp @@ -167,6 +167,7 @@ public: required_device m_palette; required_device m_soundlatch; required_device m_watchdog; + void looping(machine_config &config); }; @@ -610,7 +611,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( looping ) +MACHINE_CONFIG_START(looping_state::looping) // CPU TMS9995, standard variant; no line connections MCFG_TMS99xx_ADD("maincpu", TMS9995, MAIN_CPU_CLOCK, looping_map, looping_io_map) diff --git a/src/mame/drivers/lordgun.cpp b/src/mame/drivers/lordgun.cpp index 7bb773e8380..f75a4f2dc4b 100644 --- a/src/mame/drivers/lordgun.cpp +++ b/src/mame/drivers/lordgun.cpp @@ -632,7 +632,7 @@ void lordgun_state::machine_start() save_item(NAME(m_whitescreen)); } -static MACHINE_CONFIG_START( lordgun ) +MACHINE_CONFIG_START(lordgun_state::lordgun) MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2) MCFG_CPU_PROGRAM_MAP(lordgun_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", lordgun_state, irq4_line_hold) @@ -684,7 +684,7 @@ static MACHINE_CONFIG_START( lordgun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( aliencha ) +MACHINE_CONFIG_START(lordgun_state::aliencha) MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2) MCFG_CPU_PROGRAM_MAP(aliencha_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", lordgun_state, irq4_line_hold) diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp index d8535f0c4b2..6ae7e36627e 100644 --- a/src/mame/drivers/lsasquad.cpp +++ b/src/mame/drivers/lsasquad.cpp @@ -550,7 +550,7 @@ MACHINE_RESET_MEMBER(lsasquad_state,lsasquad) } /* Note: lsasquad clock values are not verified */ -static MACHINE_CONFIG_START( lsasquad ) +MACHINE_CONFIG_START(lsasquad_state::lsasquad) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 4) @@ -606,7 +606,7 @@ static MACHINE_CONFIG_START( lsasquad ) MCFG_SOUND_ROUTE(3, "mono", 0.63) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( storming, lsasquad ) +MACHINE_CONFIG_DERIVED(lsasquad_state::storming, lsasquad) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(storming_map) @@ -617,7 +617,7 @@ static MACHINE_CONFIG_DERIVED( storming, lsasquad ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( daikaiju ) +MACHINE_CONFIG_START(lsasquad_state::daikaiju) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 4) diff --git a/src/mame/drivers/ltcasino.cpp b/src/mame/drivers/ltcasino.cpp index 37035b365e8..6daaa8adbd3 100644 --- a/src/mame/drivers/ltcasino.cpp +++ b/src/mame/drivers/ltcasino.cpp @@ -43,6 +43,7 @@ public: uint32_t screen_update_ltcasino(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void ltcasino(machine_config &config); }; @@ -651,7 +652,7 @@ uint32_t ltcasino_state::screen_update_ltcasino(screen_device &screen, bitmap_in } -static MACHINE_CONFIG_START( ltcasino ) +MACHINE_CONFIG_START(ltcasino_state::ltcasino) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,2000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(ltcasino_map) diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp index f8b14c62515..a57b9f9147e 100644 --- a/src/mame/drivers/ltd.cpp +++ b/src/mame/drivers/ltd.cpp @@ -73,6 +73,8 @@ public: DECLARE_WRITE8_MEMBER(count_reset_w); DECLARE_INPUT_CHANGED_MEMBER(ficha); TIMER_DEVICE_CALLBACK_MEMBER(timer_r); + void ltd4(machine_config &config); + void ltd3(machine_config &config); private: bool m_timer_r; bool m_clear; @@ -516,7 +518,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( ltd_state::timer_r ) } } -static MACHINE_CONFIG_START( ltd3 ) +MACHINE_CONFIG_START(ltd_state::ltd3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6802, XTAL_3_579545MHz) MCFG_CPU_PROGRAM_MAP(ltd3_map) @@ -532,7 +534,7 @@ static MACHINE_CONFIG_START( ltd3 ) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_r", ltd_state, timer_r, attotime::from_hz(500)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ltd4 ) +MACHINE_CONFIG_START(ltd_state::ltd4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6803, XTAL_3_579545MHz) // guess, no details available MCFG_CPU_PROGRAM_MAP(ltd4_map) diff --git a/src/mame/drivers/luckgrln.cpp b/src/mame/drivers/luckgrln.cpp index 9ba1dacbf94..49c89b15f1b 100644 --- a/src/mame/drivers/luckgrln.cpp +++ b/src/mame/drivers/luckgrln.cpp @@ -163,6 +163,8 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void _7smash(machine_config &config); + void luckgrln(machine_config &config); }; @@ -986,7 +988,7 @@ INTERRUPT_GEN_MEMBER(luckgrln_state::luckgrln_irq) m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( luckgrln ) +MACHINE_CONFIG_START(luckgrln_state::luckgrln) MCFG_CPU_ADD("maincpu", Z180,8000000) MCFG_CPU_PROGRAM_MAP(mainmap) MCFG_CPU_IO_MAP(portmap) @@ -1011,7 +1013,7 @@ static MACHINE_CONFIG_START( luckgrln ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( _7smash, luckgrln ) +MACHINE_CONFIG_DERIVED(luckgrln_state::_7smash, luckgrln) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(_7smash_map) MCFG_CPU_IO_MAP(_7smash_io) diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp index e5d048f1372..6daa3832925 100644 --- a/src/mame/drivers/lucky74.cpp +++ b/src/mame/drivers/lucky74.cpp @@ -1461,7 +1461,7 @@ WRITE_LINE_MEMBER(lucky74_state::lucky74_adpcm_int) * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( lucky74 ) +MACHINE_CONFIG_START(lucky74_state::lucky74) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, C_06B49P_CLKOUT_03) /* 3 MHz. */ diff --git a/src/mame/drivers/luckybal.cpp b/src/mame/drivers/luckybal.cpp index 4f17bd2bd0f..17aa3d15f1f 100644 --- a/src/mame/drivers/luckybal.cpp +++ b/src/mame/drivers/luckybal.cpp @@ -311,6 +311,8 @@ public: required_device m_ppi; required_device m_dac; required_device_array m_latch; + + void luckybal(machine_config &config); }; @@ -516,7 +518,7 @@ INPUT_PORTS_END * Machine Driver * **************************************/ -static MACHINE_CONFIG_START( luckybal ) +MACHINE_CONFIG_START(luckybal_state::luckybal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, CPU_CLOCK) diff --git a/src/mame/drivers/lvcards.cpp b/src/mame/drivers/lvcards.cpp index ef4fe725d5d..bbf8176af26 100644 --- a/src/mame/drivers/lvcards.cpp +++ b/src/mame/drivers/lvcards.cpp @@ -451,7 +451,7 @@ GFXDECODE_END /* Sound Interfaces */ -static MACHINE_CONFIG_START( lvcards ) +MACHINE_CONFIG_START(lvcards_state::lvcards) // basic machine hardware MCFG_CPU_ADD("maincpu",Z80, 18432000/4) // unknown frequency, assume same as tehkanwc.cpp MCFG_CPU_PROGRAM_MAP(lvcards_map) @@ -480,7 +480,7 @@ static MACHINE_CONFIG_START( lvcards ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lvpoker, lvcards ) +MACHINE_CONFIG_DERIVED(lvcards_state::lvpoker, lvcards) // basic machine hardware MCFG_NVRAM_ADD_1FILL("nvram") @@ -490,7 +490,7 @@ static MACHINE_CONFIG_DERIVED( lvpoker, lvcards ) MCFG_MACHINE_RESET_OVERRIDE(lvcards_state,lvpoker) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ponttehk, lvcards ) +MACHINE_CONFIG_DERIVED(lvcards_state::ponttehk, lvcards) // basic machine hardware MCFG_NVRAM_ADD_1FILL("nvram") diff --git a/src/mame/drivers/lviv.cpp b/src/mame/drivers/lviv.cpp index d8e589371d6..c47e50ebaf2 100644 --- a/src/mame/drivers/lviv.cpp +++ b/src/mame/drivers/lviv.cpp @@ -420,7 +420,7 @@ INPUT_PORTS_END /* machine definition */ -static MACHINE_CONFIG_START( lviv ) +MACHINE_CONFIG_START(lviv_state::lviv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, 2500000) MCFG_CPU_PROGRAM_MAP(lviv_mem) diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp index 912dce41e1e..ceed8010f80 100644 --- a/src/mame/drivers/lwings.cpp +++ b/src/mame/drivers/lwings.cpp @@ -916,7 +916,7 @@ void lwings_state::machine_reset() m_adpcm = 0; } -static MACHINE_CONFIG_START( lwings ) +MACHINE_CONFIG_START(lwings_state::lwings) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on PCB */ @@ -972,7 +972,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fball ) +MACHINE_CONFIG_START(lwings_state::fball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) @@ -1014,7 +1014,7 @@ static MACHINE_CONFIG_START( fball ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( trojan, lwings ) +MACHINE_CONFIG_DERIVED(lwings_state::trojan, lwings) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1045,7 +1045,7 @@ static MACHINE_CONFIG_DERIVED( trojan, lwings ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( avengers, trojan ) +MACHINE_CONFIG_DERIVED(lwings_state::avengers, trojan) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1059,7 +1059,7 @@ static MACHINE_CONFIG_DERIVED( avengers, trojan ) MCFG_VIDEO_START_OVERRIDE(lwings_state,avengers) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( avengersb, avengers ) +MACHINE_CONFIG_DERIVED(lwings_state::avengersb, avengers) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(lwings_state,avengersb) MACHINE_CONFIG_END diff --git a/src/mame/drivers/lwriter.cpp b/src/mame/drivers/lwriter.cpp index e69be51d853..788ee3bf7d4 100644 --- a/src/mame/drivers/lwriter.cpp +++ b/src/mame/drivers/lwriter.cpp @@ -127,6 +127,7 @@ public: //DECLARE_WRITE_LINE_MEMBER(scc_int); virtual void machine_start () override; virtual void machine_reset () override; + void lwriter(machine_config &config); private: required_device m_maincpu; required_device m_scc; @@ -349,7 +350,7 @@ WRITE_LINE_MEMBER(lwriter_state::scc_int) #define CPU_CLK (XTAL_22_3210MHz / 2) // Based on pictures form here: http://picclick.co.uk/Apple-Postscript-LaserWriter-IINT-Printer-640-4105-M6009-Mainboard-282160713108.html#&gid=1&pid=7 #define RXC_CLK ((CPU_CLK - (87 * 16 * 70)) / 3) // Tuned to get 9600 baud according to manual, needs rework based on real hardware -static MACHINE_CONFIG_START( lwriter ) +MACHINE_CONFIG_START(lwriter_state::lwriter) MCFG_CPU_ADD("maincpu", M68000, CPU_CLK) MCFG_CPU_PROGRAM_MAP(maincpu_map) MCFG_SCC8530_ADD("scc", CPU_CLK, RXC_CLK, 0, RXC_CLK, 0) diff --git a/src/mame/drivers/lynx.cpp b/src/mame/drivers/lynx.cpp index 6f0cd93a68a..f80cfdd0ac4 100644 --- a/src/mame/drivers/lynx.cpp +++ b/src/mame/drivers/lynx.cpp @@ -75,7 +75,7 @@ void lynx_state::sound_cb() lynx_timer_count_down(1); } -static MACHINE_CONFIG_START( lynx ) +MACHINE_CONFIG_START(lynx_state::lynx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65SC02, 4000000) /* vti core, integrated in vlsi, stz, but not bbr bbs */ MCFG_CPU_PROGRAM_MAP(lynx_mem) diff --git a/src/mame/drivers/m10.cpp b/src/mame/drivers/m10.cpp index 1910bfee2dd..9ceb7b721f3 100644 --- a/src/mame/drivers/m10.cpp +++ b/src/mame/drivers/m10.cpp @@ -809,7 +809,7 @@ static const char *const m10_sample_names[] = * *************************************/ -static MACHINE_CONFIG_START( m10 ) +MACHINE_CONFIG_START(m10_state::m10) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,IREMM10_CPU_CLOCK) @@ -862,7 +862,7 @@ static MACHINE_CONFIG_START( m10 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( m11, m10 ) +MACHINE_CONFIG_DERIVED(m10_state::m11, m10) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -872,7 +872,7 @@ static MACHINE_CONFIG_DERIVED( m11, m10 ) /* sound hardware */ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( m15 ) +MACHINE_CONFIG_START(m10_state::m15) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,IREMM15_CPU_CLOCK) @@ -906,7 +906,7 @@ static MACHINE_CONFIG_START( m15 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( headoni, m15 ) +MACHINE_CONFIG_DERIVED(m10_state::headoni, m15) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(11730000/16) MACHINE_CONFIG_END diff --git a/src/mame/drivers/m107.cpp b/src/mame/drivers/m107.cpp index 957c8dc11d6..1f3173b7607 100644 --- a/src/mame/drivers/m107.cpp +++ b/src/mame/drivers/m107.cpp @@ -711,7 +711,7 @@ GFXDECODE_END /***************************************************************************/ -static MACHINE_CONFIG_START( firebarr ) +MACHINE_CONFIG_START(m107_state::firebarr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V33, XTAL_28MHz/2) /* NEC V33, 28MHz clock */ @@ -762,7 +762,7 @@ static MACHINE_CONFIG_START( firebarr ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dsoccr94, firebarr ) +MACHINE_CONFIG_DERIVED(m107_state::dsoccr94, firebarr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -777,7 +777,7 @@ static MACHINE_CONFIG_DERIVED( dsoccr94, firebarr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wpksoc, firebarr ) +MACHINE_CONFIG_DERIVED(m107_state::wpksoc, firebarr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(wpksoc_map) MCFG_CPU_IO_MAP(wpksoc_io_map) @@ -786,7 +786,7 @@ static MACHINE_CONFIG_DERIVED( wpksoc, firebarr ) MCFG_V25_CONFIG(leagueman_decryption_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( airass, firebarr ) +MACHINE_CONFIG_DERIVED(m107_state::airass, firebarr) MCFG_GFXDECODE_MODIFY("gfxdecode", m107) MCFG_CPU_MODIFY("soundcpu") diff --git a/src/mame/drivers/m14.cpp b/src/mame/drivers/m14.cpp index 937c0fc364d..d5e545905b4 100644 --- a/src/mame/drivers/m14.cpp +++ b/src/mame/drivers/m14.cpp @@ -99,6 +99,7 @@ public: uint32_t screen_update_m14(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(m14_irq); + void m14(machine_config &config); private: /* video-related */ tilemap_t *m_m14_tilemap; @@ -424,7 +425,7 @@ void m14_state::machine_reset() } -static MACHINE_CONFIG_START( m14 ) +MACHINE_CONFIG_START(m14_state::m14) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A,6000000) //guess: 6 Mhz internally divided by 2 diff --git a/src/mame/drivers/m20.cpp b/src/mame/drivers/m20.cpp index d65ab8cb912..fbc23ea99fb 100644 --- a/src/mame/drivers/m20.cpp +++ b/src/mame/drivers/m20.cpp @@ -105,6 +105,7 @@ public: DECLARE_WRITE_LINE_MEMBER(int_w); MC6845_UPDATE_ROW(update_row); + void m20(machine_config &config); private: offs_t m_memsize; uint8_t m_port21; @@ -778,7 +779,7 @@ static SLOT_INTERFACE_START(keyboard) SLOT_INTERFACE("m20", M20_KEYBOARD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( m20 ) +MACHINE_CONFIG_START(m20_state::m20) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z8001, MAIN_CLOCK) MCFG_CPU_PROGRAM_MAP(m20_program_mem) diff --git a/src/mame/drivers/m24.cpp b/src/mame/drivers/m24.cpp index dd534c3d852..aa53a996fbb 100644 --- a/src/mame/drivers/m24.cpp +++ b/src/mame/drivers/m24.cpp @@ -55,6 +55,8 @@ public: uint8_t m_sysctl, m_pa, m_kbcin, m_kbcout; bool m_kbcibf, m_kbdata, m_i86_halt, m_i86_halt_perm; + static void cfg_m20_format(device_t *device); + void olivetti(machine_config &config); }; void m24_state::machine_reset() @@ -238,15 +240,13 @@ FLOPPY_FORMATS_MEMBER( m24_state::floppy_formats ) FLOPPY_M20_FORMAT FLOPPY_FORMATS_END -static MACHINE_CONFIG_START( cfg_m20_format ) - MCFG_DEVICE_MODIFY("fdc:0") - static_cast(device)->set_formats(m24_state::floppy_formats); - - MCFG_DEVICE_MODIFY("fdc:1") - static_cast(device)->set_formats(m24_state::floppy_formats); -MACHINE_CONFIG_END +void m24_state::cfg_m20_format(device_t *device) +{ + device->subdevice("fdc:0")->set_formats(m24_state::floppy_formats); + device->subdevice("fdc:1")->set_formats(m24_state::floppy_formats); +} -static MACHINE_CONFIG_START( olivetti ) +MACHINE_CONFIG_START(m24_state::olivetti) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(m24_map) diff --git a/src/mame/drivers/m3.cpp b/src/mame/drivers/m3.cpp index 72579e560cd..2a11e706fe1 100644 --- a/src/mame/drivers/m3.cpp +++ b/src/mame/drivers/m3.cpp @@ -29,6 +29,7 @@ public: MC6845_UPDATE_ROW(crtc_update_row); + void m3(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -107,7 +108,7 @@ void m3_state::machine_reset() m_maincpu->set_pc(0xf000); } -static MACHINE_CONFIG_START( m3 ) +MACHINE_CONFIG_START(m3_state::m3) MCFG_CPU_ADD("maincpu", Z80, 2'000'000) // no idea of clock. MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp index 9f98433bddf..60da94c6495 100644 --- a/src/mame/drivers/m5.cpp +++ b/src/mame/drivers/m5.cpp @@ -1396,7 +1396,7 @@ void brno_state::machine_reset() // MACHINE_CONFIG( m5 ) //------------------------------------------------- -static MACHINE_CONFIG_START( m5 ) +MACHINE_CONFIG_START(m5_state::m5) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_14_31818MHz/4) MCFG_CPU_PROGRAM_MAP(m5_mem) @@ -1459,7 +1459,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG_DERIVED( ntsc, m5 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( ntsc, m5 ) +MACHINE_CONFIG_DERIVED(m5_state::ntsc, m5) // video hardware MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -1473,7 +1473,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG_DERIVED( pal, m5 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pal, m5 ) +MACHINE_CONFIG_DERIVED(m5_state::pal, m5) // video hardware MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -1487,7 +1487,7 @@ MACHINE_CONFIG_END //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( brno, m5 ) +MACHINE_CONFIG_DERIVED(brno_state::brno, m5) // basic machine hardware MCFG_CPU_MODIFY(Z80_TAG) diff --git a/src/mame/drivers/m52.cpp b/src/mame/drivers/m52.cpp index 8b3c336f057..6ba0cc8acfb 100644 --- a/src/mame/drivers/m52.cpp +++ b/src/mame/drivers/m52.cpp @@ -392,7 +392,7 @@ void m52_state::machine_reset() m_bgcontrol = 0; } -static MACHINE_CONFIG_START( m52 ) +MACHINE_CONFIG_START(m52_state::m52) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) @@ -418,7 +418,7 @@ static MACHINE_CONFIG_START( m52 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( alpha1v, m52 ) +MACHINE_CONFIG_DERIVED(m52_state::alpha1v, m52) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/m57.cpp b/src/mame/drivers/m57.cpp index 7ad550e65e6..caee476fd0e 100644 --- a/src/mame/drivers/m57.cpp +++ b/src/mame/drivers/m57.cpp @@ -228,7 +228,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( m57 ) +MACHINE_CONFIG_START(m57_state::m57) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */ diff --git a/src/mame/drivers/m58.cpp b/src/mame/drivers/m58.cpp index ee4e8b3876f..91e390d8542 100644 --- a/src/mame/drivers/m58.cpp +++ b/src/mame/drivers/m58.cpp @@ -191,7 +191,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( yard ) +MACHINE_CONFIG_START(m58_state::yard) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) diff --git a/src/mame/drivers/m62.cpp b/src/mame/drivers/m62.cpp index faccc1fab67..ba037561a02 100644 --- a/src/mame/drivers/m62.cpp +++ b/src/mame/drivers/m62.cpp @@ -946,7 +946,7 @@ void m62_state::machine_reset() m_bankcontrol[1] = 0; } -static MACHINE_CONFIG_START( ldrun ) +MACHINE_CONFIG_START(m62_state::ldrun) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 24000000/6) @@ -979,7 +979,7 @@ static MACHINE_CONFIG_START( ldrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kungfum, ldrun ) +MACHINE_CONFIG_DERIVED(m62_state::kungfum, ldrun) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -996,7 +996,7 @@ static MACHINE_CONFIG_DERIVED( kungfum, ldrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( battroad, ldrun ) +MACHINE_CONFIG_DERIVED(m62_state::battroad, ldrun) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1020,7 +1020,7 @@ static MACHINE_CONFIG_DERIVED( battroad, ldrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ldrun2, ldrun ) +MACHINE_CONFIG_DERIVED(m62_state::ldrun2, ldrun) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1033,7 +1033,7 @@ static MACHINE_CONFIG_DERIVED( ldrun2, ldrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ldrun3, ldrun ) +MACHINE_CONFIG_DERIVED(m62_state::ldrun3, ldrun) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1047,7 +1047,7 @@ static MACHINE_CONFIG_DERIVED( ldrun3, ldrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ldrun4, ldrun ) +MACHINE_CONFIG_DERIVED(m62_state::ldrun4, ldrun) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1061,7 +1061,7 @@ static MACHINE_CONFIG_DERIVED( ldrun4, ldrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lotlot, ldrun ) +MACHINE_CONFIG_DERIVED(m62_state::lotlot, ldrun) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1082,7 +1082,7 @@ static MACHINE_CONFIG_DERIVED( lotlot, ldrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kidniki, ldrun ) +MACHINE_CONFIG_DERIVED(m62_state::kidniki, ldrun) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1098,7 +1098,7 @@ static MACHINE_CONFIG_DERIVED( kidniki, ldrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spelunkr, ldrun ) +MACHINE_CONFIG_DERIVED(m62_state::spelunkr, ldrun) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1113,7 +1113,7 @@ static MACHINE_CONFIG_DERIVED( spelunkr, ldrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spelunk2, ldrun ) +MACHINE_CONFIG_DERIVED(m62_state::spelunk2, ldrun) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1134,7 +1134,7 @@ static MACHINE_CONFIG_DERIVED( spelunk2, ldrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( youjyudn, ldrun ) +MACHINE_CONFIG_DERIVED(m62_state::youjyudn, ldrun) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1154,7 +1154,7 @@ static MACHINE_CONFIG_DERIVED( youjyudn, ldrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( horizon, ldrun ) +MACHINE_CONFIG_DERIVED(m62_state::horizon, ldrun) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp index 2ebb5cae6ce..d851ba88ae9 100644 --- a/src/mame/drivers/m63.cpp +++ b/src/mame/drivers/m63.cpp @@ -210,6 +210,9 @@ public: INTERRUPT_GEN_MEMBER(snd_irq); INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void atomboy(machine_config &config); + void m63(machine_config &config); + void fghtbskt(machine_config &config); }; @@ -741,7 +744,7 @@ INTERRUPT_GEN_MEMBER(m63_state::vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( m63 ) +MACHINE_CONFIG_START(m63_state::m63) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,XTAL_12MHz/4) /* 3 MHz */ @@ -793,12 +796,12 @@ static MACHINE_CONFIG_START( m63 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( atomboy, m63 ) +MACHINE_CONFIG_DERIVED(m63_state::atomboy, m63) MCFG_CPU_MODIFY("soundcpu") MCFG_CPU_PERIODIC_INT_DRIVER(m63_state, snd_irq, 60/2) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fghtbskt ) +MACHINE_CONFIG_START(m63_state::fghtbskt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz */ diff --git a/src/mame/drivers/m6805evs.cpp b/src/mame/drivers/m6805evs.cpp index 24cb5fb33d9..efaae0b6fbb 100644 --- a/src/mame/drivers/m6805evs.cpp +++ b/src/mame/drivers/m6805evs.cpp @@ -73,6 +73,7 @@ public: , m_maincpu(*this, "maincpu") { } + void m6805evs(machine_config &config); private: required_device m_maincpu; virtual void machine_reset() override; @@ -98,7 +99,7 @@ void m6805evs_state::machine_reset() { } -static MACHINE_CONFIG_START( m6805evs ) +MACHINE_CONFIG_START(m6805evs_state::m6805evs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6805, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/m68705prg.cpp b/src/mame/drivers/m68705prg.cpp index 31a22791ffb..2a8cd89e531 100644 --- a/src/mame/drivers/m68705prg.cpp +++ b/src/mame/drivers/m68705prg.cpp @@ -51,6 +51,8 @@ public: { } + void m68705prg(machine_config &config); + DECLARE_DEVICE_IMAGE_LOAD_MEMBER(eprom_load) { auto const desired(m_mcu_region.bytes()); @@ -177,6 +179,8 @@ public: m_mcu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } + void prg(machine_config &config); + protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override { @@ -219,7 +223,7 @@ INPUT_PORTS_START(m68705prg) INPUT_PORTS_END -MACHINE_CONFIG_START(m68705prg) +MACHINE_CONFIG_START(m68705prg_state_base::m68705prg) MCFG_QUANTUM_PERFECT_CPU("mcu") MCFG_GENERIC_SOCKET_ADD("eprom_image", generic_plain_slot, "eprom") @@ -235,28 +239,28 @@ MACHINE_CONFIG_START(m68705prg) MCFG_DEFAULT_LAYOUT(layout_m68705prg) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(m68705p3prg, m68705prg) +template<> MACHINE_CONFIG_DERIVED(p3prg_state::prg, m68705prg) MCFG_CPU_ADD("mcu", M68705P3, XTAL_1MHz) MCFG_M68705_PORTB_W_CB(WRITE8(p3prg_state, pb_w)) MCFG_MACHINE_RESET_OVERRIDE(p3prg_state, m68705prg) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(m68705p5prg, m68705prg) +template<> MACHINE_CONFIG_DERIVED(p5prg_state::prg, m68705prg) MCFG_CPU_ADD("mcu", M68705P5, XTAL_1MHz) MCFG_M68705_PORTB_W_CB(WRITE8(p5prg_state, pb_w)) MCFG_MACHINE_RESET_OVERRIDE(p5prg_state, m68705prg) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(m68705r3prg, m68705prg) +template<> MACHINE_CONFIG_DERIVED(r3prg_state::prg, m68705prg) MCFG_CPU_ADD("mcu", M68705R3, XTAL_1MHz) MCFG_M68705_PORTB_W_CB(WRITE8(r3prg_state, pb_w)) MCFG_MACHINE_RESET_OVERRIDE(r3prg_state, m68705prg) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(m68705u3prg, m68705prg) +template<> MACHINE_CONFIG_DERIVED(u3prg_state::prg, m68705prg) MCFG_CPU_ADD("mcu", M68705U3, XTAL_1MHz) MCFG_M68705_PORTB_W_CB(WRITE8(u3prg_state, pb_w)) @@ -288,7 +292,7 @@ ROM_END // YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS -COMP( 1984, 705p5prg, 0, 0, m68705p5prg, m68705prg, p5prg_state, m68705prg, "Motorola", "MC68705P5 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) -COMP( 1984, 705p3prg, 705p5prg, 0, m68705p3prg, m68705prg, p3prg_state, m68705prg, "Motorola", "MC68705P3 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) -COMP( 1984, 705r3prg, 705p5prg, 0, m68705r3prg, m68705prg, r3prg_state, m68705prg, "Motorola", "MC68705R3 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) -COMP( 1984, 705u3prg, 705p5prg, 0, m68705u3prg, m68705prg, u3prg_state, m68705prg, "Motorola", "MC68705U3 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) +COMP( 1984, 705p5prg, 0, 0, prg, m68705prg, p5prg_state, m68705prg, "Motorola", "MC68705P5 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) +COMP( 1984, 705p3prg, 705p5prg, 0, prg, m68705prg, p3prg_state, m68705prg, "Motorola", "MC68705P3 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) +COMP( 1984, 705r3prg, 705p5prg, 0, prg, m68705prg, r3prg_state, m68705prg, "Motorola", "MC68705R3 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) +COMP( 1984, 705u3prg, 705p5prg, 0, prg, m68705prg, u3prg_state, m68705prg, "Motorola", "MC68705U3 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp index 67beb832f37..0ab38b9f2d1 100644 --- a/src/mame/drivers/m72.cpp +++ b/src/mame/drivers/m72.cpp @@ -1839,7 +1839,7 @@ static GFXDECODE_START( majtitle ) GFXDECODE_END -static MACHINE_CONFIG_START( m72_audio_chips ) +MACHINE_CONFIG_START(m72_state::m72_audio_chips) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -1856,7 +1856,7 @@ static MACHINE_CONFIG_START( m72_audio_chips ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( m72_base ) +MACHINE_CONFIG_START(m72_state::m72_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ @@ -1884,13 +1884,13 @@ static MACHINE_CONFIG_START( m72_base ) MCFG_FRAGMENT_ADD(m72_audio_chips) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( m72, m72_base ) +MACHINE_CONFIG_DERIVED(m72_state::m72, m72_base) MCFG_CPU_MODIFY("soundcpu") MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, fake_nmi, 128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( m72_8751, m72_base ) +MACHINE_CONFIG_DERIVED(m72_state::m72_8751, m72_base) MCFG_CPU_ADD("mcu",I8751, XTAL_8MHz) /* Uses its own XTAL */ MCFG_CPU_IO_MAP(mcu_io_map) @@ -1898,7 +1898,7 @@ static MACHINE_CONFIG_DERIVED( m72_8751, m72_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rtype, m72_base ) +MACHINE_CONFIG_DERIVED(m72_state::rtype, m72_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(rtype_map) @@ -1909,7 +1909,7 @@ static MACHINE_CONFIG_DERIVED( rtype, m72_base ) MCFG_DEVICE_REMOVE("vref") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( m72_xmultipl, m72_8751 ) +MACHINE_CONFIG_DERIVED(m72_state::m72_xmultipl, m72_8751) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(xmultiplm72_map) @@ -1920,7 +1920,7 @@ static MACHINE_CONFIG_DERIVED( m72_xmultipl, m72_8751 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( m72_dbreed, m72_base ) +MACHINE_CONFIG_DERIVED(m72_state::m72_dbreed, m72_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(dbreedm72_map) @@ -1935,7 +1935,7 @@ MACHINE_CONFIG_END /****************************************** M81 ***********************************************/ // M81 is closest to M72 -static MACHINE_CONFIG_DERIVED( m81_hharry, m72_base ) +MACHINE_CONFIG_DERIVED(m72_state::m81_hharry, m72_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(hharry_map) MCFG_CPU_IO_MAP(m81_portmap) @@ -1951,7 +1951,7 @@ static MACHINE_CONFIG_DERIVED( m81_hharry, m72_base ) MCFG_SCREEN_UPDATE_DRIVER(m72_state, screen_update_m81) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( m81_xmultipl, m81_hharry ) +MACHINE_CONFIG_DERIVED(m72_state::m81_xmultipl, m81_hharry) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(xmultipl_map) @@ -1959,7 +1959,7 @@ static MACHINE_CONFIG_DERIVED( m81_xmultipl, m81_hharry ) MCFG_VIDEO_START_OVERRIDE(m72_state,xmultipl) // different offsets MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( m81_dbreed, m81_xmultipl ) +MACHINE_CONFIG_DERIVED(m72_state::m81_dbreed, m81_xmultipl) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(dbreed_map) MACHINE_CONFIG_END @@ -1967,7 +1967,7 @@ MACHINE_CONFIG_END /****************************************** M84 ***********************************************/ // M84 -static MACHINE_CONFIG_START( rtype2 ) +MACHINE_CONFIG_START(m72_state::rtype2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ @@ -1999,7 +1999,7 @@ static MACHINE_CONFIG_START( rtype2 ) MACHINE_CONFIG_END // not m72, different video system (less tiles regions?) (M84? M82?) -static MACHINE_CONFIG_DERIVED( hharryu, rtype2 ) +MACHINE_CONFIG_DERIVED(m72_state::hharryu, rtype2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(hharryu_map) @@ -2010,7 +2010,7 @@ MACHINE_CONFIG_END // M84 -static MACHINE_CONFIG_START( cosmccop ) +MACHINE_CONFIG_START(m72_state::cosmccop) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V35,MASTER_CLOCK/2) @@ -2042,7 +2042,7 @@ static MACHINE_CONFIG_START( cosmccop ) MCFG_FRAGMENT_ADD(m72_audio_chips) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kengo, cosmccop ) +MACHINE_CONFIG_DERIVED(m72_state::kengo, cosmccop) MCFG_CPU_MODIFY("maincpu") MCFG_V25_CONFIG(gunforce_decryption_table) MACHINE_CONFIG_END @@ -2056,7 +2056,7 @@ M82-A-A as the top board M82-B-A and as the bottom board */ -static MACHINE_CONFIG_START( m82 ) +MACHINE_CONFIG_START(m72_state::m82) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ @@ -2091,7 +2091,7 @@ MACHINE_CONFIG_END M85-A-B / M85-B */ -static MACHINE_CONFIG_START( poundfor ) +MACHINE_CONFIG_START(m72_state::poundfor) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */ diff --git a/src/mame/drivers/m79152pc.cpp b/src/mame/drivers/m79152pc.cpp index bb1f109870a..824d04ebc76 100644 --- a/src/mame/drivers/m79152pc.cpp +++ b/src/mame/drivers/m79152pc.cpp @@ -33,6 +33,7 @@ public: uint32_t screen_update_m79152pc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void m79152pc(machine_config &config); private: virtual void machine_reset() override; required_shared_ptr m_p_videoram; @@ -119,7 +120,7 @@ static GFXDECODE_START( m79152pc ) GFXDECODE_ENTRY( "chargen", 0x0000, m79152pc_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( m79152pc ) +MACHINE_CONFIG_START(m79152pc_state::m79152pc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/m79amb.cpp b/src/mame/drivers/m79amb.cpp index ab39c3f088e..5a5b08ebc5f 100644 --- a/src/mame/drivers/m79amb.cpp +++ b/src/mame/drivers/m79amb.cpp @@ -189,7 +189,7 @@ INTERRUPT_GEN_MEMBER(m79amb_state::m79amb_interrupt) device.execute().set_input_line_and_vector(0, HOLD_LINE, 0xcf); /* RST 08h */ } -static MACHINE_CONFIG_START( m79amb ) +MACHINE_CONFIG_START(m79amb_state::m79amb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_19_6608MHz / 10) diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp index 2ed7cb6e896..fbe3242dd5f 100644 --- a/src/mame/drivers/m90.cpp +++ b/src/mame/drivers/m90.cpp @@ -714,7 +714,7 @@ INTERRUPT_GEN_MEMBER(m90_state::bomblord_interrupt) /* Basic hardware -- no decryption table is setup for CPU */ -static MACHINE_CONFIG_START( m90 ) +MACHINE_CONFIG_START(m90_state::m90) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V35, XTAL_32MHz/2) MCFG_CPU_PROGRAM_MAP(m90_main_cpu_map) @@ -759,54 +759,54 @@ static MACHINE_CONFIG_START( m90 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hasamu, m90 ) +MACHINE_CONFIG_DERIVED(m90_state::hasamu, m90) MCFG_CPU_MODIFY("maincpu") MCFG_V25_CONFIG(gunforce_decryption_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quizf1, m90 ) +MACHINE_CONFIG_DERIVED(m90_state::quizf1, m90) MCFG_CPU_MODIFY("maincpu") MCFG_V25_CONFIG(lethalth_decryption_table) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(6*8, 54*8-1, 17*8-8, 47*8-1+8) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( matchit2, m90 ) +MACHINE_CONFIG_DERIVED(m90_state::matchit2, m90) MCFG_CPU_MODIFY("maincpu") MCFG_V25_CONFIG(matchit2_decryption_table) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(6*8, 54*8-1, 17*8-8, 47*8-1+8) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( riskchal, m90 ) +MACHINE_CONFIG_DERIVED(m90_state::riskchal, m90) MCFG_CPU_MODIFY("maincpu") MCFG_V25_CONFIG(gussun_decryption_table) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bombrman, m90 ) +MACHINE_CONFIG_DERIVED(m90_state::bombrman, m90) MCFG_CPU_MODIFY("maincpu") MCFG_V25_CONFIG(bomberman_decryption_table) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbmanwj, m90 ) +MACHINE_CONFIG_DERIVED(m90_state::bbmanwj, m90) MCFG_CPU_MODIFY("maincpu") MCFG_V25_CONFIG(dynablaster_decryption_table) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bbmanw, bbmanwj ) +MACHINE_CONFIG_DERIVED(m90_state::bbmanw, bbmanwj) MCFG_CPU_MODIFY("soundcpu") MCFG_CPU_IO_MAP(m99_sound_cpu_io_map) MCFG_CPU_PERIODIC_INT_DRIVER(m90_state, fake_nmi, 128*60) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bomblord, m90 ) +MACHINE_CONFIG_DERIVED(m90_state::bomblord, m90) MCFG_CPU_REPLACE("maincpu", V30, 32000000/4) MCFG_CPU_PROGRAM_MAP(bomblord_main_cpu_map) MCFG_CPU_IO_MAP(m90_main_cpu_io_map) @@ -824,7 +824,7 @@ static MACHINE_CONFIG_DERIVED( bomblord, m90 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dynablsb, m90 ) +MACHINE_CONFIG_DERIVED(m90_state::dynablsb, m90) MCFG_CPU_REPLACE("maincpu", V30, 32000000/4) MCFG_CPU_PROGRAM_MAP(dynablsb_main_cpu_map) MCFG_CPU_IO_MAP(dynablsb_main_cpu_io_map) diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp index 4719be6fa8d..8e7ad3a47ec 100644 --- a/src/mame/drivers/m92.cpp +++ b/src/mame/drivers/m92.cpp @@ -927,7 +927,7 @@ GFXDECODE_END /***************************************************************************/ -static MACHINE_CONFIG_START( m92 ) +MACHINE_CONFIG_START(m92_state::m92) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",V33,XTAL_18MHz/2) @@ -978,44 +978,44 @@ static MACHINE_CONFIG_START( m92 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gunforce, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::gunforce, m92) MCFG_CPU_MODIFY("soundcpu") MCFG_V25_CONFIG(gunforce_decryption_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bmaster, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::bmaster, m92) MCFG_CPU_MODIFY("soundcpu") MCFG_V25_CONFIG(bomberman_decryption_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lethalth, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::lethalth, m92) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(lethalth_map) MCFG_CPU_MODIFY("soundcpu") MCFG_V25_CONFIG(lethalth_decryption_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( uccops, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::uccops, m92) MCFG_CPU_MODIFY("soundcpu") MCFG_V25_CONFIG(dynablaster_decryption_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mysticri, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::mysticri, m92) MCFG_CPU_MODIFY("soundcpu") MCFG_V25_CONFIG(mysticri_decryption_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( majtitl2, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::majtitl2, m92) MCFG_CPU_MODIFY("soundcpu") MCFG_V25_CONFIG(majtitl2_decryption_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hook, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::hook, m92) MCFG_CPU_MODIFY("soundcpu") MCFG_V25_CONFIG(hook_decryption_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ppan, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::ppan, m92) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(ppan_portmap) @@ -1033,24 +1033,24 @@ static MACHINE_CONFIG_DERIVED( ppan, m92 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rtypeleo, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::rtypeleo, m92) MCFG_CPU_MODIFY("soundcpu") MCFG_V25_CONFIG(rtypeleo_decryption_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( inthunt, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::inthunt, m92) MCFG_CPU_MODIFY("soundcpu") MCFG_V25_CONFIG(inthunt_decryption_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nbbatman, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::nbbatman, m92) MCFG_CPU_MODIFY("soundcpu") MCFG_V25_CONFIG(leagueman_decryption_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nbbatman2bl, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::nbbatman2bl, m92) MCFG_DEVICE_REMOVE("soundcpu") MCFG_DEVICE_REMOVE("ymsnd") MCFG_DEVICE_REMOVE("irem") @@ -1062,21 +1062,21 @@ static MACHINE_CONFIG_DERIVED( nbbatman2bl, m92 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psoldier, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::psoldier, m92) MCFG_CPU_MODIFY("soundcpu") MCFG_V25_CONFIG(psoldier_decryption_table) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", psoldier) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dsoccr94j, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::dsoccr94j, m92) MCFG_CPU_MODIFY("soundcpu") MCFG_V25_CONFIG(dsoccr94_decryption_table) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", psoldier) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gunforc2, m92 ) +MACHINE_CONFIG_DERIVED(m92_state::gunforc2, m92) MCFG_CPU_MODIFY("soundcpu") MCFG_V25_CONFIG(lethalth_decryption_table) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp index 55acf706bfc..0f6f8fd46d5 100644 --- a/src/mame/drivers/mac.cpp +++ b/src/mame/drivers/mac.cpp @@ -910,7 +910,7 @@ static const floppy_interface mac_floppy_interface = "floppy_3_5" }; -static MACHINE_CONFIG_START( mac512ke ) +MACHINE_CONFIG_START(mac_state::mac512ke) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, C7M) /* 7.8336 MHz */ @@ -964,7 +964,7 @@ static MACHINE_CONFIG_START( mac512ke ) MCFG_RAM_DEFAULT_SIZE("512K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( macplus, mac512ke ) +MACHINE_CONFIG_DERIVED(mac_state::macplus, mac512ke) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(macplus_map) @@ -988,7 +988,7 @@ static MACHINE_CONFIG_DERIVED( macplus, mac512ke ) MCFG_SOFTWARE_LIST_ADD("hdd_list", "mac_hdd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( macse, macplus ) +MACHINE_CONFIG_DERIVED(mac_state::macse, macplus) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(macse_map) @@ -1012,7 +1012,7 @@ static MACHINE_CONFIG_DERIVED( macse, macplus ) MCFG_MACPDS_SLOT_ADD("sepds", "pds", mac_sepds_cards, nullptr) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( macclasc, macplus ) +MACHINE_CONFIG_DERIVED(mac_state::macclasc, macplus) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(macse_map) @@ -1033,7 +1033,7 @@ static MACHINE_CONFIG_DERIVED( macclasc, macplus ) MCFG_MACKBD_REMOVE(MACKBD_TAG) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( macprtb ) +MACHINE_CONFIG_START(mac_state::macprtb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, C15M) MCFG_CPU_PROGRAM_MAP(macprtb_map) @@ -1094,7 +1094,7 @@ static MACHINE_CONFIG_START( macprtb ) MCFG_SOFTWARE_LIST_ADD("hdd_list", "mac_hdd") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( macii ) +MACHINE_CONFIG_START(mac_state::macii) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68020PMMU, C15M) @@ -1166,13 +1166,13 @@ static MACHINE_CONFIG_START( macii ) MCFG_SOFTWARE_LIST_ADD("hdd_list", "mac_hdd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maciihmu, macii ) +MACHINE_CONFIG_DERIVED(mac_state::maciihmu, macii) MCFG_CPU_REPLACE("maincpu", M68020HMMU, C15M) MCFG_CPU_PROGRAM_MAP(macii_map) MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( maciifx ) +MACHINE_CONFIG_START(mac_state::maciifx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68030, 40000000) @@ -1234,7 +1234,7 @@ static MACHINE_CONFIG_START( maciifx ) MCFG_SOFTWARE_LIST_ADD("hdd_list", "mac_hdd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maclc, macii ) +MACHINE_CONFIG_DERIVED(mac_state::maclc, macii) MCFG_CPU_REPLACE("maincpu", M68020HMMU, C15M) MCFG_CPU_PROGRAM_MAP(maclc_map) @@ -1291,7 +1291,7 @@ static MACHINE_CONFIG_DERIVED( maclc, macii ) MCFG_QUANTUM_PERFECT_CPU("maincpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maclc2, maclc ) +MACHINE_CONFIG_DERIVED(mac_state::maclc2, maclc) MCFG_CPU_REPLACE("maincpu", M68030, C15M) MCFG_CPU_PROGRAM_MAP(maclc_map) @@ -1303,7 +1303,7 @@ static MACHINE_CONFIG_DERIVED( maclc2, maclc ) MCFG_RAM_EXTRA_OPTIONS("6M,8M,10M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maccclas, maclc2 ) +MACHINE_CONFIG_DERIVED(mac_state::maccclas, maclc2) MCFG_EGRET_REMOVE() MCFG_CUDA_ADD(CUDA_341S0788) // should be 0417, but that version won't sync up properly with the '030 right now @@ -1316,7 +1316,7 @@ static MACHINE_CONFIG_DERIVED( maccclas, maclc2 ) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_cdadb)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maclc3, maclc ) +MACHINE_CONFIG_DERIVED(mac_state::maclc3, maclc) MCFG_CPU_REPLACE("maincpu", M68030, 25000000) MCFG_CPU_PROGRAM_MAP(maclc3_map) @@ -1344,7 +1344,7 @@ static MACHINE_CONFIG_DERIVED( maclc3, maclc ) MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maclc520, maclc3 ) +MACHINE_CONFIG_DERIVED(mac_state::maclc520, maclc3) MCFG_EGRET_REMOVE() MCFG_CUDA_ADD(CUDA_341S0060) @@ -1357,7 +1357,7 @@ static MACHINE_CONFIG_DERIVED( maclc520, maclc3 ) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_cdadb)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maciivx, maclc ) +MACHINE_CONFIG_DERIVED(mac_state::maciivx, maclc) MCFG_CPU_REPLACE("maincpu", M68030, C32M) MCFG_CPU_PROGRAM_MAP(maclc3_map) @@ -1393,7 +1393,7 @@ static MACHINE_CONFIG_DERIVED( maciivx, maclc ) MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maciivi, maclc ) +MACHINE_CONFIG_DERIVED(mac_state::maciivi, maclc) MCFG_CPU_REPLACE("maincpu", M68030, C15M) MCFG_CPU_PROGRAM_MAP(maclc3_map) @@ -1429,7 +1429,7 @@ static MACHINE_CONFIG_DERIVED( maciivi, maclc ) MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maciix, macii ) +MACHINE_CONFIG_DERIVED(mac_state::maciix, macii) MCFG_CPU_REPLACE("maincpu", M68030, C15M) MCFG_CPU_PROGRAM_MAP(macii_map) @@ -1440,13 +1440,13 @@ static MACHINE_CONFIG_DERIVED( maciix, macii ) MCFG_RAM_EXTRA_OPTIONS("8M,32M,64M,96M,128M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maciicx, maciix ) // IIcx is a IIx with only slots 9/a/b +MACHINE_CONFIG_DERIVED(mac_state::maciicx, maciix) // IIcx is a IIx with only slots 9/a/b MCFG_NUBUS_SLOT_REMOVE("nbc") MCFG_NUBUS_SLOT_REMOVE("nbd") MCFG_NUBUS_SLOT_REMOVE("nbe") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( macse30 ) +MACHINE_CONFIG_START(mac_state::macse30) MCFG_CPU_ADD("maincpu", M68030, C15M) MCFG_CPU_PROGRAM_MAP(macse30_map) @@ -1524,7 +1524,7 @@ static MACHINE_CONFIG_START( macse30 ) MCFG_SOFTWARE_LIST_ADD("hdd_list", "mac_hdd") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( macpb140 ) +MACHINE_CONFIG_START(mac_state::macpb140) MCFG_CPU_ADD("maincpu", M68030, C15M) MCFG_CPU_PROGRAM_MAP(macpb140_map) @@ -1591,7 +1591,7 @@ static MACHINE_CONFIG_START( macpb140 ) MACHINE_CONFIG_END // PowerBook 145 = 140 @ 25 MHz (still 2MB RAM - the 145B upped that to 4MB) -static MACHINE_CONFIG_DERIVED( macpb145, macpb140 ) +MACHINE_CONFIG_DERIVED(mac_state::macpb145, macpb140) MCFG_CPU_REPLACE("maincpu", M68030, 25000000) MCFG_CPU_PROGRAM_MAP(macpb140_map) MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override) @@ -1602,7 +1602,7 @@ static MACHINE_CONFIG_DERIVED( macpb145, macpb140 ) MACHINE_CONFIG_END // PowerBook 170 = 140 @ 25 MHz with an active-matrix LCD (140/145/145B were passive) -static MACHINE_CONFIG_DERIVED( macpb170, macpb140 ) +MACHINE_CONFIG_DERIVED(mac_state::macpb170, macpb140) MCFG_CPU_REPLACE("maincpu", M68030, 25000000) MCFG_CPU_PROGRAM_MAP(macpb140_map) MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override) @@ -1612,7 +1612,7 @@ static MACHINE_CONFIG_DERIVED( macpb170, macpb140 ) MCFG_RAM_EXTRA_OPTIONS("6M,8M") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( macpb160 ) +MACHINE_CONFIG_START(mac_state::macpb160) MCFG_CPU_ADD("maincpu", M68030, 25000000) MCFG_CPU_PROGRAM_MAP(macpb160_map) @@ -1678,7 +1678,7 @@ static MACHINE_CONFIG_START( macpb160 ) MCFG_SOFTWARE_LIST_ADD("hdd_list", "mac_hdd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( macpb180, macpb160 ) +MACHINE_CONFIG_DERIVED(mac_state::macpb180, macpb160) MCFG_CPU_REPLACE("maincpu", M68030, 33000000) MCFG_CPU_PROGRAM_MAP(macpb160_map) MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override) @@ -1688,7 +1688,7 @@ static MACHINE_CONFIG_DERIVED( macpb180, macpb160 ) MCFG_RAM_EXTRA_OPTIONS("8M,12M,16M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( macpb180c, macpb160 ) +MACHINE_CONFIG_DERIVED(mac_state::macpb180c, macpb160) MCFG_CPU_REPLACE("maincpu", M68030, 33000000) MCFG_CPU_PROGRAM_MAP(macpb165c_map) MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override) @@ -1704,7 +1704,7 @@ static MACHINE_CONFIG_DERIVED( macpb180c, macpb160 ) MCFG_RAM_EXTRA_OPTIONS("8M,12M,16M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( macpd210, macpb160 ) +MACHINE_CONFIG_DERIVED(mac_state::macpd210, macpb160) MCFG_CPU_REPLACE("maincpu", M68030, 25000000) MCFG_CPU_PROGRAM_MAP(macpd210_map) MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override) @@ -1714,7 +1714,7 @@ static MACHINE_CONFIG_DERIVED( macpd210, macpb160 ) MCFG_RAM_EXTRA_OPTIONS("8M,12M,16M,20M,24M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( macclas2, maclc ) +MACHINE_CONFIG_DERIVED(mac_state::macclas2, maclc) MCFG_CPU_REPLACE("maincpu", M68030, C15M) MCFG_CPU_PROGRAM_MAP(maclc_map) MCFG_CPU_VBLANK_INT_DRIVER(MAC_SCREEN_NAME, mac_state, mac_rbv_vbl) @@ -1743,7 +1743,7 @@ static MACHINE_CONFIG_DERIVED( macclas2, maclc ) MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maciici, macii ) +MACHINE_CONFIG_DERIVED(mac_state::maciici, macii) MCFG_CPU_REPLACE("maincpu", M68030, 25000000) MCFG_CPU_PROGRAM_MAP(maciici_map) @@ -1774,7 +1774,7 @@ static MACHINE_CONFIG_DERIVED( maciici, macii ) MCFG_RAM_EXTRA_OPTIONS("4M,8M,16M,32M,48M,64M,128M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maciisi, macii ) +MACHINE_CONFIG_DERIVED(mac_state::maciisi, macii) MCFG_CPU_REPLACE("maincpu", M68030, 20000000) MCFG_CPU_PROGRAM_MAP(maciici_map) @@ -1818,7 +1818,7 @@ static MACHINE_CONFIG_DERIVED( maciisi, macii ) MCFG_QUANTUM_PERFECT_CPU("maincpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pwrmac ) +MACHINE_CONFIG_START(mac_state::pwrmac) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC601, 60000000) @@ -1886,7 +1886,7 @@ static MACHINE_CONFIG_START( pwrmac ) MCFG_CUDA_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( macqd700 ) +MACHINE_CONFIG_START(mac_state::macqd700) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68040, 25000000) MCFG_CPU_PROGRAM_MAP(quadra700_map) diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp index 92de438fa46..faf5fe55f99 100644 --- a/src/mame/drivers/mac128.cpp +++ b/src/mame/drivers/mac128.cpp @@ -259,6 +259,9 @@ public: void mac_driver_init(mac128model_t model); void update_volume(); + void mac512ke(machine_config &config); + void mac128k(machine_config &config); + void macplus(machine_config &config); private: // wait states for accessing the VIA int m_via_cycles; @@ -1320,7 +1323,7 @@ static const floppy_interface mac_floppy_interface = "floppy_3_5" }; -static MACHINE_CONFIG_START( mac512ke ) +MACHINE_CONFIG_START(mac128_state::mac512ke) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, C7M) /* 7.8336 MHz */ MCFG_CPU_PROGRAM_MAP(mac512ke_map) @@ -1376,7 +1379,7 @@ static MACHINE_CONFIG_START( mac512ke ) MCFG_SOFTWARE_LIST_ADD("hdd_list", "mac_hdd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mac128k, mac512ke ) +MACHINE_CONFIG_DERIVED(mac128_state::mac128k, mac512ke) /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) @@ -1384,7 +1387,7 @@ static MACHINE_CONFIG_DERIVED( mac128k, mac512ke ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( macplus, mac512ke ) +MACHINE_CONFIG_DERIVED(mac128_state::macplus, mac512ke) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(macplus_map) diff --git a/src/mame/drivers/macp.cpp b/src/mame/drivers/macp.cpp index eb8e8f786a5..785b7442fb5 100644 --- a/src/mame/drivers/macp.cpp +++ b/src/mame/drivers/macp.cpp @@ -17,6 +17,9 @@ public: : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } + void macp(machine_config &config); + void macpmsm(machine_config &config); + void macp0(machine_config &config); private: required_device m_maincpu; }; @@ -44,7 +47,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( cicplay ) INPUT_PORTS_END -static MACHINE_CONFIG_START( macp ) +MACHINE_CONFIG_START(macp_state::macp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2500000) MCFG_CPU_PROGRAM_MAP(macp_map) @@ -60,12 +63,12 @@ static MACHINE_CONFIG_START( macp ) MCFG_FRAGMENT_ADD( genpin_audio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( macp0, macp) +MACHINE_CONFIG_DERIVED(macp_state::macp0, macp) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(macp0_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( macpmsm, macp) +MACHINE_CONFIG_DERIVED(macp_state::macpmsm, macp) // MSM5205 MACHINE_CONFIG_END diff --git a/src/mame/drivers/macpci.cpp b/src/mame/drivers/macpci.cpp index d6406d98e7b..ccc9faa26c9 100644 --- a/src/mame/drivers/macpci.cpp +++ b/src/mame/drivers/macpci.cpp @@ -89,7 +89,7 @@ uint32_t macpci_state::screen_update_pippin(screen_device &screen, bitmap_ind16 return 0; } -static MACHINE_CONFIG_START( pippin ) +MACHINE_CONFIG_START(macpci_state::pippin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC603, 66000000) MCFG_CPU_PROGRAM_MAP(pippin_mem) diff --git a/src/mame/drivers/macrossp.cpp b/src/mame/drivers/macrossp.cpp index 26e54db6fe4..9c7f4d4a5cf 100644 --- a/src/mame/drivers/macrossp.cpp +++ b/src/mame/drivers/macrossp.cpp @@ -539,7 +539,7 @@ void macrossp_state::machine_reset() m_snd_toggle = 0; } -static MACHINE_CONFIG_START( macrossp ) +MACHINE_CONFIG_START(macrossp_state::macrossp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, 50000000/2) /* 25 MHz */ @@ -580,7 +580,7 @@ static MACHINE_CONFIG_START( macrossp ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quizmoon, macrossp ) +MACHINE_CONFIG_DERIVED(macrossp_state::quizmoon, macrossp) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 24*16-1, 0*8, 14*16-1) diff --git a/src/mame/drivers/macs.cpp b/src/mame/drivers/macs.cpp index 48f6b751e9a..1439005f66e 100644 --- a/src/mame/drivers/macs.cpp +++ b/src/mame/drivers/macs.cpp @@ -98,6 +98,7 @@ public: optional_device m_cart1; optional_device m_cart2; + void macs(machine_config &config); }; @@ -486,7 +487,7 @@ ST0016_DMA_OFFS_CB(macs_state::dma_offset) return m_cart_bank; } -static MACHINE_CONFIG_START( macs ) +MACHINE_CONFIG_START(macs_state::macs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",ST0016_CPU,8000000) /* 8 MHz ? */ MCFG_CPU_PROGRAM_MAP(macs_mem) diff --git a/src/mame/drivers/madalien.cpp b/src/mame/drivers/madalien.cpp index 497830f4e04..84b65042ac0 100644 --- a/src/mame/drivers/madalien.cpp +++ b/src/mame/drivers/madalien.cpp @@ -148,7 +148,7 @@ static INPUT_PORTS_START( madalien ) INPUT_PORTS_END -static MACHINE_CONFIG_START( madalien ) +MACHINE_CONFIG_START(madalien_state::madalien) /* main CPU */ MCFG_CPU_ADD("maincpu", M6502, MADALIEN_MAIN_CLOCK / 8) /* 1324kHz */ diff --git a/src/mame/drivers/madmotor.cpp b/src/mame/drivers/madmotor.cpp index d81b46b4b0d..6f0b744b56d 100644 --- a/src/mame/drivers/madmotor.cpp +++ b/src/mame/drivers/madmotor.cpp @@ -232,7 +232,7 @@ void madmotor_state::machine_reset() m_flipscreen = 0; } -static MACHINE_CONFIG_START( madmotor ) +MACHINE_CONFIG_START(madmotor_state::madmotor) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* Custom chip 59, 24 MHz crystal */ diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp index 477a5de51ae..1d2bf3139d4 100644 --- a/src/mame/drivers/magic10.cpp +++ b/src/mame/drivers/magic10.cpp @@ -150,6 +150,11 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void magic102(machine_config &config); + void magic10a(machine_config &config); + void magic10(machine_config &config); + void hotslot(machine_config &config); + void sgsafari(machine_config &config); }; @@ -737,7 +742,7 @@ GFXDECODE_END * Machine Drivers * ****************************/ -static MACHINE_CONFIG_START( magic10 ) +MACHINE_CONFIG_START(magic10_state::magic10) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) // 10 MHz. MCFG_CPU_PROGRAM_MAP(magic10_map) @@ -765,7 +770,7 @@ static MACHINE_CONFIG_START( magic10 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( magic10a, magic10 ) +MACHINE_CONFIG_DERIVED(magic10_state::magic10a, magic10) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -773,7 +778,7 @@ static MACHINE_CONFIG_DERIVED( magic10a, magic10 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( magic102, magic10 ) +MACHINE_CONFIG_DERIVED(magic10_state::magic102, magic10) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -784,7 +789,7 @@ static MACHINE_CONFIG_DERIVED( magic102, magic10 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hotslot, magic10 ) +MACHINE_CONFIG_DERIVED(magic10_state::hotslot, magic10) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -795,7 +800,7 @@ static MACHINE_CONFIG_DERIVED( hotslot, magic10 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sgsafari, magic10 ) +MACHINE_CONFIG_DERIVED(magic10_state::sgsafari, magic10) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp index a3234b46931..f70b31996c5 100644 --- a/src/mame/drivers/magicard.cpp +++ b/src/mame/drivers/magicard.cpp @@ -466,6 +466,8 @@ public: required_device m_maincpu; required_device m_screen; required_device m_palette; + void magicard(machine_config &config); + void hotslots(machine_config &config); }; @@ -983,7 +985,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, magicard_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( magicard ) +MACHINE_CONFIG_START(magicard_state::magicard) MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A / 2) /* SCC-68070 CCA84 datasheet */ MCFG_CPU_PROGRAM_MAP(magicard_mem) MCFG_CPU_VBLANK_INT_DRIVER("screen", magicard_state, magicard_irq) /* no interrupts? (it erases the vectors..) */ @@ -1003,7 +1005,7 @@ static MACHINE_CONFIG_START( magicard ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hotslots, magicard ) +MACHINE_CONFIG_DERIVED(magicard_state::hotslots, magicard) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(hotslots_mem) diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp index fec2be3368a..743ea260cf1 100644 --- a/src/mame/drivers/magicfly.cpp +++ b/src/mame/drivers/magicfly.cpp @@ -482,6 +482,9 @@ public: required_device m_maincpu; required_device m_dac; required_device m_gfxdecode; + void bchance(machine_config &config); + void magicfly(machine_config &config); + void _7mezzo(machine_config &config); }; @@ -932,7 +935,7 @@ GFXDECODE_END * Machine Drivers * *********************************************/ -static MACHINE_CONFIG_START( magicfly ) +MACHINE_CONFIG_START(magicfly_state::magicfly) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) /* guess */ @@ -966,7 +969,7 @@ static MACHINE_CONFIG_START( magicfly ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( 7mezzo, magicfly ) +MACHINE_CONFIG_DERIVED(magicfly_state::_7mezzo, magicfly) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(magicfly_state, 7mezzo) @@ -974,7 +977,7 @@ static MACHINE_CONFIG_DERIVED( 7mezzo, magicfly ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bchance, magicfly ) +MACHINE_CONFIG_DERIVED(magicfly_state::bchance, magicfly) /* video hardware */ MCFG_PALETTE_MODIFY("palette") @@ -1058,5 +1061,5 @@ ROM_END // YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS GAME( 198?, magicfly, 0, magicfly, magicfly, magicfly_state, 0, ROT0, "P&A Games", "Magic Fly", 0 ) -GAME( 198?, 7mezzo, 0, 7mezzo, 7mezzo, magicfly_state, 0, ROT0, "", "7 e Mezzo", 0 ) +GAME( 198?, 7mezzo, 0, _7mezzo, 7mezzo, magicfly_state, 0, ROT0, "", "7 e Mezzo", 0 ) GAME( 198?, bchance, 0, bchance, bchance, magicfly_state, 0, ROT0, "", "Bonne Chance! (French/English)", MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/drivers/magictg.cpp b/src/mame/drivers/magictg.cpp index 02d87412bf9..bb27a7f4ff3 100644 --- a/src/mame/drivers/magictg.cpp +++ b/src/mame/drivers/magictg.cpp @@ -226,6 +226,7 @@ public: void zr36120_reset(); + void magictg(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -897,7 +898,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( magictg ) +MACHINE_CONFIG_START(magictg_state::magictg) MCFG_CPU_ADD("mips", R5000BE, 150000000) /* TODO: CPU type and clock are unknown */ //MCFG_MIPS3_ICACHE_SIZE(16384) /* TODO: Unknown */ //MCFG_MIPS3_DCACHE_SIZE(16384) /* TODO: Unknown */ diff --git a/src/mame/drivers/magmax.cpp b/src/mame/drivers/magmax.cpp index 2b5692d881f..c1782f97239 100644 --- a/src/mame/drivers/magmax.cpp +++ b/src/mame/drivers/magmax.cpp @@ -325,7 +325,7 @@ static GFXDECODE_START( magmax ) GFXDECODE_END -static MACHINE_CONFIG_START( magmax ) +MACHINE_CONFIG_START(magmax_state::magmax) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */ diff --git a/src/mame/drivers/magnum.cpp b/src/mame/drivers/magnum.cpp index 33ce723634a..16d779b8409 100644 --- a/src/mame/drivers/magnum.cpp +++ b/src/mame/drivers/magnum.cpp @@ -29,6 +29,7 @@ public: DECLARE_WRITE8_MEMBER(beep_w); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void magnum(machine_config &config); protected: virtual void machine_reset() override; virtual void machine_start() override; @@ -143,7 +144,7 @@ static ADDRESS_MAP_START( magnum_io, AS_IO, 16, magnum_state ) AM_RANGE(0x0080, 0x008f) AM_DEVREADWRITE8("rtc", cdp1879_device, read, write, 0x00ff) ADDRESS_MAP_END -static MACHINE_CONFIG_START( magnum ) +MACHINE_CONFIG_START(magnum_state::magnum) MCFG_CPU_ADD("maincpu", I80186, XTAL_12MHz / 2) MCFG_CPU_PROGRAM_MAP(magnum_map) MCFG_CPU_IO_MAP(magnum_io) diff --git a/src/mame/drivers/magreel.cpp b/src/mame/drivers/magreel.cpp index 1ccfb60183d..44b36937ffd 100644 --- a/src/mame/drivers/magreel.cpp +++ b/src/mame/drivers/magreel.cpp @@ -43,6 +43,7 @@ public: bitmap.fill(rgb_t::black(), cliprect); return 0; } + void magreel(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -117,7 +118,7 @@ void magreel_state::machine_reset() } -static MACHINE_CONFIG_START( magreel ) +MACHINE_CONFIG_START(magreel_state::magreel) /* basic machine hardware - all information unknown */ // MCFG_CPU_ADD("maincpu",m68000,MAIN_CLOCK/12) diff --git a/src/mame/drivers/magtouch.cpp b/src/mame/drivers/magtouch.cpp index c3e4eaa190c..544f86717de 100644 --- a/src/mame/drivers/magtouch.cpp +++ b/src/mame/drivers/magtouch.cpp @@ -102,6 +102,8 @@ public: DECLARE_WRITE8_MEMBER(magtouch_io_w); DECLARE_WRITE8_MEMBER(dma8237_1_dack_w); virtual void machine_start() override; + static void magtouch_sb_conf(device_t *device); + void magtouch(machine_config &config); }; /************************************* @@ -177,12 +179,13 @@ static DEVICE_INPUT_DEFAULTS_START( magtouch_sb_def ) DEVICE_INPUT_DEFAULTS("CONFIG", 0x03, 0x01) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( magtouch_sb_conf ) - MCFG_DEVICE_MODIFY("pc_joy") +void magtouch_state::magtouch_sb_conf(device_t *device) +{ + device = device->subdevice("pc_joy"); MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, nullptr, true) // remove joystick -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_START( magtouch ) +MACHINE_CONFIG_START(magtouch_state::magtouch) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */ MCFG_CPU_PROGRAM_MAP(magtouch_map) diff --git a/src/mame/drivers/mainevt.cpp b/src/mame/drivers/mainevt.cpp index 647fb679e24..ac337beae62 100644 --- a/src/mame/drivers/mainevt.cpp +++ b/src/mame/drivers/mainevt.cpp @@ -406,7 +406,7 @@ INTERRUPT_GEN_MEMBER(mainevt_state::devstors_sound_timer_irq) device.execute().set_input_line(0, HOLD_LINE); } -static MACHINE_CONFIG_START( mainevt ) +MACHINE_CONFIG_START(mainevt_state::mainevt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* ?? */ @@ -454,7 +454,7 @@ static MACHINE_CONFIG_START( mainevt ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( devstors ) +MACHINE_CONFIG_START(mainevt_state::devstors) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* ?? */ diff --git a/src/mame/drivers/mainsnk.cpp b/src/mame/drivers/mainsnk.cpp index bc1551d5c59..231642b66c4 100644 --- a/src/mame/drivers/mainsnk.cpp +++ b/src/mame/drivers/mainsnk.cpp @@ -372,7 +372,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( mainsnk ) +MACHINE_CONFIG_START(mainsnk_state::mainsnk) MCFG_CPU_ADD("maincpu", Z80, 3360000) MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp index 771a3dad155..dbd73fd954e 100644 --- a/src/mame/drivers/majorpkr.cpp +++ b/src/mame/drivers/majorpkr.cpp @@ -511,6 +511,7 @@ public: TILE_GET_INFO_MEMBER(fg_get_tile_info); virtual void video_start() override; uint32_t screen_update_majorpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void majorpkr(machine_config &config); }; @@ -985,7 +986,7 @@ GFXDECODE_END * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( majorpkr ) +MACHINE_CONFIG_START(majorpkr_state::majorpkr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) // 6 MHz. MCFG_CPU_PROGRAM_MAP(map) diff --git a/src/mame/drivers/malzak.cpp b/src/mame/drivers/malzak.cpp index ce7ea3b9da2..7a5174d608c 100644 --- a/src/mame/drivers/malzak.cpp +++ b/src/mame/drivers/malzak.cpp @@ -295,7 +295,7 @@ void malzak_state::machine_reset() m_malzak_y = 0; } -static MACHINE_CONFIG_START( malzak ) +MACHINE_CONFIG_START(malzak_state::malzak) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 3800000/4) @@ -365,7 +365,7 @@ static MACHINE_CONFIG_START( malzak ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( malzak2, malzak ) +MACHINE_CONFIG_DERIVED(malzak_state::malzak2, malzak) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(malzak2_map) diff --git a/src/mame/drivers/manohman.cpp b/src/mame/drivers/manohman.cpp index 87725cbace7..d1752747c44 100644 --- a/src/mame/drivers/manohman.cpp +++ b/src/mame/drivers/manohman.cpp @@ -153,6 +153,7 @@ public: IRQ_CALLBACK_MEMBER(iack_handler); + void manohman(machine_config &config); private: virtual void machine_start() override; @@ -232,7 +233,7 @@ INPUT_PORTS_END * Machine Config * *********************************************/ -static MACHINE_CONFIG_START( manohman ) +MACHINE_CONFIG_START(manohman_state::manohman) MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) // MC68000P8 MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(manohman_state, iack_handler) diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp index 733266fe340..ee416686790 100644 --- a/src/mame/drivers/mappy.cpp +++ b/src/mame/drivers/mappy.cpp @@ -1312,7 +1312,7 @@ void mappy_state::machine_start() } -static MACHINE_CONFIG_START( superpac_common ) +MACHINE_CONFIG_START(mappy_state::superpac_common) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, PIXEL_CLOCK/4) /* 1.536 MHz */ @@ -1362,7 +1362,7 @@ static MACHINE_CONFIG_START( superpac_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( superpac ) +MACHINE_CONFIG_START(mappy_state::superpac) MCFG_FRAGMENT_ADD(superpac_common) @@ -1380,7 +1380,7 @@ static MACHINE_CONFIG_START( superpac ) MCFG_NAMCO56XX_OUT_0_CB(DEVWRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pacnpal ) +MACHINE_CONFIG_START(mappy_state::pacnpal) MCFG_FRAGMENT_ADD(superpac_common) @@ -1400,7 +1400,7 @@ static MACHINE_CONFIG_START( pacnpal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( grobda ) +MACHINE_CONFIG_START(mappy_state::grobda) MCFG_FRAGMENT_ADD(superpac_common) @@ -1424,7 +1424,7 @@ static MACHINE_CONFIG_START( grobda ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( phozon ) +MACHINE_CONFIG_START(mappy_state::phozon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, PIXEL_CLOCK/4) /* MAIN CPU */ @@ -1492,7 +1492,7 @@ static MACHINE_CONFIG_START( phozon ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mappy_common ) +MACHINE_CONFIG_START(mappy_state::mappy_common) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, PIXEL_CLOCK/4) /* 1.536 MHz */ @@ -1542,7 +1542,7 @@ static MACHINE_CONFIG_START( mappy_common ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mappy ) +MACHINE_CONFIG_START(mappy_state::mappy) MCFG_FRAGMENT_ADD(mappy_common) @@ -1560,7 +1560,7 @@ static MACHINE_CONFIG_START( mappy ) MCFG_NAMCO58XX_OUT_0_CB(DEVWRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( digdug2 ) +MACHINE_CONFIG_START(mappy_state::digdug2) MCFG_FRAGMENT_ADD(mappy_common) @@ -1581,7 +1581,7 @@ static MACHINE_CONFIG_START( digdug2 ) MCFG_NAMCO56XX_OUT_0_CB(DEVWRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( todruaga, digdug2 ) +MACHINE_CONFIG_DERIVED(mappy_state::todruaga, digdug2) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", todruaga) @@ -1589,7 +1589,7 @@ static MACHINE_CONFIG_DERIVED( todruaga, digdug2 ) MCFG_PALETTE_ENTRIES(64*4+64*16) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( motos ) +MACHINE_CONFIG_START(mappy_state::motos) MCFG_FRAGMENT_ADD(mappy_common) diff --git a/src/mame/drivers/marineb.cpp b/src/mame/drivers/marineb.cpp index fc756bbbaaf..6fd9efd7b27 100644 --- a/src/mame/drivers/marineb.cpp +++ b/src/mame/drivers/marineb.cpp @@ -526,7 +526,7 @@ INTERRUPT_GEN_MEMBER(marineb_state::wanted_vblank_irq) } -static MACHINE_CONFIG_START( marineb ) +MACHINE_CONFIG_START(marineb_state::marineb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* 3 MHz? */ @@ -559,7 +559,7 @@ static MACHINE_CONFIG_START( marineb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( changes, marineb ) +MACHINE_CONFIG_DERIVED(marineb_state::changes, marineb) /* basic machine hardware */ @@ -570,7 +570,7 @@ static MACHINE_CONFIG_DERIVED( changes, marineb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( springer, marineb ) +MACHINE_CONFIG_DERIVED(marineb_state::springer, marineb) /* basic machine hardware */ MCFG_DEVICE_MODIFY("outlatch") @@ -583,7 +583,7 @@ static MACHINE_CONFIG_DERIVED( springer, marineb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hoccer, marineb ) +MACHINE_CONFIG_DERIVED(marineb_state::hoccer, marineb) /* basic machine hardware */ @@ -594,7 +594,7 @@ static MACHINE_CONFIG_DERIVED( hoccer, marineb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wanted, marineb ) +MACHINE_CONFIG_DERIVED(marineb_state::wanted, marineb) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -615,7 +615,7 @@ static MACHINE_CONFIG_DERIVED( wanted, marineb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hopprobo, marineb ) +MACHINE_CONFIG_DERIVED(marineb_state::hopprobo, marineb) /* basic machine hardware */ @@ -626,7 +626,7 @@ static MACHINE_CONFIG_DERIVED( hopprobo, marineb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bcruzm12, wanted ) +MACHINE_CONFIG_DERIVED(marineb_state::bcruzm12, wanted) /* basic machine hardware */ MCFG_DEVICE_MODIFY("outlatch") diff --git a/src/mame/drivers/marinedt.cpp b/src/mame/drivers/marinedt.cpp index 198c71d990b..e77699b3d17 100644 --- a/src/mame/drivers/marinedt.cpp +++ b/src/mame/drivers/marinedt.cpp @@ -134,6 +134,7 @@ public: DECLARE_WRITE8_MEMBER(output_w); TILE_GET_INFO_MEMBER(get_tile_info); + void marinedt(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -621,7 +622,7 @@ PALETTE_INIT_MEMBER(marinedt_state, marinedt) } } -static MACHINE_CONFIG_START( marinedt ) +MACHINE_CONFIG_START(marinedt_state::marinedt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,MAIN_CLOCK/4) diff --git a/src/mame/drivers/mario.cpp b/src/mame/drivers/mario.cpp index e77418c86f4..ac75769b063 100644 --- a/src/mame/drivers/mario.cpp +++ b/src/mame/drivers/mario.cpp @@ -332,7 +332,7 @@ INTERRUPT_GEN_MEMBER(mario_state::vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -static MACHINE_CONFIG_START( mario_base ) +MACHINE_CONFIG_START(mario_state::mario_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, Z80_CLOCK) /* verified on pcb */ @@ -367,11 +367,11 @@ static MACHINE_CONFIG_START( mario_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mario, mario_base ) +MACHINE_CONFIG_DERIVED(mario_state::mario, mario_base) MCFG_FRAGMENT_ADD(mario_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( masao, mario_base ) +MACHINE_CONFIG_DERIVED(mario_state::masao, mario_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(4000000) /* 4.000 MHz (?) */ MCFG_CPU_PROGRAM_MAP(masao_map) diff --git a/src/mame/drivers/markham.cpp b/src/mame/drivers/markham.cpp index 212762dd692..426a62da6b3 100644 --- a/src/mame/drivers/markham.cpp +++ b/src/mame/drivers/markham.cpp @@ -177,7 +177,7 @@ static GFXDECODE_START( markham ) GFXDECODE_END -static MACHINE_CONFIG_START( markham ) +MACHINE_CONFIG_START(markham_state::markham) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */ diff --git a/src/mame/drivers/marywu.cpp b/src/mame/drivers/marywu.cpp index e4839e6a874..2a1a8107186 100644 --- a/src/mame/drivers/marywu.cpp +++ b/src/mame/drivers/marywu.cpp @@ -39,6 +39,7 @@ public: DECLARE_WRITE8_MEMBER(ay2_port_b_w); DECLARE_READ8_MEMBER(keyboard_r); DECLARE_READ8_MEMBER(port_r); + void marywu(machine_config &config); private: uint8_t m_selected_7seg_module; }; @@ -181,7 +182,7 @@ static ADDRESS_MAP_START( io_map, AS_IO, 8, marywu_state ) AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P3) AM_READ(port_r) ADDRESS_MAP_END -static MACHINE_CONFIG_START( marywu ) +MACHINE_CONFIG_START(marywu_state::marywu) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C31, XTAL_10_738635MHz) //actual CPU is a Winbond w78c31b-24 MCFG_CPU_PROGRAM_MAP(program_map) diff --git a/src/mame/drivers/mastboy.cpp b/src/mame/drivers/mastboy.cpp index 14927ca30f2..84e264db430 100644 --- a/src/mame/drivers/mastboy.cpp +++ b/src/mame/drivers/mastboy.cpp @@ -494,6 +494,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(interrupt); + void mastboy(machine_config &config); }; @@ -840,7 +841,7 @@ void mastboy_state::machine_reset() -static MACHINE_CONFIG_START( mastboy ) +MACHINE_CONFIG_START(mastboy_state::mastboy) MCFG_CPU_ADD("maincpu", Z180, 12000000/2) /* HD647180X0CP6-1M1R */ MCFG_CPU_PROGRAM_MAP(mastboy_map) MCFG_CPU_IO_MAP(mastboy_io_map) diff --git a/src/mame/drivers/matmania.cpp b/src/mame/drivers/matmania.cpp index 534eb6fa618..26766e35a25 100644 --- a/src/mame/drivers/matmania.cpp +++ b/src/mame/drivers/matmania.cpp @@ -295,7 +295,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( matmania ) +MACHINE_CONFIG_START(matmania_state::matmania) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */ @@ -338,7 +338,7 @@ static MACHINE_CONFIG_START( matmania ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( maniach ) +MACHINE_CONFIG_START(matmania_state::maniach) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */ diff --git a/src/mame/drivers/maxaflex.cpp b/src/mame/drivers/maxaflex.cpp index 6daafa91faf..edab18b704e 100644 --- a/src/mame/drivers/maxaflex.cpp +++ b/src/mame/drivers/maxaflex.cpp @@ -61,6 +61,7 @@ public: WRITE_LINE_MEMBER(pia_cb2_w) { } // This is used by Floppy drive on Atari 8bits Home Computers TIMER_DEVICE_CALLBACK_MEMBER(mf_interrupt); + void maxaflex(machine_config &config); protected: virtual void machine_reset() override; @@ -306,7 +307,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( maxaflex_state::mf_interrupt ) m_antic->generic_interrupt(2); } -static MACHINE_CONFIG_START( maxaflex ) +MACHINE_CONFIG_START(maxaflex_state::maxaflex) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT) MCFG_CPU_PROGRAM_MAP(a600xl_mem) diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp index 0c176878fe0..f6b596356e3 100644 --- a/src/mame/drivers/maygay1b.cpp +++ b/src/mame/drivers/maygay1b.cpp @@ -771,7 +771,7 @@ ADDRESS_MAP_END // machine driver for maygay m1 board ///////////////////////////////// -MACHINE_CONFIG_START( maygay_m1 ) +MACHINE_CONFIG_START(maygay1b_state::maygay_m1) MCFG_CPU_ADD("maincpu", MC6809, M1_MASTER_CLOCK/2) // claimed to be 4 MHz MCFG_CPU_PROGRAM_MAP(m1_memmap) @@ -848,11 +848,11 @@ MACHINE_CONFIG_START( maygay_m1 ) MCFG_DEFAULT_LAYOUT(layout_maygay1b) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( maygay_m1_no_oki, maygay_m1 ) +MACHINE_CONFIG_DERIVED(maygay1b_state::maygay_m1_no_oki, maygay_m1) MCFG_DEVICE_REMOVE("msm6376") MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( maygay_m1_nec, maygay_m1 ) +MACHINE_CONFIG_DERIVED(maygay1b_state::maygay_m1_nec, maygay_m1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(m1_nec_memmap) diff --git a/src/mame/drivers/maygayep.cpp b/src/mame/drivers/maygayep.cpp index d0579fb5a31..0bfec3c8336 100644 --- a/src/mame/drivers/maygayep.cpp +++ b/src/mame/drivers/maygayep.cpp @@ -47,6 +47,7 @@ public: { } + void maygayep(machine_config &config); protected: // devices @@ -103,7 +104,7 @@ DRIVER_INIT_MEMBER(maygayep_state,maygayep) } -static MACHINE_CONFIG_START( maygayep ) +MACHINE_CONFIG_START(maygayep_state::maygayep) MCFG_CPU_ADD("maincpu", H83002, 16000000 ) MCFG_CPU_PROGRAM_MAP( maygayep_map ) diff --git a/src/mame/drivers/maygaysw.cpp b/src/mame/drivers/maygaysw.cpp index d92474910c4..bef0db0f8d5 100644 --- a/src/mame/drivers/maygaysw.cpp +++ b/src/mame/drivers/maygaysw.cpp @@ -109,6 +109,7 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } required_device m_maincpu; + void maygayew(machine_config &config); }; @@ -125,7 +126,7 @@ static INPUT_PORTS_START( maygayew ) INPUT_PORTS_END -static MACHINE_CONFIG_START( maygayew ) +MACHINE_CONFIG_START(maygayew_state::maygayew) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,8000000) // MC68306FC16 - standard 68000 core + peripherals diff --git a/src/mame/drivers/maygayv1.cpp b/src/mame/drivers/maygayv1.cpp index 7577957b9cc..2e9f66dbd92 100644 --- a/src/mame/drivers/maygayv1.cpp +++ b/src/mame/drivers/maygayv1.cpp @@ -256,6 +256,7 @@ public: DECLARE_READ8_MEMBER(data_to_i8031); DECLARE_WRITE_LINE_MEMBER(duart_irq_handler); DECLARE_WRITE_LINE_MEMBER(duart_txa); + void maygayv1(machine_config &config); }; @@ -864,7 +865,7 @@ INTERRUPT_GEN_MEMBER(maygayv1_state::vsync_interrupt) } -static MACHINE_CONFIG_START( maygayv1 ) +MACHINE_CONFIG_START(maygayv1_state::maygayv1) MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", maygayv1_state, vsync_interrupt) diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp index 18a1e6f5a8d..15dca30496d 100644 --- a/src/mame/drivers/mazerbla.cpp +++ b/src/mame/drivers/mazerbla.cpp @@ -183,6 +183,8 @@ public: TIMER_CALLBACK_MEMBER(deferred_ls670_0_w); TIMER_CALLBACK_MEMBER(deferred_ls670_1_w); IRQ_CALLBACK_MEMBER(irq_callback); + void greatgun(machine_config &config); + void mazerbla(machine_config &config); }; @@ -941,7 +943,7 @@ void mazerbla_state::machine_reset() } } -static MACHINE_CONFIG_START( mazerbla ) +MACHINE_CONFIG_START(mazerbla_state::mazerbla) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */ @@ -986,7 +988,7 @@ static MACHINE_CONFIG_START( mazerbla ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( greatgun ) +MACHINE_CONFIG_START(mazerbla_state::greatgun) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */ diff --git a/src/mame/drivers/mbc200.cpp b/src/mame/drivers/mbc200.cpp index db2075b1658..db1cfd0c33b 100644 --- a/src/mame/drivers/mbc200.cpp +++ b/src/mame/drivers/mbc200.cpp @@ -82,6 +82,7 @@ public: MC6845_UPDATE_ROW(update_row); required_device m_palette; + void mbc200(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -290,7 +291,7 @@ static GFXDECODE_START( mbc200 ) GFXDECODE_END -static MACHINE_CONFIG_START( mbc200 ) +MACHINE_CONFIG_START(mbc200_state::mbc200) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz/2) // NEC D780C-1 MCFG_CPU_PROGRAM_MAP(mbc200_mem) diff --git a/src/mame/drivers/mbc55x.cpp b/src/mame/drivers/mbc55x.cpp index 38dd2683577..53530769422 100644 --- a/src/mame/drivers/mbc55x.cpp +++ b/src/mame/drivers/mbc55x.cpp @@ -238,7 +238,7 @@ static SLOT_INTERFACE_START( mbc55x_floppies ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( mbc55x ) +MACHINE_CONFIG_START(mbc55x_state::mbc55x) /* basic machine hardware */ MCFG_CPU_ADD(MAINCPU_TAG, I8088, 3600000) MCFG_CPU_PROGRAM_MAP(mbc55x_mem) diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp index aea1b93f130..6cf212aee08 100644 --- a/src/mame/drivers/mbee.cpp +++ b/src/mame/drivers/mbee.cpp @@ -629,7 +629,7 @@ static SLOT_INTERFACE_START( mbee_floppies ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( mbee ) +MACHINE_CONFIG_START(mbee_state::mbee) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 6) /* 2 MHz */ MCFG_CPU_PROGRAM_MAP(mbee_mem) @@ -688,7 +688,7 @@ static MACHINE_CONFIG_START( mbee ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mbeeic ) +MACHINE_CONFIG_START(mbee_state::mbeeic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_13_5MHz / 4) /* 3.37500 MHz */ MCFG_CPU_PROGRAM_MAP(mbeeic_mem) @@ -746,13 +746,13 @@ static MACHINE_CONFIG_START( mbeeic ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mbeepc, mbeeic ) +MACHINE_CONFIG_DERIVED(mbee_state::mbeepc, mbeeic) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(mbeepc_mem) MCFG_CPU_IO_MAP(mbeepc_io) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mbeeppc, mbeeic ) +MACHINE_CONFIG_DERIVED(mbee_state::mbeeppc, mbeeic) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(mbeeppc_mem) MCFG_CPU_IO_MAP(mbeeppc_io) @@ -764,7 +764,7 @@ static MACHINE_CONFIG_DERIVED( mbeeppc, mbeeic ) MCFG_MC146818_IRQ_HANDLER(WRITELINE(mbee_state, rtc_irq_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mbee56, mbeeic ) +MACHINE_CONFIG_DERIVED(mbee_state::mbee56, mbeeic) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(mbee56_mem) MCFG_CPU_IO_MAP(mbee56_io) @@ -779,7 +779,7 @@ static MACHINE_CONFIG_DERIVED( mbee56, mbeeic ) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mbee128, mbee56 ) +MACHINE_CONFIG_DERIVED(mbee_state::mbee128, mbee56) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(mbee256_mem) MCFG_CPU_IO_MAP(mbee128_io) @@ -788,7 +788,7 @@ static MACHINE_CONFIG_DERIVED( mbee128, mbee56 ) MCFG_MC146818_IRQ_HANDLER(WRITELINE(mbee_state, rtc_irq_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mbee128p, mbeeppc ) +MACHINE_CONFIG_DERIVED(mbee_state::mbee128p, mbeeppc) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(mbee256_mem) MCFG_CPU_IO_MAP(mbee128_io) @@ -803,7 +803,7 @@ static MACHINE_CONFIG_DERIVED( mbee128p, mbeeppc ) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mbee256, mbee128p ) +MACHINE_CONFIG_DERIVED(mbee_state::mbee256, mbee128p) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(mbee256_mem) MCFG_CPU_IO_MAP(mbee256_io) @@ -817,7 +817,7 @@ static MACHINE_CONFIG_DERIVED( mbee256, mbee128p ) MCFG_FLOPPY_DRIVE_SOUND(true) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mbeett, mbeeppc ) +MACHINE_CONFIG_DERIVED(mbee_state::mbeett, mbeeppc) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(mbeett_mem) MCFG_CPU_IO_MAP(mbeett_io) diff --git a/src/mame/drivers/mc10.cpp b/src/mame/drivers/mc10.cpp index f809b883967..1b56b618b67 100644 --- a/src/mame/drivers/mc10.cpp +++ b/src/mame/drivers/mc10.cpp @@ -49,6 +49,9 @@ public: DECLARE_READ8_MEMBER(mc6847_videoram_r); TIMER_DEVICE_CALLBACK_MEMBER(alice32_scanline); + void alice90(machine_config &config); + void alice32(machine_config &config); + void mc10(machine_config &config); protected: // device-level overrides virtual void driver_start() override; @@ -497,7 +500,7 @@ INPUT_PORTS_END MACHINE DRIVERS ***************************************************************************/ -MACHINE_CONFIG_START( mc10 ) +MACHINE_CONFIG_START(mc10_state::mc10) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6803, XTAL_3_579545MHz) /* 0,894886 MHz */ @@ -533,7 +536,7 @@ MACHINE_CONFIG_START( mc10 ) MCFG_SOFTWARE_LIST_ADD("cass_list", "mc10") MACHINE_CONFIG_END -MACHINE_CONFIG_START( alice32 ) +MACHINE_CONFIG_START(mc10_state::alice32) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6803, XTAL_3_579545MHz) @@ -576,7 +579,7 @@ MACHINE_CONFIG_START( alice32 ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("mc10_cass", "mc10") MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( alice90, alice32 ) +MACHINE_CONFIG_DERIVED(mc10_state::alice90, alice32) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(alice90_mem) diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp index 50214286023..71dd2552c04 100644 --- a/src/mame/drivers/mc1000.cpp +++ b/src/mame/drivers/mc1000.cpp @@ -122,6 +122,7 @@ public: DECLARE_DRIVER_INIT(mc1000); TIMER_DEVICE_CALLBACK_MEMBER(ne555_tick); + void mc1000(machine_config &config); }; /* Memory Banking */ @@ -532,7 +533,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mc1000_state::ne555_tick) m_maincpu->set_input_line(INPUT_LINE_IRQ0, param); } -static MACHINE_CONFIG_START( mc1000 ) +MACHINE_CONFIG_START(mc1000_state::mc1000) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, 3579545) diff --git a/src/mame/drivers/mc1502.cpp b/src/mame/drivers/mc1502.cpp index 9c99c957128..29d41117105 100644 --- a/src/mame/drivers/mc1502.cpp +++ b/src/mame/drivers/mc1502.cpp @@ -246,7 +246,7 @@ static INPUT_PORTS_START( mc1502 ) PORT_INCLUDE( mc7007_3_keyboard ) INPUT_PORTS_END -static MACHINE_CONFIG_START( mc1502 ) +MACHINE_CONFIG_START(mc1502_state::mc1502) MCFG_CPU_ADD("maincpu", I8088, XTAL_16MHz/3) MCFG_CPU_PROGRAM_MAP(mc1502_map) MCFG_CPU_IO_MAP(mc1502_io) diff --git a/src/mame/drivers/mc8020.cpp b/src/mame/drivers/mc8020.cpp index a839d4b0a01..6423ad513d5 100644 --- a/src/mame/drivers/mc8020.cpp +++ b/src/mame/drivers/mc8020.cpp @@ -38,6 +38,7 @@ public: DECLARE_WRITE8_MEMBER(port_b_w); uint32_t screen_update_mc8020(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void mc8020(machine_config &config); private: u8 m_row; required_shared_ptr m_p_videoram; @@ -289,7 +290,7 @@ static const z80_daisy_config daisy_chain[] = { nullptr } }; -static MACHINE_CONFIG_START( mc8020 ) +MACHINE_CONFIG_START(mc8020_state::mc8020) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_2_4576MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/mc8030.cpp b/src/mame/drivers/mc8030.cpp index cee323f6b30..019603831e1 100644 --- a/src/mame/drivers/mc8030.cpp +++ b/src/mame/drivers/mc8030.cpp @@ -50,6 +50,7 @@ public: DECLARE_WRITE8_MEMBER(asp_port_b_w); uint32_t screen_update_mc8030(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void mc8030(machine_config &config); private: required_region_ptr m_p_videoram; required_device m_maincpu; @@ -176,7 +177,7 @@ static const z80_daisy_config daisy_chain[] = }; -static MACHINE_CONFIG_START( mc8030 ) +MACHINE_CONFIG_START(mc8030_state::mc8030) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_2_4576MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/mcatadv.cpp b/src/mame/drivers/mcatadv.cpp index fbba4532907..e730a2eaadb 100644 --- a/src/mame/drivers/mcatadv.cpp +++ b/src/mame/drivers/mcatadv.cpp @@ -428,7 +428,7 @@ void mcatadv_state::machine_start() save_item(NAME(m_palette_bank2)); } -static MACHINE_CONFIG_START( mcatadv ) +MACHINE_CONFIG_START(mcatadv_state::mcatadv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */ @@ -472,7 +472,7 @@ static MACHINE_CONFIG_START( mcatadv ) MCFG_SOUND_ROUTE(2, "rspeaker", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nost, mcatadv ) +MACHINE_CONFIG_DERIVED(mcatadv_state::nost, mcatadv) MCFG_CPU_MODIFY("soundcpu") MCFG_CPU_PROGRAM_MAP(nost_sound_map) diff --git a/src/mame/drivers/mcb216.cpp b/src/mame/drivers/mcb216.cpp index b8eac5475fe..61dc8ae4680 100644 --- a/src/mame/drivers/mcb216.cpp +++ b/src/mame/drivers/mcb216.cpp @@ -52,6 +52,8 @@ public: DECLARE_MACHINE_RESET(mcb216); DECLARE_MACHINE_RESET(cb308); + void mcb216(machine_config &config); + void cb308(machine_config &config); private: required_device m_maincpu; required_device m_uart; @@ -131,7 +133,7 @@ MACHINE_RESET_MEMBER( mcb216_state, cb308 ) m_maincpu->set_state_int(Z80_PC, 0xe000); } -static MACHINE_CONFIG_START( mcb216 ) +MACHINE_CONFIG_START(mcb216_state::mcb216) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(mcb216_mem) @@ -147,7 +149,7 @@ static MACHINE_CONFIG_START( mcb216 ) MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cb308 ) +MACHINE_CONFIG_START(mcb216_state::cb308) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(cb308_mem) diff --git a/src/mame/drivers/mccpm.cpp b/src/mame/drivers/mccpm.cpp index e681fdf4948..4393be8f8ea 100644 --- a/src/mame/drivers/mccpm.cpp +++ b/src/mame/drivers/mccpm.cpp @@ -43,6 +43,7 @@ public: , m_p_ram(*this, "ram") { } + void mccpm(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -73,7 +74,7 @@ void mccpm_state::machine_reset() memcpy(m_p_ram, bios, 0x1000); } -static MACHINE_CONFIG_START( mccpm ) +MACHINE_CONFIG_START(mccpm_state::mccpm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(mccpm_mem) diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp index 2b9954067d0..313384e8bab 100644 --- a/src/mame/drivers/mcr.cpp +++ b/src/mame/drivers/mcr.cpp @@ -1741,7 +1741,7 @@ static const char *const twotiger_sample_names[] = *************************************/ /* 90009 CPU board plus 90908/90913/91483 sound board */ -static MACHINE_CONFIG_START( mcr_90009 ) +MACHINE_CONFIG_START(mcr_state::mcr_90009) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_OSC_MCR_I/8) @@ -1782,7 +1782,7 @@ MACHINE_CONFIG_END /* as above, but in a casino cabinet */ -static MACHINE_CONFIG_DERIVED( mcr_90009_dp, mcr_90009 ) +MACHINE_CONFIG_DERIVED(mcr_dpoker_state::mcr_90009_dp, mcr_90009) /* basic machine hardware */ MCFG_TIMER_DRIVER_ADD("coinin", mcr_dpoker_state, coin_in_callback) @@ -1791,7 +1791,7 @@ MACHINE_CONFIG_END /* 90010 CPU board plus 90908/90913/91483 sound board */ -static MACHINE_CONFIG_DERIVED( mcr_90010, mcr_90009 ) +MACHINE_CONFIG_DERIVED(mcr_state::mcr_90010, mcr_90009) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1806,7 +1806,7 @@ MACHINE_CONFIG_END /* as above, plus 8-track tape */ -static MACHINE_CONFIG_DERIVED( mcr_90010_tt, mcr_90010 ) +MACHINE_CONFIG_DERIVED(mcr_state::mcr_90010_tt, mcr_90010) /* sound hardware */ MCFG_SOUND_ADD("samples", SAMPLES, 0) @@ -1818,7 +1818,7 @@ MACHINE_CONFIG_END /* 91475 CPU board plus 90908/90913/91483 sound board plus cassette interface */ -static MACHINE_CONFIG_DERIVED( mcr_91475, mcr_90010 ) +MACHINE_CONFIG_DERIVED(mcr_state::mcr_91475, mcr_90010) /* video hardware */ MCFG_PALETTE_MODIFY("palette") @@ -1835,7 +1835,7 @@ MACHINE_CONFIG_END /* 91490 CPU board plus 90908/90913/91483 sound board */ -static MACHINE_CONFIG_DERIVED( mcr_91490, mcr_90010 ) +MACHINE_CONFIG_DERIVED(mcr_state::mcr_91490, mcr_90010) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1849,7 +1849,7 @@ MACHINE_CONFIG_END /* 91490 CPU board plus 90908/90913/91483 sound board plus Squawk n' Talk sound board */ -static MACHINE_CONFIG_DERIVED( mcr_91490_snt, mcr_91490 ) +MACHINE_CONFIG_DERIVED(mcr_state::mcr_91490_snt, mcr_91490) /* basic machine hardware */ MCFG_SOUND_ADD("snt", MIDWAY_SQUAWK_N_TALK, 0) @@ -1859,7 +1859,7 @@ MACHINE_CONFIG_END /* 91490 CPU board plus 90908/90913/91483 sound board plus Squawk n' Talk sound board plus IPU */ -static MACHINE_CONFIG_DERIVED( mcr_91490_ipu, mcr_91490_snt ) +MACHINE_CONFIG_DERIVED(mcr_nflfoot_state::mcr_91490_ipu, mcr_91490_snt) /* basic machine hardware */ MCFG_CPU_ADD("ipu", Z80, 7372800/2) @@ -1886,7 +1886,7 @@ MACHINE_CONFIG_END /* 91490 CPU board plus 90908/90913/91483 sound board plus Turbo Cheap Squeak sound board */ -static MACHINE_CONFIG_DERIVED( mcr_91490_tcs, mcr_91490 ) +MACHINE_CONFIG_DERIVED(mcr_state::mcr_91490_tcs, mcr_91490) /* basic machine hardware */ MCFG_SOUND_ADD("tcs", MIDWAY_TURBO_CHEAP_SQUEAK, 0) diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp index 3715e42db61..e960ad6d577 100644 --- a/src/mame/drivers/mcr3.cpp +++ b/src/mame/drivers/mcr3.cpp @@ -1081,7 +1081,7 @@ GFXDECODE_END *************************************/ /* Core MCR monoboard system with no sound */ -static MACHINE_CONFIG_START( mcrmono ) +MACHINE_CONFIG_START(mcr3_state::mcrmono) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4) @@ -1121,7 +1121,7 @@ MACHINE_CONFIG_END /* Sarge/Demolition Derby Mono/Max RPM = MCR monoboard with Turbo Cheap Squeak */ -static MACHINE_CONFIG_DERIVED( mono_tcs, mcrmono ) +MACHINE_CONFIG_DERIVED(mcr3_state::mono_tcs, mcrmono) /* basic machine hardware */ MCFG_SOUND_ADD("tcs", MIDWAY_TURBO_CHEAP_SQUEAK, 0) @@ -1129,7 +1129,7 @@ static MACHINE_CONFIG_DERIVED( mono_tcs, mcrmono ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maxrpm, mono_tcs ) +MACHINE_CONFIG_DERIVED(mcr3_state::maxrpm, mono_tcs) MCFG_ADC0844_ADD("adc") MCFG_ADC0844_CH1_CB(IOPORT("MONO.IP1")) MCFG_ADC0844_CH2_CB(IOPORT("MONO.IP1.ALT1")) @@ -1139,7 +1139,7 @@ MACHINE_CONFIG_END /* Rampage/Power Drive/Star Guards = MCR monoboard with Sounds Good */ -static MACHINE_CONFIG_DERIVED( mono_sg, mcrmono ) +MACHINE_CONFIG_DERIVED(mcr3_state::mono_sg, mcrmono) /* basic machine hardware */ MCFG_SOUND_ADD("sg", MIDWAY_SOUNDS_GOOD, 0) @@ -1152,7 +1152,7 @@ MACHINE_CONFIG_END /* Core scrolling system with SSIO sound */ -static MACHINE_CONFIG_DERIVED( mcrscroll, mcrmono ) +MACHINE_CONFIG_DERIVED(mcr3_state::mcrscroll, mcrmono) /* basic machine hardware */ MCFG_SOUND_ADD("ssio", MIDWAY_SSIO, 0) @@ -1178,7 +1178,7 @@ MACHINE_CONFIG_END /* Spy Hunter = scrolling system with an SSIO and a cheap squeak deluxe */ -static MACHINE_CONFIG_DERIVED( mcrsc_csd, mcrscroll ) +MACHINE_CONFIG_DERIVED(mcr3_state::mcrsc_csd, mcrscroll) /* basic machine hardware */ MCFG_SOUND_ADD("csd", MIDWAY_CHEAP_SQUEAK_DELUXE, 0) diff --git a/src/mame/drivers/mcr68.cpp b/src/mame/drivers/mcr68.cpp index c4ba85d7df2..2cb9afd3338 100644 --- a/src/mame/drivers/mcr68.cpp +++ b/src/mame/drivers/mcr68.cpp @@ -892,7 +892,7 @@ GFXDECODE_END =================================================================*/ -static MACHINE_CONFIG_START( mcr68 ) +MACHINE_CONFIG_START(mcr68_state::mcr68) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 7723800) @@ -928,14 +928,14 @@ static MACHINE_CONFIG_START( mcr68 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( xenophob, mcr68 ) +MACHINE_CONFIG_DERIVED(mcr68_state::xenophob, mcr68) /* basic machine hardware */ MCFG_SOUND_ADD("sg", MIDWAY_SOUNDS_GOOD, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( intlaser, mcr68 ) +MACHINE_CONFIG_DERIVED(mcr68_state::intlaser, mcr68) /* basic machine hardware */ MCFG_SOUND_ADD("sg", MIDWAY_SOUNDS_GOOD, 0) @@ -946,7 +946,7 @@ static MACHINE_CONFIG_DERIVED( intlaser, mcr68 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spyhunt2, mcr68 ) +MACHINE_CONFIG_DERIVED(mcr68_state::spyhunt2, mcr68) /* basic machine hardware */ MCFG_SOUND_ADD("sg", MIDWAY_SOUNDS_GOOD, 0) @@ -962,7 +962,7 @@ static MACHINE_CONFIG_DERIVED( spyhunt2, mcr68 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( archrivl, mcr68 ) +MACHINE_CONFIG_DERIVED(mcr68_state::archrivl, mcr68) /* basic machine hardware */ MCFG_SOUND_ADD("cvsd", WILLIAMS_CVSD_SOUND, 0) @@ -970,7 +970,7 @@ static MACHINE_CONFIG_DERIVED( archrivl, mcr68 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pigskin, mcr68 ) +MACHINE_CONFIG_DERIVED(mcr68_state::pigskin, mcr68) /* basic machine hardware */ MCFG_SOUND_ADD("cvsd", WILLIAMS_CVSD_SOUND, 0) @@ -981,7 +981,7 @@ static MACHINE_CONFIG_DERIVED( pigskin, mcr68 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( trisport, mcr68 ) +MACHINE_CONFIG_DERIVED(mcr68_state::trisport, mcr68) /* basic machine hardware */ MCFG_SOUND_ADD("cvsd", WILLIAMS_CVSD_SOUND, 0) diff --git a/src/mame/drivers/meadows.cpp b/src/mame/drivers/meadows.cpp index 39242ae9745..5bf2b390c30 100644 --- a/src/mame/drivers/meadows.cpp +++ b/src/mame/drivers/meadows.cpp @@ -610,7 +610,7 @@ static const char *const bowl3d_sample_names[] = * *************************************/ -static MACHINE_CONFIG_START( meadows ) +MACHINE_CONFIG_START(meadows_state::meadows) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */ @@ -647,7 +647,7 @@ static MACHINE_CONFIG_START( meadows ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( minferno ) +MACHINE_CONFIG_START(meadows_state::minferno) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/24) /* 5MHz / 8 / 3 = 208.33 kHz */ @@ -671,7 +671,7 @@ static MACHINE_CONFIG_START( minferno ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bowl3d ) +MACHINE_CONFIG_START(meadows_state::bowl3d) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */ diff --git a/src/mame/drivers/meadwttl.cpp b/src/mame/drivers/meadwttl.cpp index 0884d4a5c3b..6587996cd71 100644 --- a/src/mame/drivers/meadwttl.cpp +++ b/src/mame/drivers/meadwttl.cpp @@ -52,6 +52,7 @@ public: required_device m_maincpu; required_device m_video; + void meadows(machine_config &config); protected: // driver_device overrides @@ -92,7 +93,7 @@ void meadwttl_state::video_start() { } -static MACHINE_CONFIG_START( meadows ) +MACHINE_CONFIG_START(meadwttl_state::meadows) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/mediagx.cpp b/src/mame/drivers/mediagx.cpp index c50ff6daee4..7490094dfb5 100644 --- a/src/mame/drivers/mediagx.cpp +++ b/src/mame/drivers/mediagx.cpp @@ -190,6 +190,7 @@ public: void report_speedups(); void install_speedups(const speedup_entry *entries, int count); void init_mediagx(); + void mediagx(machine_config &config); }; // Display controller registers @@ -871,7 +872,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, mediagx_state ) AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START( mediagx ) +MACHINE_CONFIG_START(mediagx_state::mediagx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MEDIAGX, 166000000) diff --git a/src/mame/drivers/megadriv.cpp b/src/mame/drivers/megadriv.cpp index 6f2567a7c40..4de34a95097 100644 --- a/src/mame/drivers/megadriv.cpp +++ b/src/mame/drivers/megadriv.cpp @@ -377,7 +377,7 @@ WRITE_LINE_MEMBER(md_cons_state::screen_vblank_console) } } -static MACHINE_CONFIG_START( ms_megadriv ) +MACHINE_CONFIG_START(md_cons_state::ms_megadriv) MCFG_FRAGMENT_ADD( md_ntsc ) MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megadriv) @@ -390,7 +390,7 @@ static MACHINE_CONFIG_START( ms_megadriv ) MCFG_SOFTWARE_LIST_ADD("cart_list","megadriv") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ms_megadpal ) +MACHINE_CONFIG_START(md_cons_state::ms_megadpal) MCFG_FRAGMENT_ADD( md_pal ) MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megadriv) @@ -403,11 +403,11 @@ static MACHINE_CONFIG_START( ms_megadpal ) MCFG_SOFTWARE_LIST_ADD("cart_list","megadriv") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( genesis_tmss, ms_megadriv ) +MACHINE_CONFIG_DERIVED(md_cons_state::genesis_tmss, ms_megadriv) MCFG_SOFTWARE_LIST_FILTER("cart_list","TMSS") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dcat16_megadriv ) +MACHINE_CONFIG_START(md_cons_state::dcat16_megadriv) MCFG_FRAGMENT_ADD( dcat16_megadriv_base ) MCFG_MACHINE_START_OVERRIDE(md_cons_state, md_common) @@ -597,7 +597,7 @@ void md_cons_state::_32x_scanline_helper_callback(int scanline) m_32x->_32x_render_videobuffer_to_screenbuffer_helper(scanline); } -static MACHINE_CONFIG_START( genesis_32x ) +MACHINE_CONFIG_START(md_cons_state::genesis_32x) MCFG_FRAGMENT_ADD( md_ntsc ) MCFG_MACHINE_START_OVERRIDE(md_cons_state, md_common) @@ -638,7 +638,7 @@ static MACHINE_CONFIG_START( genesis_32x ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mdj_32x ) +MACHINE_CONFIG_START(md_cons_state::mdj_32x) MCFG_FRAGMENT_ADD( md_ntsc ) MCFG_MACHINE_START_OVERRIDE(md_cons_state, md_common) @@ -679,7 +679,7 @@ static MACHINE_CONFIG_START( mdj_32x ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( md_32x ) +MACHINE_CONFIG_START(md_cons_state::md_32x) MCFG_FRAGMENT_ADD( md_pal ) MCFG_MACHINE_START_OVERRIDE(md_cons_state, md_common) @@ -752,7 +752,7 @@ ROM_END /****************************************** SegaCD emulation ****************************************/ -static MACHINE_CONFIG_START( genesis_scd ) +MACHINE_CONFIG_START(md_cons_state::genesis_scd) MCFG_FRAGMENT_ADD( md_ntsc ) MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd) @@ -770,7 +770,7 @@ static MACHINE_CONFIG_START( genesis_scd ) MCFG_SOFTWARE_LIST_ADD("cd_list","segacd") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( md_scd ) +MACHINE_CONFIG_START(md_cons_state::md_scd) MCFG_FRAGMENT_ADD( md_pal ) MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd) @@ -788,7 +788,7 @@ static MACHINE_CONFIG_START( md_scd ) MCFG_SOFTWARE_LIST_ADD("cd_list","megacd") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mdj_scd ) +MACHINE_CONFIG_START(md_cons_state::mdj_scd) MCFG_FRAGMENT_ADD( md_ntsc ) MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd) @@ -808,7 +808,7 @@ MACHINE_CONFIG_END /******************SEGA CD + 32X****************************/ -static MACHINE_CONFIG_DERIVED( genesis_32x_scd, genesis_32x ) +MACHINE_CONFIG_DERIVED(md_cons_state::genesis_32x_scd, genesis_32x) MCFG_DEVICE_ADD("segacd", SEGA_SEGACD_US, 0) MCFG_GFX_PALETTE("gen_vdp:palette") @@ -827,7 +827,7 @@ static MACHINE_CONFIG_DERIVED( genesis_32x_scd, genesis_32x ) MCFG_SOFTWARE_LIST_ADD("cd_list", "segacd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( md_32x_scd, md_32x ) +MACHINE_CONFIG_DERIVED(md_cons_state::md_32x_scd, md_32x) MCFG_DEVICE_ADD("segacd", SEGA_SEGACD_EUROPE, 0) MCFG_GFX_PALETTE("gen_vdp:palette") @@ -846,7 +846,7 @@ static MACHINE_CONFIG_DERIVED( md_32x_scd, md_32x ) MCFG_SOFTWARE_LIST_ADD("cd_list", "megacd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mdj_32x_scd, mdj_32x ) +MACHINE_CONFIG_DERIVED(md_cons_state::mdj_32x_scd, mdj_32x) MCFG_DEVICE_ADD("segacd", SEGA_SEGACD_JAPAN, 0) MCFG_GFX_PALETTE("gen_vdp:palette") diff --git a/src/mame/drivers/megadrvb.cpp b/src/mame/drivers/megadrvb.cpp index d94bd7b55dd..0259cdf7f36 100644 --- a/src/mame/drivers/megadrvb.cpp +++ b/src/mame/drivers/megadrvb.cpp @@ -283,7 +283,7 @@ static ADDRESS_MAP_START( md_bootleg_map, AS_PROGRAM, 16, md_boot_state ) AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) AM_SHARE("megadrive_ram") ADDRESS_MAP_END -MACHINE_CONFIG_START( md_bootleg ) +MACHINE_CONFIG_START(md_boot_state::md_bootleg) MCFG_FRAGMENT_ADD( md_ntsc ) MCFG_CPU_MODIFY("maincpu") @@ -678,7 +678,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( megadrvb ) +MACHINE_CONFIG_START(md_boot_state::megadrvb) MCFG_FRAGMENT_ADD(md_ntsc) MCFG_MACHINE_START_OVERRIDE(md_boot_state, md_bootleg) MACHINE_CONFIG_END @@ -697,7 +697,7 @@ MACHINE_START_MEMBER(md_boot_state, md_6button) m_io_timeout[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(md_base_state::io_timeout_timer_callback),this), (void*)(uintptr_t)i); } -static MACHINE_CONFIG_START( megadrvb_6b ) +MACHINE_CONFIG_START(md_boot_state::megadrvb_6b) MCFG_FRAGMENT_ADD(md_ntsc) MCFG_MACHINE_START_OVERRIDE(md_boot_state, md_6button) MACHINE_CONFIG_END diff --git a/src/mame/drivers/megaphx.cpp b/src/mame/drivers/megaphx.cpp index 5e478fb9615..5c7b803f6d6 100644 --- a/src/mame/drivers/megaphx.cpp +++ b/src/mame/drivers/megaphx.cpp @@ -109,6 +109,7 @@ public: DECLARE_DRIVER_INIT(megaphx); + void megaphx(machine_config &config); private: required_device m_maincpu; required_shared_ptr m_mainram; @@ -301,7 +302,7 @@ WRITE_LINE_MEMBER( megaphx_state::dsw_w ) m_dsw_data = state; } -static MACHINE_CONFIG_START( megaphx ) +MACHINE_CONFIG_START(megaphx_state::megaphx) MCFG_CPU_ADD("maincpu", M68000, 8000000) // ?? can't read xtal due to reflections, CPU is an 8Mhz part MCFG_CPU_PROGRAM_MAP(megaphx_68k_map) diff --git a/src/mame/drivers/megaplay.cpp b/src/mame/drivers/megaplay.cpp index fd2e70a1ef2..05e869b74d7 100644 --- a/src/mame/drivers/megaplay.cpp +++ b/src/mame/drivers/megaplay.cpp @@ -88,6 +88,7 @@ public: DECLARE_MACHINE_RESET(megaplay); uint32_t screen_update_megplay(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void megaplay(machine_config &config); private: uint32_t m_bios_mode; // determines whether ROM banks or Game data is to read from 0x8000-0xffff @@ -657,7 +658,7 @@ MACHINE_RESET_MEMBER(mplay_state,megaplay) MACHINE_RESET_CALL_MEMBER(megadriv); } -static MACHINE_CONFIG_START( megaplay ) +MACHINE_CONFIG_START(mplay_state::megaplay) /* basic machine hardware */ MCFG_FRAGMENT_ADD(md_ntsc) diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp index 49da6a26756..9d9173f2703 100644 --- a/src/mame/drivers/megasys1.cpp +++ b/src/mame/drivers/megasys1.cpp @@ -1668,7 +1668,7 @@ GFXDECODE_END /* Provided by Jim Hernandez: 3.5MHz for FM, 30KHz (!) for ADPCM */ -static MACHINE_CONFIG_START( system_A ) +MACHINE_CONFIG_START(megasys1_state::system_A) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz verified */ @@ -1722,22 +1722,22 @@ static MACHINE_CONFIG_START( system_A ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system_A_hachoo, system_A ) +MACHINE_CONFIG_DERIVED(megasys1_state::system_A_hachoo, system_A) MCFG_MACHINE_RESET_OVERRIDE(megasys1_state,megasys1_hachoo) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system_A_iganinju, system_A ) +MACHINE_CONFIG_DERIVED(megasys1_state::system_A_iganinju, system_A) MCFG_CPU_MODIFY("maincpu") MCFG_DEVICE_REMOVE("scantimer") MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", megasys1_state, megasys1A_iganinju_scanline, "screen", 0, 1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system_A_soldam, system_A ) +MACHINE_CONFIG_DERIVED(megasys1_state::system_A_soldam, system_A) MCFG_DEVICE_MODIFY("scroll1") MCFG_MEGASYS1_TILEMAP_8X8_SCROLL_FACTOR(4) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kickoffb, system_A ) +MACHINE_CONFIG_DERIVED(megasys1_state::kickoffb, system_A) MCFG_CPU_MODIFY("audiocpu") MCFG_CPU_PROGRAM_MAP(kickoffb_sound_map) @@ -1750,7 +1750,7 @@ static MACHINE_CONFIG_DERIVED( kickoffb, system_A ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system_B, system_A ) +MACHINE_CONFIG_DERIVED(megasys1_state::system_B, system_A) /* basic machine hardware */ @@ -1765,12 +1765,12 @@ static MACHINE_CONFIG_DERIVED( system_B, system_A ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system_B_monkelf, system_B ) +MACHINE_CONFIG_DERIVED(megasys1_state::system_B_monkelf, system_B) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(megasys1B_monkelf_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( system_Bbl ) +MACHINE_CONFIG_START(megasys1_state::system_Bbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, SYS_B_CPU_CLOCK) @@ -1809,7 +1809,7 @@ static MACHINE_CONFIG_START( system_Bbl ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system_B_hayaosi1, system_B ) +MACHINE_CONFIG_DERIVED(megasys1_state::system_B_hayaosi1, system_B) /* basic machine hardware */ @@ -1823,7 +1823,7 @@ static MACHINE_CONFIG_DERIVED( system_B_hayaosi1, system_B ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system_C, system_A ) +MACHINE_CONFIG_DERIVED(megasys1_state::system_C, system_A) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1848,7 +1848,7 @@ MACHINE_CONFIG_END ***************************************************************************/ -static MACHINE_CONFIG_START( system_D ) +MACHINE_CONFIG_START(megasys1_state::system_D) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, SYS_D_CPU_CLOCK) /* 8MHz */ @@ -1898,7 +1898,7 @@ MACHINE_CONFIG_END ***************************************************************************/ -static MACHINE_CONFIG_START( system_Z ) +MACHINE_CONFIG_START(megasys1_state::system_Z) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz (12MHz / 2) */ diff --git a/src/mame/drivers/megatech.cpp b/src/mame/drivers/megatech.cpp index a2f6dfb4c3d..b9732856f8e 100644 --- a/src/mame/drivers/megatech.cpp +++ b/src/mame/drivers/megatech.cpp @@ -142,6 +142,9 @@ public: uint32_t screen_update_menu(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_main); + void megatech(machine_config &config); + void megatech_multislot(machine_config &config); + void megatech_fixedslot(machine_config &config); private: uint8_t m_mt_cart_select_reg; uint32_t m_bios_port_ctrl; @@ -668,7 +671,7 @@ uint32_t mtech_state::screen_update_menu(screen_device &screen, bitmap_rgb32 &bi } -static MACHINE_CONFIG_START( megatech ) +MACHINE_CONFIG_START(mtech_state::megatech) /* basic machine hardware */ MCFG_FRAGMENT_ADD(md_ntsc) @@ -761,7 +764,7 @@ image_init_result mtech_state::load_cart(device_image_interface &image, generic_ MCFG_GENERIC_CARTSLOT_ADD(_tag, generic_plain_slot, "megatech_cart") \ MCFG_GENERIC_LOAD(mtech_state, _load) -static MACHINE_CONFIG_DERIVED( megatech_multislot, megatech ) +MACHINE_CONFIG_DERIVED(mtech_state::megatech_multislot, megatech) // add cart slots MCFG_MEGATECH_CARTSLOT_ADD("mt_slot1", mt_cart1) @@ -777,7 +780,7 @@ static MACHINE_CONFIG_DERIVED( megatech_multislot, megatech ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( megatech_fixedslot, megatech ) +MACHINE_CONFIG_DERIVED(mtech_state::megatech_fixedslot, megatech) // add cart slots MCFG_MEGATECH_CARTSLOT_ADD("mt_slot1", mt_cart1) diff --git a/src/mame/drivers/megazone.cpp b/src/mame/drivers/megazone.cpp index 8d08cc9a52d..9601567ab3f 100644 --- a/src/mame/drivers/megazone.cpp +++ b/src/mame/drivers/megazone.cpp @@ -289,7 +289,7 @@ INTERRUPT_GEN_MEMBER(megazone_state::vblank_irq) } -static MACHINE_CONFIG_START( megazone ) +MACHINE_CONFIG_START(megazone_state::megazone) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI1, XTAL_18_432MHz/9) /* 2.048 MHz */ diff --git a/src/mame/drivers/meijinsn.cpp b/src/mame/drivers/meijinsn.cpp index fb80b531af7..a812c2088e8 100644 --- a/src/mame/drivers/meijinsn.cpp +++ b/src/mame/drivers/meijinsn.cpp @@ -106,6 +106,7 @@ public: DECLARE_PALETTE_INIT(meijinsn); uint32_t screen_update_meijinsn(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(meijinsn_interrupt); + void meijinsn(machine_config &config); }; @@ -351,7 +352,7 @@ void meijinsn_state::machine_reset() } -static MACHINE_CONFIG_START( meijinsn ) +MACHINE_CONFIG_START(meijinsn_state::meijinsn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 9000000 ) diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp index 39400bce047..b727eb64ddd 100644 --- a/src/mame/drivers/mekd2.cpp +++ b/src/mame/drivers/mekd2.cpp @@ -114,6 +114,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(mekd2_c); TIMER_DEVICE_CALLBACK_MEMBER(mekd2_p); + void mekd2(machine_config &config); private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; uint8_t m_cass_data[4]; @@ -362,7 +363,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mekd2_state::mekd2_p) ************************************************************/ -static MACHINE_CONFIG_START( mekd2 ) +MACHINE_CONFIG_START(mekd2_state::mekd2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_MEKD2 / 2) /* 614.4 kHz */ MCFG_CPU_PROGRAM_MAP(mekd2_mem) diff --git a/src/mame/drivers/mephisto.cpp b/src/mame/drivers/mephisto.cpp index 79621f44587..f24ed79a2d4 100644 --- a/src/mame/drivers/mephisto.cpp +++ b/src/mame/drivers/mephisto.cpp @@ -116,6 +116,10 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(update_nmi_r5); TIMER_DEVICE_CALLBACK_MEMBER(update_irq); + void rebel5(machine_config &config); + void mm4tk(machine_config &config); + void mm2(machine_config &config); + void mephisto(machine_config &config); protected: required_ioport m_key1_0; required_ioport m_key1_1; @@ -352,7 +356,7 @@ void mephisto_state::machine_reset() } -static MACHINE_CONFIG_START( mephisto ) +MACHINE_CONFIG_START(mephisto_state::mephisto) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M65C02,4915200) /* 65C02 */ MCFG_CPU_PROGRAM_MAP(mephisto_mem) @@ -369,7 +373,7 @@ static MACHINE_CONFIG_START( mephisto ) MCFG_DEFAULT_LAYOUT(layout_mephisto) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rebel5, mephisto ) +MACHINE_CONFIG_DERIVED(mephisto_state::rebel5, mephisto) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(rebel5_mem) @@ -378,7 +382,7 @@ static MACHINE_CONFIG_DERIVED( rebel5, mephisto ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mm2, mephisto ) +MACHINE_CONFIG_DERIVED(mephisto_state::mm2, mephisto) MCFG_CPU_REPLACE("maincpu", M65C02, 3700000) MCFG_CPU_PROGRAM_MAP(mm2_mem) MCFG_MACHINE_START_OVERRIDE(mephisto_state, mm2 ) @@ -387,7 +391,7 @@ static MACHINE_CONFIG_DERIVED( mm2, mephisto ) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer", mephisto_state, update_irq, attotime::from_hz(450)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mm4tk, mephisto ) +MACHINE_CONFIG_DERIVED(mephisto_state::mm4tk, mephisto) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_REPLACE("maincpu", M65C02, 18000000) MCFG_CPU_PROGRAM_MAP(mephisto_mem) diff --git a/src/mame/drivers/mephisto_montec.cpp b/src/mame/drivers/mephisto_montec.cpp index c0db9fa5826..6e317b6ce2b 100644 --- a/src/mame/drivers/mephisto_montec.cpp +++ b/src/mame/drivers/mephisto_montec.cpp @@ -63,6 +63,12 @@ public: DECLARE_WRITE8_MEMBER(mondial2_input_mux_w); TIMER_DEVICE_CALLBACK_MEMBER(refresh_leds); + void smondial(machine_config &config); + void mondial2(machine_config &config); + void smondial2(machine_config &config); + void montec(machine_config &config); + void monteciv(machine_config &config); + void megaiv(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -434,7 +440,7 @@ static INPUT_PORTS_START( smondial2 ) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Clear") PORT_CODE(KEYCODE_BACKSPACE) INPUT_PORTS_END -static MACHINE_CONFIG_START( montec ) +MACHINE_CONFIG_START(mephisto_montec_state::montec) MCFG_CPU_ADD("maincpu", M65C02, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP( montec_mem ) MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_assert, (double)XTAL_4MHz / (1 << 13)) @@ -450,12 +456,12 @@ static MACHINE_CONFIG_START( montec ) MCFG_DEFAULT_LAYOUT(layout_mephisto_montec) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( monteciv, montec ) +MACHINE_CONFIG_DERIVED(mephisto_montec_state::monteciv, montec) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK( XTAL_8MHz ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( megaiv, montec ) +MACHINE_CONFIG_DERIVED(mephisto_montec_state::megaiv, montec) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK( XTAL_4_9152MHz ) MCFG_CPU_PROGRAM_MAP(megaiv_mem) @@ -467,7 +473,7 @@ static MACHINE_CONFIG_DERIVED( megaiv, montec ) MCFG_DEFAULT_LAYOUT(layout_mephisto_megaiv) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mondial2, megaiv ) +MACHINE_CONFIG_DERIVED(mephisto_montec_state::mondial2, megaiv) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK( XTAL_2MHz ) MCFG_CPU_PROGRAM_MAP(mondial2_mem) @@ -477,14 +483,14 @@ static MACHINE_CONFIG_DERIVED( mondial2, megaiv ) MCFG_DEFAULT_LAYOUT(layout_mephisto_mondial2) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( smondial, megaiv ) +MACHINE_CONFIG_DERIVED(mephisto_montec_state::smondial, megaiv) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK( XTAL_4MHz ) MCFG_CPU_PROGRAM_MAP(smondial_mem) MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, (double)XTAL_4MHz / (1 << 13)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( smondial2, smondial ) +MACHINE_CONFIG_DERIVED(mephisto_montec_state::smondial2, smondial) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(smondial2_mem) diff --git a/src/mame/drivers/mephistp.cpp b/src/mame/drivers/mephistp.cpp index f6983074be4..6aadcc10f75 100644 --- a/src/mame/drivers/mephistp.cpp +++ b/src/mame/drivers/mephistp.cpp @@ -41,6 +41,7 @@ public: DECLARE_READ8_MEMBER(ay8910_inputs_r); DECLARE_WRITE8_MEMBER(sound_rombank_w); + void mephisto(machine_config &config); private: u8 m_ay8910_data; bool m_ay8910_bdir; @@ -154,7 +155,7 @@ void mephisto_pinball_state::machine_reset() { } -static MACHINE_CONFIG_START( mephisto ) +MACHINE_CONFIG_START(mephisto_pinball_state::mephisto) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, XTAL_18MHz/3) MCFG_CPU_PROGRAM_MAP(mephisto_map) diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp index 8195deb8cc1..f4e179ac9f7 100644 --- a/src/mame/drivers/merit.cpp +++ b/src/mame/drivers/merit.cpp @@ -133,6 +133,17 @@ public: MC6845_UPDATE_ROW(crtc_update_row); required_device m_maincpu; required_device m_screen; + void misdraw(machine_config &config); + void couple(machine_config &config); + void phrcraze(machine_config &config); + void dtrvwz5(machine_config &config); + void casino5(machine_config &config); + void dodge(machine_config &config); + void tictac(machine_config &config); + void trvwhiz(machine_config &config); + void trvwhziv(machine_config &config); + void bigappg(machine_config &config); + void pitboss(machine_config &config); }; @@ -1357,7 +1368,7 @@ MACHINE_START_MEMBER(merit_state,casino5) membank("bank2")->set_entry(0); } -static MACHINE_CONFIG_START( pitboss ) +MACHINE_CONFIG_START(merit_state::pitboss) MCFG_CPU_ADD("maincpu",Z80, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(pitboss_map) MCFG_CPU_IO_MAP(trvwhiz_io_map) @@ -1393,7 +1404,7 @@ static MACHINE_CONFIG_START( pitboss ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( casino5, pitboss ) +MACHINE_CONFIG_DERIVED(merit_state::casino5, pitboss) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(casino5_map) @@ -1403,7 +1414,7 @@ static MACHINE_CONFIG_DERIVED( casino5, pitboss ) MCFG_MACHINE_START_OVERRIDE(merit_state,casino5) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bigappg, pitboss ) +MACHINE_CONFIG_DERIVED(merit_state::bigappg, pitboss) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bigappg_map) @@ -1412,7 +1423,7 @@ static MACHINE_CONFIG_DERIVED( bigappg, pitboss ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( misdraw, bigappg ) +MACHINE_CONFIG_DERIVED(merit_state::misdraw, bigappg) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(misdraw_map) @@ -1420,7 +1431,7 @@ static MACHINE_CONFIG_DERIVED( misdraw, bigappg ) MCFG_NVRAM_ADD_0FILL("cpunvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dodge, pitboss ) +MACHINE_CONFIG_DERIVED(merit_state::dodge, pitboss) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(dodge_map) @@ -1429,42 +1440,42 @@ static MACHINE_CONFIG_DERIVED( dodge, pitboss ) MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram", merit_state, dodge_nvram_init) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tictac, pitboss ) +MACHINE_CONFIG_DERIVED(merit_state::tictac, pitboss) 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 ) +MACHINE_CONFIG_DERIVED(merit_state::trvwhiz, pitboss) 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 ) +MACHINE_CONFIG_DERIVED(merit_state::dtrvwz5, pitboss) 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 ) +MACHINE_CONFIG_DERIVED(merit_state::phrcraze, pitboss) 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 ) +MACHINE_CONFIG_DERIVED(merit_state::trvwhziv, pitboss) 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 ) +MACHINE_CONFIG_DERIVED(merit_state::couple, pitboss) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(couple_map) diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp index 41e5d05764f..dc5f4d850bb 100644 --- a/src/mame/drivers/meritm.cpp +++ b/src/mame/drivers/meritm.cpp @@ -267,6 +267,10 @@ public: uint8_t binary_to_BCD(uint8_t data); DECLARE_WRITE_LINE_MEMBER(meritm_vdp0_interrupt); DECLARE_WRITE_LINE_MEMBER(meritm_vdp1_interrupt); + void meritm_crt260(machine_config &config); + void meritm_crt250(machine_config &config); + void meritm_crt250_questions(machine_config &config); + void meritm_crt250_crt252_crt258(machine_config &config); }; @@ -1087,7 +1091,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(meritm_state::vblank_end_tick) m_z80pio_0->port_a_write(m_vint); } -static MACHINE_CONFIG_START( meritm_crt250 ) +MACHINE_CONFIG_START(meritm_state::meritm_crt250) MCFG_CPU_ADD("maincpu", Z80, SYSTEM_CLK/6) MCFG_CPU_PROGRAM_MAP(meritm_crt250_map) MCFG_CPU_IO_MAP(meritm_crt250_io_map) @@ -1135,13 +1139,13 @@ static MACHINE_CONFIG_START( meritm_crt250 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( meritm_crt250_questions, meritm_crt250 ) +MACHINE_CONFIG_DERIVED(meritm_state::meritm_crt250_questions, meritm_crt250) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(meritm_crt250_questions_map) MCFG_MACHINE_START_OVERRIDE(meritm_state,meritm_crt250_questions) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( meritm_crt250_crt252_crt258, meritm_crt250_questions ) +MACHINE_CONFIG_DERIVED(meritm_state::meritm_crt250_crt252_crt258, meritm_crt250_questions) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(meritm_crt250_crt258_io_map) MCFG_MACHINE_START_OVERRIDE(meritm_state,meritm_crt250_crt252_crt258) @@ -1152,7 +1156,7 @@ static MACHINE_CONFIG_DERIVED( meritm_crt250_crt252_crt258, meritm_crt250_questi MCFG_MICROTOUCH_TOUCH_CB(meritm_state, meritm_touch_coord_transform) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( meritm_crt260, meritm_crt250 ) +MACHINE_CONFIG_DERIVED(meritm_state::meritm_crt260, meritm_crt250) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(meritm_map) MCFG_CPU_IO_MAP(meritm_io_map) diff --git a/src/mame/drivers/mermaid.cpp b/src/mame/drivers/mermaid.cpp index dfc7754812d..9f5399e24a9 100644 --- a/src/mame/drivers/mermaid.cpp +++ b/src/mame/drivers/mermaid.cpp @@ -423,7 +423,7 @@ INTERRUPT_GEN_MEMBER(mermaid_state::vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( mermaid ) +MACHINE_CONFIG_START(mermaid_state::mermaid) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) // ??? @@ -470,7 +470,7 @@ static MACHINE_CONFIG_START( mermaid ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rougien, mermaid ) +MACHINE_CONFIG_DERIVED(mermaid_state::rougien, mermaid) MCFG_DEVICE_MODIFY("latch1") MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(mermaid_state, rougien_sample_playback_w)) diff --git a/src/mame/drivers/mes.cpp b/src/mame/drivers/mes.cpp index c7046f0a6f7..7321ff172aa 100644 --- a/src/mame/drivers/mes.cpp +++ b/src/mame/drivers/mes.cpp @@ -32,6 +32,7 @@ public: DECLARE_READ8_MEMBER(port00_r); DECLARE_READ8_MEMBER(port08_r); + void mes(machine_config &config); private: u8 m_term_data; u8 m_port08; @@ -123,7 +124,7 @@ void mes_state::kbd_put(u8 data) m_term_data = data; } -static MACHINE_CONFIG_START( mes ) +MACHINE_CONFIG_START(mes_state::mes) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/metalmx.cpp b/src/mame/drivers/metalmx.cpp index 5d4f4b24870..136afb5b19d 100644 --- a/src/mame/drivers/metalmx.cpp +++ b/src/mame/drivers/metalmx.cpp @@ -685,7 +685,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( metalmx ) +MACHINE_CONFIG_START(metalmx_state::metalmx) MCFG_CPU_ADD("maincpu", M68EC020, XTAL_14_31818MHz) MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/metlclsh.cpp b/src/mame/drivers/metlclsh.cpp index 90ce18be6fd..ebd21523d20 100644 --- a/src/mame/drivers/metlclsh.cpp +++ b/src/mame/drivers/metlclsh.cpp @@ -273,7 +273,7 @@ void metlclsh_state::machine_reset() m_gfxbank = 0; } -static MACHINE_CONFIG_START( metlclsh ) +MACHINE_CONFIG_START(metlclsh_state::metlclsh) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 1500000) // ? diff --git a/src/mame/drivers/metlfrzr.cpp b/src/mame/drivers/metlfrzr.cpp index f57c531e613..53b5c24270c 100644 --- a/src/mame/drivers/metlfrzr.cpp +++ b/src/mame/drivers/metlfrzr.cpp @@ -63,6 +63,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(scanline); uint8_t m_fg_tilebank; bool m_rowscroll_enable; + void metlfrzr(machine_config &config); }; @@ -357,7 +358,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(metlfrzr_state::scanline) m_maincpu->set_input_line_and_vector(0, HOLD_LINE,0x08); /* RST 08h */ } -static MACHINE_CONFIG_START(metlfrzr) +MACHINE_CONFIG_START(metlfrzr_state::metlfrzr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2) diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index 285a3c45720..d10ea8175b1 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -3037,7 +3037,7 @@ void metro_state::machine_start() save_item(NAME(m_gakusai_oki_bank_hi)); } -static MACHINE_CONFIG_START( i4100_config ) +MACHINE_CONFIG_START(metro_state::i4100_config) MCFG_DEVICE_ADD("vdp", I4100, XTAL_26_666MHz) MCFG_I4100_GFXDECODE("gfxdecode") MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(metro_state,vdp_blit_end_w)) @@ -3053,7 +3053,7 @@ static MACHINE_CONFIG_START( i4100_config ) MCFG_GFXDECODE_ADD("gfxdecode", ":vdp:palette", i4100) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( i4220_config ) +MACHINE_CONFIG_START(metro_state::i4220_config) MCFG_DEVICE_ADD("vdp2", I4220, XTAL_26_666MHz) MCFG_I4100_GFXDECODE("gfxdecode") MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(metro_state,vdp_blit_end_w)) @@ -3069,7 +3069,7 @@ static MACHINE_CONFIG_START( i4220_config ) MCFG_GFXDECODE_ADD("gfxdecode", ":vdp2:palette", i4220) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( i4300_config ) +MACHINE_CONFIG_START(metro_state::i4300_config) MCFG_DEVICE_ADD("vdp3", I4300, XTAL_26_666MHz) MCFG_I4100_GFXDECODE("gfxdecode") MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(metro_state,vdp_blit_end_w)) @@ -3086,7 +3086,7 @@ static MACHINE_CONFIG_START( i4300_config ) MACHINE_CONFIG_END // TODO: these comes from the CRTC inside the i4100 -static MACHINE_CONFIG_START( i4100_config_360x224 ) +MACHINE_CONFIG_START(metro_state::i4100_config_360x224) MCFG_FRAGMENT_ADD( i4100_config ) MCFG_DEVICE_MODIFY("screen") @@ -3094,7 +3094,7 @@ static MACHINE_CONFIG_START( i4100_config_360x224 ) MCFG_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( i4220_config_320x240 ) +MACHINE_CONFIG_START(metro_state::i4220_config_320x240) MCFG_FRAGMENT_ADD( i4220_config ) MCFG_DEVICE_MODIFY("screen") @@ -3102,7 +3102,7 @@ static MACHINE_CONFIG_START( i4220_config_320x240 ) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( i4220_config_304x224 ) +MACHINE_CONFIG_START(metro_state::i4220_config_304x224) MCFG_FRAGMENT_ADD( i4220_config ) MCFG_DEVICE_MODIFY("screen") @@ -3110,7 +3110,7 @@ static MACHINE_CONFIG_START( i4220_config_304x224 ) MCFG_SCREEN_VISIBLE_AREA(0, 304-1, 0, 224-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( i4300_config_384x224 ) +MACHINE_CONFIG_START(metro_state::i4300_config_384x224) MCFG_FRAGMENT_ADD( i4300_config ) MCFG_DEVICE_MODIFY("screen") @@ -3118,7 +3118,7 @@ static MACHINE_CONFIG_START( i4300_config_384x224 ) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 224-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( i4300_config_320x240 ) +MACHINE_CONFIG_START(metro_state::i4300_config_320x240) MCFG_FRAGMENT_ADD( i4300_config ) MCFG_DEVICE_MODIFY("screen") @@ -3127,7 +3127,7 @@ static MACHINE_CONFIG_START( i4300_config_320x240 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msgogo ) +MACHINE_CONFIG_START(metro_state::msgogo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -3149,21 +3149,21 @@ static MACHINE_CONFIG_START( msgogo ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( balcube, msgogo ) +MACHINE_CONFIG_DERIVED(metro_state::balcube, msgogo) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(balcube_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt) MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ? MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( daitoa, msgogo ) +MACHINE_CONFIG_DERIVED(metro_state::daitoa, msgogo) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(daitoa_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", metro_state, metro_vblank_interrupt) MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ? MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bangball, msgogo ) +MACHINE_CONFIG_DERIVED(metro_state::bangball, msgogo) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bangball_map) MCFG_CPU_VBLANK_INT_REMOVE() @@ -3175,7 +3175,7 @@ static MACHINE_CONFIG_DERIVED( bangball, msgogo ) MCFG_SCREEN_REFRESH_RATE(60) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( batlbubl, msgogo ) +MACHINE_CONFIG_DERIVED(metro_state::batlbubl, msgogo) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(batlbubl_map) MCFG_CPU_VBLANK_INT_REMOVE() @@ -3188,7 +3188,7 @@ static MACHINE_CONFIG_DERIVED( batlbubl, msgogo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( metro_upd7810_sound ) +MACHINE_CONFIG_START(metro_state::metro_upd7810_sound) MCFG_CPU_ADD("audiocpu", UPD7810, XTAL_24MHz/2) MCFG_UPD7810_RXD(READLINE(metro_state, metro_rxd_r)) MCFG_CPU_PROGRAM_MAP(metro_sound_map) @@ -3198,7 +3198,7 @@ static MACHINE_CONFIG_START( metro_upd7810_sound ) MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(metro_state, metro_sound_rombank_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( daitorid_upd7810_sound ) +MACHINE_CONFIG_START(metro_state::daitorid_upd7810_sound) MCFG_CPU_ADD("audiocpu", UPD7810, XTAL_12MHz) MCFG_UPD7810_RXD(READLINE(metro_state, metro_rxd_r)) MCFG_CPU_PROGRAM_MAP(metro_sound_map) @@ -3209,7 +3209,7 @@ static MACHINE_CONFIG_START( daitorid_upd7810_sound ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( daitorid ) +MACHINE_CONFIG_START(metro_state::daitorid) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) @@ -3238,7 +3238,7 @@ static MACHINE_CONFIG_START( daitorid ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dharma ) +MACHINE_CONFIG_START(metro_state::dharma) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) @@ -3263,7 +3263,7 @@ static MACHINE_CONFIG_START( dharma ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( karatour ) +MACHINE_CONFIG_START(metro_state::karatour) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) @@ -3289,7 +3289,7 @@ static MACHINE_CONFIG_START( karatour ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( 3kokushi ) +MACHINE_CONFIG_START(metro_state::_3kokushi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) @@ -3315,7 +3315,7 @@ static MACHINE_CONFIG_START( 3kokushi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( lastfort ) +MACHINE_CONFIG_START(metro_state::lastfort) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) @@ -3340,7 +3340,7 @@ static MACHINE_CONFIG_START( lastfort ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( lastforg ) +MACHINE_CONFIG_START(metro_state::lastforg) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) @@ -3364,7 +3364,7 @@ static MACHINE_CONFIG_START( lastforg ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dokyusei ) +MACHINE_CONFIG_START(metro_state::dokyusei) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -3385,7 +3385,7 @@ static MACHINE_CONFIG_START( dokyusei ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dokyusp ) +MACHINE_CONFIG_START(metro_state::dokyusp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) @@ -3411,7 +3411,7 @@ static MACHINE_CONFIG_START( dokyusp ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gakusai ) +MACHINE_CONFIG_START(metro_state::gakusai) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 26.6660MHz/2?, OSCs listed are 26.6660MHz & 3.579545MHz */ @@ -3437,7 +3437,7 @@ static MACHINE_CONFIG_START( gakusai ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gakusai2 ) +MACHINE_CONFIG_START(metro_state::gakusai2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 26.6660MHz/2?, OSCs listed are 26.6660MHz & 3.579545MHz */ @@ -3463,7 +3463,7 @@ static MACHINE_CONFIG_START( gakusai2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pangpoms ) +MACHINE_CONFIG_START(metro_state::pangpoms) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) @@ -3489,7 +3489,7 @@ static MACHINE_CONFIG_START( pangpoms ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( poitto ) +MACHINE_CONFIG_START(metro_state::poitto) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) @@ -3515,7 +3515,7 @@ static MACHINE_CONFIG_START( poitto ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pururun ) +MACHINE_CONFIG_START(metro_state::pururun) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* Not confirmed */ @@ -3542,7 +3542,7 @@ static MACHINE_CONFIG_START( pururun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( skyalert ) +MACHINE_CONFIG_START(metro_state::skyalert) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) @@ -3568,7 +3568,7 @@ static MACHINE_CONFIG_START( skyalert ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( toride2g ) +MACHINE_CONFIG_START(metro_state::toride2g) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) @@ -3594,7 +3594,7 @@ static MACHINE_CONFIG_START( toride2g ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mouja ) +MACHINE_CONFIG_START(metro_state::mouja) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -3618,7 +3618,7 @@ static MACHINE_CONFIG_START( mouja ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vmetal ) +MACHINE_CONFIG_START(metro_state::vmetal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -3647,7 +3647,7 @@ static MACHINE_CONFIG_START( vmetal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( blzntrnd ) +MACHINE_CONFIG_START(metro_state::blzntrnd) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -3691,7 +3691,7 @@ static MACHINE_CONFIG_START( blzntrnd ) MCFG_SOUND_ROUTE(2, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gstrik2, blzntrnd ) +MACHINE_CONFIG_DERIVED(metro_state::gstrik2, blzntrnd) MCFG_GFXDECODE_MODIFY("gfxdecode", gstrik2) MCFG_VIDEO_START_OVERRIDE(metro_state,gstrik2) @@ -3703,7 +3703,7 @@ static MACHINE_CONFIG_DERIVED( gstrik2, blzntrnd ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( puzzlet ) +MACHINE_CONFIG_START(metro_state::puzzlet) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H83007, XTAL_20MHz) // H8/3007 - Hitachi HD6413007F20 CPU. Clock 20MHz @@ -5647,7 +5647,7 @@ GAME( 1995, dokyusp, 0, dokyusp, gakusai, metro_state, gakusai, ROT0 GAME( 1995, msgogo, 0, msgogo, msgogo, metro_state, balcube, ROT0, "Metro", "Mouse Shooter GoGo", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) GAME( 1995, pururun, 0, pururun, pururun, metro_state, daitorid, ROT0, "Metro / Banpresto", "Pururun", MACHINE_SUPPORTS_SAVE ) GAME( 1995, puzzli, 0, daitorid, puzzli, metro_state, daitorid, ROT0, "Metro / Banpresto", "Puzzli", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) -GAME( 1996, 3kokushi, 0, 3kokushi, 3kokushi, metro_state, karatour, ROT0, "Mitchell", "Sankokushi (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) +GAME( 1996, 3kokushi, 0, _3kokushi,3kokushi, metro_state, karatour, ROT0, "Mitchell", "Sankokushi (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) GAME( 1996, balcube, 0, balcube, balcube, metro_state, balcube, ROT0, "Metro", "Bal Cube", MACHINE_SUPPORTS_SAVE ) GAME( 1996, bangball, 0, bangball, bangball, metro_state, balcube, ROT0, "Banpresto / Kunihiko Tashiro+Goodhouse", "Bang Bang Ball (v1.05)", MACHINE_SUPPORTS_SAVE ) GAME( 1996, gstrik2, 0, gstrik2, gstrik2, metro_state, blzntrnd, ROT0, "Human Amusement", "Grand Striker 2 (Europe and Oceania)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL ) diff --git a/src/mame/drivers/mexico86.cpp b/src/mame/drivers/mexico86.cpp index 1c5f8d90461..65f1ddcd786 100644 --- a/src/mame/drivers/mexico86.cpp +++ b/src/mame/drivers/mexico86.cpp @@ -423,7 +423,7 @@ void mexico86_state::machine_reset() m_charbank = 0; } -static MACHINE_CONFIG_START( mexico86 ) +MACHINE_CONFIG_START(mexico86_state::mexico86) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */ @@ -471,7 +471,7 @@ static MACHINE_CONFIG_START( mexico86 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( knightb, mexico86 ) +MACHINE_CONFIG_DERIVED(mexico86_state::knightb, mexico86) /* basic machine hardware */ @@ -483,7 +483,7 @@ static MACHINE_CONFIG_DERIVED( knightb, mexico86 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kikikai, knightb ) +MACHINE_CONFIG_DERIVED(mexico86_state::kikikai, knightb) /* basic machine hardware */ diff --git a/src/mame/drivers/meyc8080.cpp b/src/mame/drivers/meyc8080.cpp index cd76389a247..e3712d1c417 100644 --- a/src/mame/drivers/meyc8080.cpp +++ b/src/mame/drivers/meyc8080.cpp @@ -94,6 +94,7 @@ public: uint32_t screen_update_meyc8080(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_dac; + void meyc8080(machine_config &config); }; @@ -579,7 +580,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( meyc8080 ) +MACHINE_CONFIG_START(meyc8080_state::meyc8080) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_20MHz / 10) // divider guessed diff --git a/src/mame/drivers/meyc8088.cpp b/src/mame/drivers/meyc8088.cpp index af77a96f749..8bbc63e3c37 100644 --- a/src/mame/drivers/meyc8088.cpp +++ b/src/mame/drivers/meyc8088.cpp @@ -71,6 +71,7 @@ public: uint32_t screen_update_meyc8088(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_meyc8088); TIMER_DEVICE_CALLBACK_MEMBER(heartbeat_callback); + void meyc8088(machine_config &config); }; @@ -344,7 +345,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( meyc8088 ) +MACHINE_CONFIG_START(meyc8088_state::meyc8088) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, (XTAL_15MHz / 3) * 0.95) // NOTE: underclocked to prevent errors on diagnostics, MAME i8088 cycle timing is probably inaccurate diff --git a/src/mame/drivers/mfabfz.cpp b/src/mame/drivers/mfabfz.cpp index d16b7947700..cd14a902002 100644 --- a/src/mame/drivers/mfabfz.cpp +++ b/src/mame/drivers/mfabfz.cpp @@ -55,6 +55,8 @@ public: , m_maincpu(*this, "maincpu") { } + void mfabfz85(machine_config &config); + void mfabfz(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -93,7 +95,7 @@ void mfabfz_state::machine_reset() } -static MACHINE_CONFIG_START( mfabfz ) +MACHINE_CONFIG_START(mfabfz_state::mfabfz) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A, XTAL_4MHz / 2) MCFG_CPU_PROGRAM_MAP(mfabfz_mem) @@ -127,7 +129,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( mfabfz85 ) +MACHINE_CONFIG_START(mfabfz_state::mfabfz85) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A, XTAL_4MHz / 2) MCFG_CPU_PROGRAM_MAP(mfabfz_mem) diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp index 7137711733f..33dbe4f012a 100644 --- a/src/mame/drivers/mgames.cpp +++ b/src/mame/drivers/mgames.cpp @@ -250,6 +250,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void mgames(machine_config &config); }; @@ -632,7 +633,7 @@ static GFXDECODE_START( mgames ) GFXDECODE_END -static MACHINE_CONFIG_START( mgames ) +MACHINE_CONFIG_START(mgames_state::mgames) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/6) /* 3 MHz? */ MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp index 17025cb4b38..62e528e923a 100644 --- a/src/mame/drivers/mgavegas.cpp +++ b/src/mame/drivers/mgavegas.cpp @@ -143,6 +143,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(int_0); + void mgavegas(machine_config &config); protected: // devices @@ -586,7 +587,7 @@ DRIVER_INIT_MEMBER(mgavegas_state,mgavegas133) *************************/ -static MACHINE_CONFIG_START( mgavegas ) +MACHINE_CONFIG_START(mgavegas_state::mgavegas) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLK) MCFG_CPU_PROGRAM_MAP(mgavegas_map) diff --git a/src/mame/drivers/mgolf.cpp b/src/mame/drivers/mgolf.cpp index d27ffbb548d..009ddd651ca 100644 --- a/src/mame/drivers/mgolf.cpp +++ b/src/mame/drivers/mgolf.cpp @@ -65,6 +65,7 @@ public: void update_plunger( ); double calc_plunger_pos(); + void mgolf(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -362,7 +363,7 @@ void mgolf_state::machine_reset() } -static MACHINE_CONFIG_START( mgolf ) +MACHINE_CONFIG_START(mgolf_state::mgolf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 12096000 / 16) /* ? */ diff --git a/src/mame/drivers/mhavoc.cpp b/src/mame/drivers/mhavoc.cpp index 122bef9afa8..8384455bc6d 100644 --- a/src/mame/drivers/mhavoc.cpp +++ b/src/mame/drivers/mhavoc.cpp @@ -526,7 +526,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( mhavoc ) +MACHINE_CONFIG_START(mhavoc_state::mhavoc) /* basic machine hardware */ MCFG_CPU_ADD("alpha", M6502, MHAVOC_CLOCK_2_5M) /* 2.5 MHz */ @@ -580,14 +580,14 @@ static MACHINE_CONFIG_START( mhavoc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mhavocrv, mhavoc ) +MACHINE_CONFIG_DERIVED(mhavoc_state::mhavocrv, mhavoc) 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 ) +MACHINE_CONFIG_DERIVED(mhavoc_state::alphaone, mhavoc) /* basic machine hardware */ MCFG_CPU_MODIFY("alpha") diff --git a/src/mame/drivers/mice.cpp b/src/mame/drivers/mice.cpp index 907ae395520..a8fa9f8400a 100644 --- a/src/mame/drivers/mice.cpp +++ b/src/mame/drivers/mice.cpp @@ -45,6 +45,8 @@ public: , m_maincpu(*this, "maincpu") { } + void mice2(machine_config &config); + void mice(machine_config &config); private: required_device m_maincpu; }; @@ -151,7 +153,7 @@ static DEVICE_INPUT_DEFAULTS_START( mice2_terminal ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( mice ) +MACHINE_CONFIG_START(mice_state::mice) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz) MCFG_CPU_PROGRAM_MAP(mice_mem) @@ -178,7 +180,7 @@ static MACHINE_CONFIG_START( mice ) MCFG_DEVICE_ADD("ppi", I8255, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mice2, mice ) +MACHINE_CONFIG_DERIVED(mice_state::mice2, mice) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mice2_mem) MCFG_CPU_IO_MAP(mice2_io) diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp index 8d7f448c906..e918cd662dd 100644 --- a/src/mame/drivers/micral.cpp +++ b/src/mame/drivers/micral.cpp @@ -81,6 +81,7 @@ public: DECLARE_WRITE8_MEMBER(video_w); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void micral(machine_config &config); private: u16 s_curpos; u8 s_command; @@ -366,7 +367,7 @@ MACHINE_RESET_MEMBER( micral_state, micral ) m_uart->set_input_pin(AY31015_CS, 0); } -static MACHINE_CONFIG_START( micral ) +MACHINE_CONFIG_START(micral_state::micral) // basic machine hardware MCFG_CPU_ADD( "maincpu", Z80, XTAL_4MHz ) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/micro20.cpp b/src/mame/drivers/micro20.cpp index 1b69cc61587..29c6ec77748 100644 --- a/src/mame/drivers/micro20.cpp +++ b/src/mame/drivers/micro20.cpp @@ -62,6 +62,7 @@ public: m_maincpu->set_input_line(M68K_IRQ_4, state); } + void micro20(machine_config &config); private: u8 m_tin; u8 m_h4; @@ -151,7 +152,7 @@ static ADDRESS_MAP_START(micro20_map, AS_PROGRAM, 32, micro20_state ) AM_RANGE(0xffff80c0, 0xffff80df) AM_DEVREADWRITE8(PIT_TAG, pit68230_device, read, write, 0xffffffff) ADDRESS_MAP_END -static MACHINE_CONFIG_START( micro20 ) +MACHINE_CONFIG_START(micro20_state::micro20) /* basic machine hardware */ MCFG_CPU_ADD(MAINCPU_TAG, M68020, XTAL_16_67MHz) MCFG_CPU_PROGRAM_MAP(micro20_map) diff --git a/src/mame/drivers/micro3d.cpp b/src/mame/drivers/micro3d.cpp index 1969a1b1b70..9096c5e8da0 100644 --- a/src/mame/drivers/micro3d.cpp +++ b/src/mame/drivers/micro3d.cpp @@ -295,7 +295,7 @@ ADDRESS_MAP_END * *************************************/ -static MACHINE_CONFIG_START( micro3d ) +MACHINE_CONFIG_START(micro3d_state::micro3d) MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2) MCFG_CPU_PROGRAM_MAP(hostmem) @@ -388,7 +388,7 @@ static MACHINE_CONFIG_START( micro3d ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( botss11, micro3d ) +MACHINE_CONFIG_DERIVED(micro3d_state::botss11, micro3d) MCFG_DEVICE_MODIFY("adc") MCFG_ADC0844_CH1_CB(NOOP) MACHINE_CONFIG_END diff --git a/src/mame/drivers/microdec.cpp b/src/mame/drivers/microdec.cpp index dd6df214b0e..6ba4162ed72 100644 --- a/src/mame/drivers/microdec.cpp +++ b/src/mame/drivers/microdec.cpp @@ -54,6 +54,7 @@ public: DECLARE_WRITE8_MEMBER(portf8_w); DECLARE_DRIVER_INIT(microdec); + void microdec(machine_config &config); private: uint8_t m_portf8; bool m_fdc_rdy; @@ -181,7 +182,7 @@ DRIVER_INIT_MEMBER( microdec_state, microdec ) membank("bankw0")->configure_entry(0, &main[0x1000]); } -static MACHINE_CONFIG_START( microdec ) +MACHINE_CONFIG_START(microdec_state::microdec) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(microdec_mem) diff --git a/src/mame/drivers/microkit.cpp b/src/mame/drivers/microkit.cpp index f5d72d9f89b..21696f72e8f 100644 --- a/src/mame/drivers/microkit.cpp +++ b/src/mame/drivers/microkit.cpp @@ -53,6 +53,7 @@ public: DECLARE_WRITE8_MEMBER(ram_w); DECLARE_READ8_MEMBER(ram_r); + void microkit(machine_config &config); private: virtual void machine_reset() override; uint8_t m_resetcnt; @@ -113,7 +114,7 @@ static DEVICE_INPUT_DEFAULTS_START( serial_keyb ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( microkit ) +MACHINE_CONFIG_START(microkit_state::microkit) // basic machine hardware MCFG_CPU_ADD("maincpu", CDP1802, 1750000) MCFG_CPU_PROGRAM_MAP(microkit_mem) diff --git a/src/mame/drivers/micronic.cpp b/src/mame/drivers/micronic.cpp index 761c69429a2..c88b019d83b 100644 --- a/src/mame/drivers/micronic.cpp +++ b/src/mame/drivers/micronic.cpp @@ -348,7 +348,7 @@ WRITE_LINE_MEMBER( micronic_state::mc146818_irq ) } -static MACHINE_CONFIG_START( micronic ) +MACHINE_CONFIG_START(micronic_state::micronic) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_3_579545MHz) MCFG_CPU_PROGRAM_MAP(micronic_mem) diff --git a/src/mame/drivers/micropin.cpp b/src/mame/drivers/micropin.cpp index 4978c5bef9a..5c8b7b8945c 100644 --- a/src/mame/drivers/micropin.cpp +++ b/src/mame/drivers/micropin.cpp @@ -57,6 +57,8 @@ public: DECLARE_WRITE8_MEMBER(p51a_w); DECLARE_DRIVER_INIT(micropin); TIMER_DEVICE_CALLBACK_MEMBER(timer_a); + void pentacup2(machine_config &config); + void micropin(machine_config &config); private: uint8_t m_row; uint8_t m_counter; @@ -284,7 +286,7 @@ DRIVER_INIT_MEMBER( micropin_state, micropin ) { } -static MACHINE_CONFIG_START( micropin ) +MACHINE_CONFIG_START(micropin_state::micropin) /* basic machine hardware */ MCFG_CPU_ADD("v1cpu", M6800, XTAL_2MHz / 2) MCFG_CPU_PROGRAM_MAP(micropin_map) @@ -321,7 +323,7 @@ static MACHINE_CONFIG_START( micropin ) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_a", micropin_state, timer_a, attotime::from_hz(100)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pentacup2 ) +MACHINE_CONFIG_START(micropin_state::pentacup2) /* basic machine hardware */ MCFG_CPU_ADD("v2cpu", I8085A, 2000000) MCFG_CPU_PROGRAM_MAP(pentacup2_map) diff --git a/src/mame/drivers/microtan.cpp b/src/mame/drivers/microtan.cpp index d8fcf1f9bab..ccb6d5201bf 100644 --- a/src/mame/drivers/microtan.cpp +++ b/src/mame/drivers/microtan.cpp @@ -209,7 +209,7 @@ static GFXDECODE_START( microtan ) GFXDECODE_END -static MACHINE_CONFIG_START( microtan ) +MACHINE_CONFIG_START(microtan_state::microtan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_6MHz / 8) // 750 kHz MCFG_CPU_PROGRAM_MAP(microtan_map) diff --git a/src/mame/drivers/microterm.cpp b/src/mame/drivers/microterm.cpp index a2eba82f16e..e44b1058995 100644 --- a/src/mame/drivers/microterm.cpp +++ b/src/mame/drivers/microterm.cpp @@ -28,6 +28,8 @@ public: DECLARE_READ8_MEMBER(c000_r); SCN2674_DRAW_CHARACTER_MEMBER(draw_character); + void mt420(machine_config &config); + void mt5510(machine_config &config); private: required_device m_maincpu; optional_region_ptr m_p_chargen; @@ -80,7 +82,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( microterm ) INPUT_PORTS_END -static MACHINE_CONFIG_START( mt420 ) +MACHINE_CONFIG_START(microterm_state::mt420) MCFG_CPU_ADD("maincpu", Z80, 4'000'000) MCFG_CPU_PROGRAM_MAP(mt420_mem_map) MCFG_CPU_IO_MAP(mt420_io_map) @@ -110,7 +112,7 @@ static MACHINE_CONFIG_START( mt420 ) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mt5510 ) +MACHINE_CONFIG_START(microterm_state::mt5510) MCFG_CPU_ADD("maincpu", Z80, XTAL_6MHz) MCFG_CPU_PROGRAM_MAP(mt5510_mem_map) MCFG_CPU_IO_MAP(mt5510_io_map) diff --git a/src/mame/drivers/microvsn.cpp b/src/mame/drivers/microvsn.cpp index e2e650aed09..2baaf88c0bb 100644 --- a/src/mame/drivers/microvsn.cpp +++ b/src/mame/drivers/microvsn.cpp @@ -90,6 +90,7 @@ public: pcb_type m_pcb_type; rc_type m_rc_type; + void microvision(machine_config &config); protected: required_device m_dac; required_device m_i8021; @@ -637,7 +638,7 @@ static ADDRESS_MAP_START( microvision_8021_io, AS_IO, 8, microvision_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( microvision ) +MACHINE_CONFIG_START(microvision_state::microvision) MCFG_CPU_ADD("maincpu1", I8021, 2000000) // approximately MCFG_CPU_IO_MAP(microvision_8021_io) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(microvision_state, i8021_p1_write)) diff --git a/src/mame/drivers/midas.cpp b/src/mame/drivers/midas.cpp index 983e233dfb2..0de8abea16d 100644 --- a/src/mame/drivers/midas.cpp +++ b/src/mame/drivers/midas.cpp @@ -104,6 +104,8 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank_midas); + void hammer(machine_config &config); + void livequiz(machine_config &config); }; @@ -622,7 +624,7 @@ WRITE_LINE_MEMBER(midas_state::screen_vblank_midas) -static MACHINE_CONFIG_START( livequiz ) +MACHINE_CONFIG_START(midas_state::livequiz) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) @@ -650,7 +652,7 @@ static MACHINE_CONFIG_START( livequiz ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hammer ) +MACHINE_CONFIG_START(midas_state::hammer) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2) diff --git a/src/mame/drivers/midqslvr.cpp b/src/mame/drivers/midqslvr.cpp index 3e77183a6ae..20a9bb3a4bf 100644 --- a/src/mame/drivers/midqslvr.cpp +++ b/src/mame/drivers/midqslvr.cpp @@ -62,6 +62,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; void intel82439tx_init(); + void midqslvr(machine_config &config); }; @@ -407,7 +408,7 @@ void midqslvr_state::machine_reset() membank("video_bank2")->set_base(memregion("video_bios")->base() + 0x4000); } -static MACHINE_CONFIG_START( midqslvr ) +MACHINE_CONFIG_START(midqslvr_state::midqslvr) MCFG_CPU_ADD("maincpu", PENTIUM, 333000000) // actually Celeron 333 MCFG_CPU_PROGRAM_MAP(midqslvr_map) MCFG_CPU_IO_MAP(midqslvr_io) diff --git a/src/mame/drivers/midtunit.cpp b/src/mame/drivers/midtunit.cpp index b9584cca122..4680a469586 100644 --- a/src/mame/drivers/midtunit.cpp +++ b/src/mame/drivers/midtunit.cpp @@ -590,7 +590,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( tunit_core ) +MACHINE_CONFIG_START(midtunit_state::tunit_core) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS34010, CPU_CLOCK) @@ -621,7 +621,7 @@ static MACHINE_CONFIG_START( tunit_core ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tunit_adpcm, tunit_core ) +MACHINE_CONFIG_DERIVED(midtunit_state::tunit_adpcm, tunit_core) /* basic machine hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -630,7 +630,7 @@ static MACHINE_CONFIG_DERIVED( tunit_adpcm, tunit_core ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tunit_dcs, tunit_core ) +MACHINE_CONFIG_DERIVED(midtunit_state::tunit_dcs, tunit_core) /* basic machine hardware */ MCFG_DEVICE_ADD("dcs", DCS_AUDIO_2K, 0) diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp index 5885a256d14..3e99a8086db 100644 --- a/src/mame/drivers/midvunit.cpp +++ b/src/mame/drivers/midvunit.cpp @@ -1127,7 +1127,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( midvcommon ) +MACHINE_CONFIG_START(midvunit_state::midvcommon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS32031, CPU_CLOCK) @@ -1156,27 +1156,27 @@ static MACHINE_CONFIG_START( midvcommon ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( midvunit, midvcommon ) +MACHINE_CONFIG_DERIVED(midvunit_state::midvunit, midvcommon) /* sound hardware */ MCFG_DEVICE_ADD("dcs", DCS_AUDIO_2K, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( crusnwld, midvunit ) +MACHINE_CONFIG_DERIVED(midvunit_state::crusnwld, midvunit) /* valid values are 450 or 460 */ MCFG_DEVICE_ADD("serial_pic", MIDWAY_SERIAL_PIC, 0) MCFG_MIDWAY_SERIAL_PIC_UPPER(450) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( offroadc, midvunit ) +MACHINE_CONFIG_DERIVED(midvunit_state::offroadc, midvunit) /* valid values are 230 or 234 */ MCFG_DEVICE_ADD("serial_pic2", MIDWAY_SERIAL_PIC2, 0) MCFG_MIDWAY_SERIAL_PIC2_UPPER(230) MCFG_MIDWAY_SERIAL_PIC2_YEAR_OFFS(94) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( midvplus, midvcommon ) +MACHINE_CONFIG_DERIVED(midvunit_state::midvplus, midvcommon) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/midwunit.cpp b/src/mame/drivers/midwunit.cpp index 8628f2ad1e5..56709126c2a 100644 --- a/src/mame/drivers/midwunit.cpp +++ b/src/mame/drivers/midwunit.cpp @@ -620,7 +620,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( wunit ) +MACHINE_CONFIG_START(midwunit_state::wunit) MCFG_CPU_ADD("maincpu", TMS34010, 50000000) MCFG_CPU_PROGRAM_MAP(main_map) @@ -650,13 +650,13 @@ static MACHINE_CONFIG_START( wunit ) MCFG_DEVICE_ADD("dcs", DCS_AUDIO_8K, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wunit_picsim, wunit ) +MACHINE_CONFIG_DERIVED(midwunit_state::wunit_picsim, wunit) MCFG_DEVICE_ADD("serial_security_sim", MIDWAY_SERIAL_PIC, 0) MCFG_MIDWAY_SERIAL_PIC_UPPER(528); // this is actually a generic code all games check for in addition to their own game specific code! MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wunit_picemu, wunit ) +MACHINE_CONFIG_DERIVED(midwunit_state::wunit_picemu, wunit) MCFG_DEVICE_ADD("serial_security", MIDWAY_SERIAL_PIC_EMU, 0) // todo, REMOVE once the emulated PIC above works! diff --git a/src/mame/drivers/midxunit.cpp b/src/mame/drivers/midxunit.cpp index 9c914ad7469..5d0847c3d55 100644 --- a/src/mame/drivers/midxunit.cpp +++ b/src/mame/drivers/midxunit.cpp @@ -240,7 +240,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( midxunit ) +MACHINE_CONFIG_START(midxunit_state::midxunit) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS34020, 40000000) diff --git a/src/mame/drivers/midyunit.cpp b/src/mame/drivers/midyunit.cpp index 54cf88821c5..3ec66154f6f 100644 --- a/src/mame/drivers/midyunit.cpp +++ b/src/mame/drivers/midyunit.cpp @@ -1097,7 +1097,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( zunit ) +MACHINE_CONFIG_START(midyunit_state::zunit) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS34010, FAST_MASTER_CLOCK) @@ -1139,7 +1139,7 @@ MACHINE_CONFIG_END * *************************************/ -static MACHINE_CONFIG_START( yunit_core ) +MACHINE_CONFIG_START(midyunit_state::yunit_core) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS34010, SLOW_MASTER_CLOCK) @@ -1170,7 +1170,7 @@ static MACHINE_CONFIG_START( yunit_core ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( yunit_cvsd_4bit_slow, yunit_core ) +MACHINE_CONFIG_DERIVED(midyunit_state::yunit_cvsd_4bit_slow, yunit_core) /* basic machine hardware */ MCFG_SOUND_ADD("cvsd", WILLIAMS_CVSD_SOUND, 0) @@ -1183,7 +1183,7 @@ static MACHINE_CONFIG_DERIVED( yunit_cvsd_4bit_slow, yunit_core ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( yunit_cvsd_4bit_fast, yunit_core ) +MACHINE_CONFIG_DERIVED(midyunit_state::yunit_cvsd_4bit_fast, yunit_core) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1199,7 +1199,7 @@ static MACHINE_CONFIG_DERIVED( yunit_cvsd_4bit_fast, yunit_core ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( yunit_cvsd_6bit_slow, yunit_core ) +MACHINE_CONFIG_DERIVED(midyunit_state::yunit_cvsd_6bit_slow, yunit_core) /* basic machine hardware */ MCFG_SOUND_ADD("cvsd", WILLIAMS_CVSD_SOUND, 0) @@ -1212,7 +1212,7 @@ static MACHINE_CONFIG_DERIVED( yunit_cvsd_6bit_slow, yunit_core ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( yunit_adpcm_6bit_fast, yunit_core ) +MACHINE_CONFIG_DERIVED(midyunit_state::yunit_adpcm_6bit_fast, yunit_core) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1228,7 +1228,7 @@ static MACHINE_CONFIG_DERIVED( yunit_adpcm_6bit_fast, yunit_core ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( yunit_adpcm_6bit_faster, yunit_core ) +MACHINE_CONFIG_DERIVED(midyunit_state::yunit_adpcm_6bit_faster, yunit_core) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1244,7 +1244,7 @@ static MACHINE_CONFIG_DERIVED( yunit_adpcm_6bit_faster, yunit_core ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( term2, yunit_adpcm_6bit_faster ) +MACHINE_CONFIG_DERIVED(midyunit_state::term2, yunit_adpcm_6bit_faster) MCFG_ADC0844_ADD("adc") // U2 on Coil Lamp Driver Board (A-14915) MCFG_ADC0844_CH1_CB(IOPORT("STICK0_X")) MCFG_ADC0844_CH2_CB(IOPORT("STICK0_Y")) @@ -1253,7 +1253,7 @@ static MACHINE_CONFIG_DERIVED( term2, yunit_adpcm_6bit_faster ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mkyawdim, yunit_core ) +MACHINE_CONFIG_DERIVED(midyunit_state::mkyawdim, yunit_core) /* basic machine hardware */ diff --git a/src/mame/drivers/midzeus.cpp b/src/mame/drivers/midzeus.cpp index 8304444d711..a7e4531a377 100644 --- a/src/mame/drivers/midzeus.cpp +++ b/src/mame/drivers/midzeus.cpp @@ -76,6 +76,8 @@ public: DECLARE_WRITE_LINE_MEMBER(zeus_irq); DECLARE_READ32_MEMBER(zeus2_timekeeper_r); DECLARE_WRITE32_MEMBER(zeus2_timekeeper_w); + void thegrid(machine_config &config); + void crusnexo(machine_config &config); private: }; @@ -1255,7 +1257,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( midzeus ) +MACHINE_CONFIG_START(midzeus_state::midzeus) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS32032, CPU_CLOCK) @@ -1284,20 +1286,20 @@ static MACHINE_CONFIG_START( midzeus ) MCFG_MIDWAY_SERIAL_PIC2_YEAR_OFFS(94) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mk4, midzeus ) +MACHINE_CONFIG_DERIVED(midzeus_state::mk4, midzeus) MCFG_DEVICE_MODIFY("ioasic") MCFG_MIDWAY_IOASIC_UPPER(461/* or 474 */) MCFG_MIDWAY_IOASIC_SHUFFLE_DEFAULT(1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( invasn, midzeus ) +MACHINE_CONFIG_DERIVED(midzeus_state::invasn, midzeus) MCFG_CPU_ADD("pic", PIC16C57, 8000000) /* ? */ MCFG_DEVICE_MODIFY("ioasic") MCFG_MIDWAY_IOASIC_UPPER(468/* or 488 */) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( midzeus2 ) +MACHINE_CONFIG_START(midzeus_state::midzeus2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS32032, CPU_CLOCK) @@ -1327,12 +1329,12 @@ static MACHINE_CONFIG_START( midzeus2 ) MCFG_MIDWAY_IOASIC_UPPER(474) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( crusnexo, midzeus2 ) +MACHINE_CONFIG_DERIVED(midzeus2_state::crusnexo, midzeus2) MCFG_DEVICE_MODIFY("ioasic") MCFG_MIDWAY_IOASIC_UPPER(472/* or 476,477,478,110 */) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( thegrid, midzeus2 ) +MACHINE_CONFIG_DERIVED(midzeus2_state::thegrid, midzeus2) MCFG_DEVICE_MODIFY("ioasic") MCFG_MIDWAY_IOASIC_UPPER(474/* or 491 */) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mightyframe.cpp b/src/mame/drivers/mightyframe.cpp index 3ade15fa65a..f12e6efa3dc 100644 --- a/src/mame/drivers/mightyframe.cpp +++ b/src/mame/drivers/mightyframe.cpp @@ -24,6 +24,7 @@ public: // , m_maincpu(*this, "maincpu") { } +void mightyframe(machine_config &config); private: // required_device m_maincpu; }; @@ -35,7 +36,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( mightyframe ) INPUT_PORTS_END -static MACHINE_CONFIG_START( mightyframe ) +MACHINE_CONFIG_START(mightyframe_state::mightyframe) MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // no idea of clock MCFG_CPU_PROGRAM_MAP(mem_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mikie.cpp b/src/mame/drivers/mikie.cpp index 38118603465..7abe616b3a4 100644 --- a/src/mame/drivers/mikie.cpp +++ b/src/mame/drivers/mikie.cpp @@ -256,7 +256,7 @@ INTERRUPT_GEN_MEMBER(mikie_state::vblank_irq) device.execute().set_input_line(M6809_IRQ_LINE, ASSERT_LINE); } -static MACHINE_CONFIG_START( mikie ) +MACHINE_CONFIG_START(mikie_state::mikie) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, OSC/12) // 9A (surface scratched) diff --git a/src/mame/drivers/mikro80.cpp b/src/mame/drivers/mikro80.cpp index a529f0eb037..984d9c97f7f 100644 --- a/src/mame/drivers/mikro80.cpp +++ b/src/mame/drivers/mikro80.cpp @@ -160,7 +160,7 @@ static GFXDECODE_START( mikro80 ) GFXDECODE_ENTRY( "gfx1", 0x0000, mikro80_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( mikro80 ) +MACHINE_CONFIG_START(mikro80_state::mikro80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, 2000000) MCFG_CPU_PROGRAM_MAP(mikro80_mem) @@ -195,7 +195,7 @@ static MACHINE_CONFIG_START( mikro80 ) MCFG_SOFTWARE_LIST_ADD("cass_list", "mikro80") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( radio99, mikro80 ) +MACHINE_CONFIG_DERIVED(mikro80_state::radio99, mikro80) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -206,7 +206,7 @@ static MACHINE_CONFIG_DERIVED( radio99, mikro80 ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kristall, mikro80 ) +MACHINE_CONFIG_DERIVED(mikro80_state::kristall, mikro80) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(kristall_io) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mikromik.cpp b/src/mame/drivers/mikromik.cpp index ad25c24dcc3..e8767433188 100644 --- a/src/mame/drivers/mikromik.cpp +++ b/src/mame/drivers/mikromik.cpp @@ -455,7 +455,7 @@ void mm1_state::machine_reset() // MACHINE_CONFIG( mm1 ) //------------------------------------------------- -static MACHINE_CONFIG_START( mm1 ) +MACHINE_CONFIG_START(mm1_state::mm1) // basic system hardware MCFG_CPU_ADD(I8085A_TAG, I8085A, XTAL_6_144MHz) MCFG_CPU_PROGRAM_MAP(mm1_map) @@ -525,7 +525,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( mm1m6 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( mm1m6, mm1 ) +MACHINE_CONFIG_DERIVED(mm1_state::mm1m6, mm1) // video hardware MCFG_FRAGMENT_ADD(mm1m6_video) MACHINE_CONFIG_END @@ -535,7 +535,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( mm1m7 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( mm1m7, mm1 ) +MACHINE_CONFIG_DERIVED(mm1_state::mm1m7, mm1) // video hardware MCFG_FRAGMENT_ADD(mm1m6_video) diff --git a/src/mame/drivers/mikrosha.cpp b/src/mame/drivers/mikrosha.cpp index f57822af3c0..6dfebaa5524 100644 --- a/src/mame/drivers/mikrosha.cpp +++ b/src/mame/drivers/mikrosha.cpp @@ -37,6 +37,7 @@ public: I8275_DRAW_CHARACTER_MEMBER(display_pixels); DECLARE_MACHINE_RESET(mikrosha); + void mikrosha(machine_config &config); protected: required_device m_cart; }; @@ -203,7 +204,7 @@ static GFXDECODE_START( mikrosha ) GFXDECODE_ENTRY( "gfx1", 0x0000, mikrosha_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( mikrosha ) +MACHINE_CONFIG_START(mikrosha_state::mikrosha) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_16MHz / 9) MCFG_CPU_PROGRAM_MAP(mikrosha_mem) diff --git a/src/mame/drivers/mil4000.cpp b/src/mame/drivers/mil4000.cpp index 3b18ba1868d..8bc45167b97 100644 --- a/src/mame/drivers/mil4000.cpp +++ b/src/mame/drivers/mil4000.cpp @@ -165,6 +165,8 @@ public: uint32_t screen_update_mil4000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void chewheel(machine_config &config); + void mil4000(machine_config &config); }; @@ -537,7 +539,7 @@ static GFXDECODE_START( mil4000 ) GFXDECODE_END -static MACHINE_CONFIG_START( mil4000 ) +MACHINE_CONFIG_START(mil4000_state::mil4000) MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(mil4000_map) // irq 2/4/5 point to the same place, others invalid @@ -564,7 +566,7 @@ static MACHINE_CONFIG_START( mil4000 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( chewheel, mil4000 ) +MACHINE_CONFIG_DERIVED(mil4000_state::chewheel, mil4000) MCFG_CPU_REPLACE("maincpu", M68000, CPU_CLOCK) /* 2MHz */ MCFG_CPU_PROGRAM_MAP(chewheel_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", mil4000_state, irq5_line_hold) diff --git a/src/mame/drivers/milwaukee.cpp b/src/mame/drivers/milwaukee.cpp index 457e500f4ce..3e299ea5f9e 100644 --- a/src/mame/drivers/milwaukee.cpp +++ b/src/mame/drivers/milwaukee.cpp @@ -29,6 +29,7 @@ public: //, m_p_chargen(*this, "chargen") { } + void milwaukee(machine_config &config); private: required_device m_maincpu; //required_region_ptr m_p_chargen; @@ -49,7 +50,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( milwaukee ) INPUT_PORTS_END -static MACHINE_CONFIG_START( milwaukee ) +MACHINE_CONFIG_START(milwaukee_state::milwaukee) MCFG_CPU_ADD("maincpu", M6502, XTAL_16MHz / 16) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/mini2440.cpp b/src/mame/drivers/mini2440.cpp index 1a5689435c6..aabf17f2e5e 100644 --- a/src/mame/drivers/mini2440.cpp +++ b/src/mame/drivers/mini2440.cpp @@ -56,6 +56,7 @@ public: DECLARE_WRITE16_MEMBER(s3c2440_i2s_data_w ); DECLARE_READ32_MEMBER(s3c2440_adc_data_r ); + void mini2440(machine_config &config); }; inline void mini2440_state::verboselog(int n_level, const char *s_fmt, ...) @@ -219,7 +220,7 @@ DRIVER_INIT_MEMBER(mini2440_state,mini2440) // do nothing } -static MACHINE_CONFIG_START( mini2440 ) +MACHINE_CONFIG_START(mini2440_state::mini2440) MCFG_CPU_ADD("maincpu", ARM920T, 400000000) MCFG_CPU_PROGRAM_MAP(mini2440_map) diff --git a/src/mame/drivers/miniboy7.cpp b/src/mame/drivers/miniboy7.cpp index bf86128018a..c584f812a1a 100644 --- a/src/mame/drivers/miniboy7.cpp +++ b/src/mame/drivers/miniboy7.cpp @@ -189,6 +189,7 @@ public: MC6845_UPDATE_ROW(crtc_update_row); DECLARE_PALETTE_INIT(miniboy7); + void miniboy7(machine_config &config); private: uint8_t m_ay_pb; int m_gpri; @@ -501,7 +502,7 @@ GFXDECODE_END * Machine Drivers * ***********************************/ -static MACHINE_CONFIG_START( miniboy7 ) +MACHINE_CONFIG_START(miniboy7_state::miniboy7) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) /* guess */ diff --git a/src/mame/drivers/minicom.cpp b/src/mame/drivers/minicom.cpp index cdc3766b5d3..2fc811edfbd 100644 --- a/src/mame/drivers/minicom.cpp +++ b/src/mame/drivers/minicom.cpp @@ -55,6 +55,7 @@ public: DECLARE_WRITE8_MEMBER(minicom_io_w); DECLARE_READ8_MEMBER(minicom_io_r); DECLARE_DRIVER_INIT(minicom); + void minicom(machine_config &config); private: uint8_t m_p[4]; uint16_t m_display_data; @@ -225,7 +226,7 @@ DRIVER_INIT_MEMBER( minicom_state, minicom ) { } -static MACHINE_CONFIG_START( minicom ) +MACHINE_CONFIG_START(minicom_state::minicom) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I87C52, XTAL_10MHz) /*FIX-ME: verify the correct clock frequency */ MCFG_CPU_IO_MAP(i87c52_io) diff --git a/src/mame/drivers/miniforce.cpp b/src/mame/drivers/miniforce.cpp index 10c4f36c1ae..1e411d2ea05 100644 --- a/src/mame/drivers/miniforce.cpp +++ b/src/mame/drivers/miniforce.cpp @@ -135,6 +135,7 @@ miniforce_state(const machine_config &mconfig, device_type type, const char *tag } virtual void machine_start () override; virtual void machine_reset () override; + void miniforce(machine_config &config); }; #if 0 @@ -175,7 +176,7 @@ SLOT_INTERFACE_END /* * Machine configuration */ -MACHINE_CONFIG_START (miniforce) +MACHINE_CONFIG_START(miniforce_state::miniforce) // MCFG_CPU_PROGRAM_MAP (miniforce_mem) MCFG_VME_DEVICE_ADD("vme") MCFG_VME_SLOT_ADD ("vme", 1, miniforce_vme_cards, "fccpu21") diff --git a/src/mame/drivers/miniframe.cpp b/src/mame/drivers/miniframe.cpp index 93d39d9195d..defc37426e8 100644 --- a/src/mame/drivers/miniframe.cpp +++ b/src/mame/drivers/miniframe.cpp @@ -56,6 +56,7 @@ public: required_shared_ptr m_mapram; + void miniframe(machine_config &config); private: uint16_t *m_ramptr; uint32_t m_ramsize; @@ -216,7 +217,7 @@ static SLOT_INTERFACE_START( miniframe_floppies ) SLOT_INTERFACE( "525dd", FLOPPY_525_DD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( miniframe ) +MACHINE_CONFIG_START(miniframe_state::miniframe) // basic machine hardware MCFG_CPU_ADD("maincpu", M68010, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP(miniframe_mem) diff --git a/src/mame/drivers/minitel_2_rpic.cpp b/src/mame/drivers/minitel_2_rpic.cpp index baefe838349..c2749cb8aa7 100644 --- a/src/mame/drivers/minitel_2_rpic.cpp +++ b/src/mame/drivers/minitel_2_rpic.cpp @@ -107,6 +107,7 @@ public: DECLARE_READ8_MEMBER ( ts9347_io_r ); DECLARE_WRITE8_MEMBER ( ts9347_io_w ); + void minitel2(machine_config &config); protected: required_ioport_array<16> m_io_kbd; virtual void machine_start() override; @@ -412,7 +413,7 @@ static INPUT_PORTS_START( minitel2 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( minitel2 ) +MACHINE_CONFIG_START(minitel_state::minitel2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C32, XTAL_14_31818MHz) //verified on pcb MCFG_CPU_PROGRAM_MAP(mem_prg) diff --git a/src/mame/drivers/minivadr.cpp b/src/mame/drivers/minivadr.cpp index d9002eb86ff..187c979c8b9 100644 --- a/src/mame/drivers/minivadr.cpp +++ b/src/mame/drivers/minivadr.cpp @@ -51,6 +51,7 @@ public: required_shared_ptr m_videoram; uint32_t screen_update_minivadr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void minivadr(machine_config &config); }; /************************************* @@ -105,7 +106,7 @@ static INPUT_PORTS_START( minivadr ) INPUT_PORTS_END -static MACHINE_CONFIG_START( minivadr ) +MACHINE_CONFIG_START(minivadr_state::minivadr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 6) diff --git a/src/mame/drivers/mirage.cpp b/src/mame/drivers/mirage.cpp index a8beb19edd7..d1546e45787 100644 --- a/src/mame/drivers/mirage.cpp +++ b/src/mame/drivers/mirage.cpp @@ -92,6 +92,7 @@ public: virtual void video_start() override; uint32_t screen_update_mirage(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECO16IC_BANK_CB_MEMBER(bank_callback); + void mirage(machine_config &config); }; void miragemj_state::video_start() @@ -284,7 +285,7 @@ void miragemj_state::machine_reset() m_mux_data = 0; } -static MACHINE_CONFIG_START( mirage ) +MACHINE_CONFIG_START(miragemj_state::mirage) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 28000000/2) diff --git a/src/mame/drivers/mirax.cpp b/src/mame/drivers/mirax.cpp index dd359f388a5..9b2bc7e318c 100644 --- a/src/mame/drivers/mirax.cpp +++ b/src/mame/drivers/mirax.cpp @@ -159,6 +159,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); + void mirax(machine_config &config); }; @@ -473,7 +474,7 @@ INTERRUPT_GEN_MEMBER(mirax_state::vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -static MACHINE_CONFIG_START( mirax ) +MACHINE_CONFIG_START(mirax_state::mirax) MCFG_CPU_ADD("maincpu", Z80, 12000000/4) // ceramic potted module, encrypted z80 MCFG_CPU_PROGRAM_MAP(mirax_main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", mirax_state, vblank_irq) diff --git a/src/mame/drivers/missb2.cpp b/src/mame/drivers/missb2.cpp index 32c7b6e5e1b..8ca9f69d7da 100644 --- a/src/mame/drivers/missb2.cpp +++ b/src/mame/drivers/missb2.cpp @@ -44,6 +44,8 @@ public: DECLARE_MACHINE_RESET(missb2); uint32_t screen_update_missb2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void missb2(machine_config &config); + void bublpong(machine_config &config); protected: void configure_banks(); @@ -453,7 +455,7 @@ MACHINE_RESET_MEMBER(missb2_state,missb2) bublbobl_bankswitch_w(m_maincpu->device_t::memory().space(AS_PROGRAM), 0, 0x00, 0xFF); // force a bankswitch write of all zeroes, as /RESET clears the latch } -static MACHINE_CONFIG_START( missb2 ) +MACHINE_CONFIG_START(missb2_state::missb2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz @@ -512,7 +514,7 @@ static MACHINE_CONFIG_START( missb2 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bublpong, missb2 ) +MACHINE_CONFIG_DERIVED(missb2_state::bublpong, missb2) MCFG_GFXDECODE_MODIFY("gfxdecode", bublpong) MACHINE_CONFIG_END diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp index cf44315ff66..cfbebdd794d 100644 --- a/src/mame/drivers/missile.cpp +++ b/src/mame/drivers/missile.cpp @@ -423,6 +423,9 @@ public: TIMER_CALLBACK_MEMBER(clock_irq); TIMER_CALLBACK_MEMBER(adjust_cpu_speed); + void missileb(machine_config &config); + void missile(machine_config &config); + void missilea(machine_config &config); }; @@ -1134,7 +1137,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( missile ) +MACHINE_CONFIG_START(missile_state::missile) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) @@ -1161,12 +1164,12 @@ static MACHINE_CONFIG_START( missile ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( missilea, missile ) +MACHINE_CONFIG_DERIVED(missile_state::missilea, missile) MCFG_DEVICE_REMOVE("pokey") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( missileb, missilea ) +MACHINE_CONFIG_DERIVED(missile_state::missileb, missilea) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bootleg_main_map) diff --git a/src/mame/drivers/mitchell.cpp b/src/mame/drivers/mitchell.cpp index 1b94c7d4323..cb1619e7e67 100644 --- a/src/mame/drivers/mitchell.cpp +++ b/src/mame/drivers/mitchell.cpp @@ -1151,7 +1151,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mitchell_state::mitchell_irq) } } -static MACHINE_CONFIG_START( mgakuen ) +MACHINE_CONFIG_START(mitchell_state::mgakuen) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* probably same clock as the other mitchell hardware games */ @@ -1191,7 +1191,7 @@ static MACHINE_CONFIG_START( mgakuen ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pang ) +MACHINE_CONFIG_START(mitchell_state::pang) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz/2) /* verified on pcb */ @@ -1231,7 +1231,7 @@ static MACHINE_CONFIG_START( pang ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pangnv, pang ) +MACHINE_CONFIG_DERIVED(mitchell_state::pangnv, pang) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END @@ -1266,7 +1266,7 @@ WRITE_LINE_MEMBER(mitchell_state::spangbl_adpcm_int) } -static MACHINE_CONFIG_DERIVED( spangbl, pangnv ) +MACHINE_CONFIG_DERIVED(mitchell_state::spangbl, pangnv) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(spangbl_map) @@ -1294,7 +1294,7 @@ static MACHINE_CONFIG_DERIVED( spangbl, pangnv ) MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pangba, spangbl ) +MACHINE_CONFIG_DERIVED(mitchell_state::pangba, spangbl) MCFG_CPU_MODIFY("audiocpu") MCFG_CPU_PROGRAM_MAP(pangba_sound_map) @@ -1302,7 +1302,7 @@ static MACHINE_CONFIG_DERIVED( pangba, spangbl ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mstworld ) +MACHINE_CONFIG_START(mitchell_state::mstworld) /* basic machine hardware */ /* it doesn't glitch with the clock speed set to 4x normal, however this is incorrect.. @@ -1346,7 +1346,7 @@ static MACHINE_CONFIG_START( mstworld ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( marukin ) +MACHINE_CONFIG_START(mitchell_state::marukin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* verified on pcb */ @@ -1401,7 +1401,7 @@ Vsync is 59.09hz */ -static MACHINE_CONFIG_START( pkladiesbl ) +MACHINE_CONFIG_START(mitchell_state::pkladiesbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */ diff --git a/src/mame/drivers/mits680b.cpp b/src/mame/drivers/mits680b.cpp index 5799b966d92..14d3cecd0c2 100644 --- a/src/mame/drivers/mits680b.cpp +++ b/src/mame/drivers/mits680b.cpp @@ -37,6 +37,7 @@ public: DECLARE_READ8_MEMBER(status_check_r); + void mits680b(machine_config &config); private: required_device m_maincpu; }; @@ -60,7 +61,7 @@ static INPUT_PORTS_START( mits680b ) INPUT_PORTS_END -static MACHINE_CONFIG_START( mits680b ) +MACHINE_CONFIG_START(mits680b_state::mits680b) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_1MHz / 2) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/mjkjidai.cpp b/src/mame/drivers/mjkjidai.cpp index d6678a54385..c8efefd490b 100644 --- a/src/mame/drivers/mjkjidai.cpp +++ b/src/mame/drivers/mjkjidai.cpp @@ -294,7 +294,7 @@ void mjkjidai_state::machine_reset() m_adpcm_pos = m_adpcm_end = 0; } -static MACHINE_CONFIG_START( mjkjidai ) +MACHINE_CONFIG_START(mjkjidai_state::mjkjidai) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,10000000/2) /* 5 MHz ??? */ diff --git a/src/mame/drivers/mjsenpu.cpp b/src/mame/drivers/mjsenpu.cpp index 091b0a1f02b..1b0325070f0 100644 --- a/src/mame/drivers/mjsenpu.cpp +++ b/src/mame/drivers/mjsenpu.cpp @@ -100,6 +100,7 @@ public: uint32_t screen_update_mjsenpu(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_palette; + void mjsenpu(machine_config &config); }; @@ -454,7 +455,7 @@ following clocks are on the PCB */ -static MACHINE_CONFIG_START( mjsenpu ) +MACHINE_CONFIG_START(mjsenpu_state::mjsenpu) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", E132XT, 27000000*2) /* ?? Mhz */ diff --git a/src/mame/drivers/mjsister.cpp b/src/mame/drivers/mjsister.cpp index cbf83c77eec..3ae23fddd0a 100644 --- a/src/mame/drivers/mjsister.cpp +++ b/src/mame/drivers/mjsister.cpp @@ -91,6 +91,7 @@ public: void plot0( int offset, uint8_t data ); void plot1( int offset, uint8_t data ); + void mjsister(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -484,7 +485,7 @@ INTERRUPT_GEN_MEMBER(mjsister_state::interrupt) m_maincpu->set_input_line(0, ASSERT_LINE); } -static MACHINE_CONFIG_START( mjsister ) +MACHINE_CONFIG_START(mjsister_state::mjsister) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 6.000 MHz */ diff --git a/src/mame/drivers/mk1.cpp b/src/mame/drivers/mk1.cpp index 8d57638991e..b13cf4d156d 100644 --- a/src/mame/drivers/mk1.cpp +++ b/src/mame/drivers/mk1.cpp @@ -63,6 +63,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(mk1_update_leds); F3853_INTERRUPT_REQ_CB(mk1_interrupt); required_device m_maincpu; + void mk1(machine_config &config); }; @@ -175,7 +176,7 @@ F3853_INTERRUPT_REQ_CB(mk1_state::mk1_interrupt) m_maincpu->set_input_line(F8_INPUT_LINE_INT_REQ, level ? ASSERT_LINE : CLEAR_LINE); } -static MACHINE_CONFIG_START( mk1 ) +MACHINE_CONFIG_START(mk1_state::mk1) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", F8, MAIN_CLOCK ) /* MK3850 */ MCFG_CPU_PROGRAM_MAP(mk1_mem) diff --git a/src/mame/drivers/mk14.cpp b/src/mame/drivers/mk14.cpp index 66b9d32920f..cbd14d94292 100644 --- a/src/mame/drivers/mk14.cpp +++ b/src/mame/drivers/mk14.cpp @@ -61,6 +61,7 @@ public: DECLARE_WRITE8_MEMBER(port_a_w); DECLARE_WRITE_LINE_MEMBER(cass_w); DECLARE_READ_LINE_MEMBER(cass_r); + void mk14(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -188,7 +189,7 @@ void mk14_state::machine_reset() { } -static MACHINE_CONFIG_START( mk14 ) +MACHINE_CONFIG_START(mk14_state::mk14) /* basic machine hardware */ // IC1 1SP-8A/600 (8060) SC/MP Microprocessor MCFG_CPU_ADD("maincpu", INS8060, XTAL_4_433619MHz) diff --git a/src/mame/drivers/mk2.cpp b/src/mame/drivers/mk2.cpp index 74c06c54e0f..c6bb1dfa213 100644 --- a/src/mame/drivers/mk2.cpp +++ b/src/mame/drivers/mk2.cpp @@ -80,6 +80,7 @@ public: uint8_t m_led[5]; virtual void machine_start() override; TIMER_DEVICE_CALLBACK_MEMBER(update_leds); + void mk2(machine_config &config); }; @@ -187,7 +188,7 @@ WRITE8_MEMBER( mk2_state::mk2_write_b ) } -static MACHINE_CONFIG_START( mk2 ) +MACHINE_CONFIG_START(mk2_state::mk2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6504, 1000000) MCFG_CPU_PROGRAM_MAP(mk2_mem) diff --git a/src/mame/drivers/mk85.cpp b/src/mame/drivers/mk85.cpp index b8a73ef8662..eb37584075c 100644 --- a/src/mame/drivers/mk85.cpp +++ b/src/mame/drivers/mk85.cpp @@ -37,6 +37,7 @@ public: virtual void video_start() override; uint32_t screen_update_mk85(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void mk85(machine_config &config); }; @@ -64,7 +65,7 @@ uint32_t mk85_state::screen_update_mk85(screen_device &screen, bitmap_ind16 &bit return 0; } -static MACHINE_CONFIG_START( mk85 ) +MACHINE_CONFIG_START(mk85_state::mk85) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", K1801VM2, XTAL_4MHz) MCFG_T11_INITIAL_MODE(0) diff --git a/src/mame/drivers/mk90.cpp b/src/mame/drivers/mk90.cpp index 7ce2c4eabbb..9e3310387e3 100644 --- a/src/mame/drivers/mk90.cpp +++ b/src/mame/drivers/mk90.cpp @@ -32,6 +32,7 @@ public: virtual void video_start() override; uint32_t screen_update_mk90(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void mk90(machine_config &config); }; @@ -67,7 +68,7 @@ uint32_t mk90_state::screen_update_mk90(screen_device &screen, bitmap_ind16 &bit return 0; } -static MACHINE_CONFIG_START( mk90 ) +MACHINE_CONFIG_START(mk90_state::mk90) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", K1801VM2, XTAL_4MHz) MCFG_T11_INITIAL_MODE(0x8000) diff --git a/src/mame/drivers/mkit09.cpp b/src/mame/drivers/mkit09.cpp index 949553467dc..d399fbb1127 100644 --- a/src/mame/drivers/mkit09.cpp +++ b/src/mame/drivers/mkit09.cpp @@ -57,6 +57,8 @@ public: DECLARE_WRITE8_MEMBER(pb_w); DECLARE_INPUT_CHANGED_MEMBER(trigger_reset); DECLARE_INPUT_CHANGED_MEMBER(trigger_nmi); + void mkit09a(machine_config &config); + void mkit09(machine_config &config); private: uint8_t m_keydata; virtual void machine_reset() override; @@ -189,7 +191,7 @@ WRITE8_MEMBER( mkit09_state::pb_w ) } -static MACHINE_CONFIG_START( mkit09 ) +MACHINE_CONFIG_START(mkit09_state::mkit09) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(mkit09_mem) @@ -215,7 +217,7 @@ static MACHINE_CONFIG_START( mkit09 ) MCFG_CASSETTE_ADD( "cassette" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mkit09a ) +MACHINE_CONFIG_START(mkit09_state::mkit09a) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(mkit09a_mem) diff --git a/src/mame/drivers/mlanding.cpp b/src/mame/drivers/mlanding.cpp index 0fb4a68c1f3..4305ce13003 100644 --- a/src/mame/drivers/mlanding.cpp +++ b/src/mame/drivers/mlanding.cpp @@ -164,6 +164,7 @@ public: uint32_t exec_dma(); void msm5205_update(int chip); + void mlanding(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -908,7 +909,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( mlanding ) +MACHINE_CONFIG_START(mlanding_state::mlanding) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) // Appears to be 68000P8 in PCB photo diff --git a/src/mame/drivers/mmagic.cpp b/src/mame/drivers/mmagic.cpp index b9830e4e728..6d8b3524ee1 100644 --- a/src/mame/drivers/mmagic.cpp +++ b/src/mame/drivers/mmagic.cpp @@ -91,6 +91,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void mmagic(machine_config &config); protected: virtual void machine_start() override; @@ -299,7 +300,7 @@ void mmagic_state::machine_start() // MACHINE DEFINTIONS //************************************************************************** -static MACHINE_CONFIG_START( mmagic ) +MACHINE_CONFIG_START(mmagic_state::mmagic) // basic machine hardware MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz) // NEC D8085A MCFG_CPU_PROGRAM_MAP(mmagic_mem) diff --git a/src/mame/drivers/mmd1.cpp b/src/mame/drivers/mmd1.cpp index a566a5af8ee..f238ed44397 100644 --- a/src/mame/drivers/mmd1.cpp +++ b/src/mame/drivers/mmd1.cpp @@ -175,6 +175,8 @@ public: DECLARE_MACHINE_RESET(mmd1); DECLARE_MACHINE_RESET(mmd2); required_device m_maincpu; + void mmd1(machine_config &config); + void mmd2(machine_config &config); }; @@ -475,7 +477,7 @@ We preset all banks here, so that bankswitching will incur no speed penalty. membank("bank8")->configure_entry(2, &p_ram[0xd800]); } -static MACHINE_CONFIG_START( mmd1 ) +MACHINE_CONFIG_START(mmd1_state::mmd1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, 6750000 / 9) MCFG_CPU_PROGRAM_MAP(mmd1_mem) @@ -487,7 +489,7 @@ static MACHINE_CONFIG_START( mmd1 ) MCFG_DEFAULT_LAYOUT(layout_mmd1) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mmd2 ) +MACHINE_CONFIG_START(mmd1_state::mmd2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, 6750000 / 9) MCFG_CPU_PROGRAM_MAP(mmd2_mem) diff --git a/src/mame/drivers/mmm.cpp b/src/mame/drivers/mmm.cpp index 28728ba37b5..e0cdb2121e6 100644 --- a/src/mame/drivers/mmm.cpp +++ b/src/mame/drivers/mmm.cpp @@ -26,6 +26,7 @@ public: DECLARE_READ8_MEMBER(inputs_r); DECLARE_WRITE8_MEMBER(ay_porta_w); + void mmm(machine_config &config); private: required_device m_maincpu; required_ioport_array<8> m_inputs; @@ -158,7 +159,7 @@ static const z80_daisy_config mmm_daisy_chain[] = }; -static MACHINE_CONFIG_START( mmm ) +MACHINE_CONFIG_START(mmm_state::mmm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,2000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/mmodular.cpp b/src/mame/drivers/mmodular.cpp index f86e255919c..b7f204b2cb9 100644 --- a/src/mame/drivers/mmodular.cpp +++ b/src/mame/drivers/mmodular.cpp @@ -52,6 +52,11 @@ public: { } DECLARE_DRIVER_INIT(gen32); + void alm32(machine_config &config); + void van32(machine_config &config); + void van16(machine_config &config); + void alm16(machine_config &config); + void gen32(machine_config &config); }; @@ -66,6 +71,7 @@ public: DECLARE_READ8_MEMBER(berlinp_input_r); + void berlinp(machine_config &config); private: required_device m_board; required_ioport m_keys; @@ -232,7 +238,7 @@ DRIVER_INIT_MEMBER(mmodular_state, gen32) rom[0x870] = 0x38; } -static MACHINE_CONFIG_START( alm16 ) +MACHINE_CONFIG_START(mmodular_state::alm16) MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(alm16_mem) MCFG_CPU_PERIODIC_INT_DRIVER(mmodular_state, irq2_line_hold, 600) @@ -243,13 +249,13 @@ static MACHINE_CONFIG_START( alm16 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( van16, alm16 ) +MACHINE_CONFIG_DERIVED(mmodular_state::van16, alm16) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(van16_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( alm32 ) +MACHINE_CONFIG_START(mmodular_state::alm32) MCFG_CPU_ADD("maincpu", M68020, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(alm32_mem) MCFG_CPU_PERIODIC_INT_DRIVER(mmodular_state, irq6_line_hold, 750) @@ -262,13 +268,13 @@ static MACHINE_CONFIG_START( alm32 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( van32, alm32 ) +MACHINE_CONFIG_DERIVED(mmodular_state::van32, alm32) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(van32_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gen32 ) +MACHINE_CONFIG_START(mmodular_state::gen32) MCFG_CPU_ADD("maincpu", M68030, XTAL_33_333MHz) MCFG_CPU_PROGRAM_MAP(gen32_mem) MCFG_CPU_PERIODIC_INT_DRIVER(mmodular_state, irq2_line_hold, 375) @@ -281,7 +287,7 @@ static MACHINE_CONFIG_START( gen32 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( berlinp ) +MACHINE_CONFIG_START(berlinp_state::berlinp) MCFG_CPU_ADD("maincpu", M68020, XTAL_24_576MHz) MCFG_CPU_PROGRAM_MAP(berlinp_mem) MCFG_CPU_PERIODIC_INT_DRIVER(berlinp_state, irq2_line_hold, 750) diff --git a/src/mame/drivers/mod8.cpp b/src/mame/drivers/mod8.cpp index 007efd6ed27..8c032e5d750 100644 --- a/src/mame/drivers/mod8.cpp +++ b/src/mame/drivers/mod8.cpp @@ -72,6 +72,7 @@ public: void kbd_put(u8 data); DECLARE_READ8_MEMBER(tty_r); IRQ_CALLBACK_MEMBER(mod8_irq_callback); + void mod8(machine_config &config); private: uint16_t m_tty_data; uint8_t m_tty_key_data; @@ -140,7 +141,7 @@ void mod8_state::kbd_put(u8 data) m_maincpu->set_input_line(0, HOLD_LINE); } -static MACHINE_CONFIG_START( mod8 ) +MACHINE_CONFIG_START(mod8_state::mod8) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8008, 800000) MCFG_CPU_PROGRAM_MAP(mod8_mem) diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp index 9ac1407f6d8..53403563b5a 100644 --- a/src/mame/drivers/model1.cpp +++ b/src/mame/drivers/model1.cpp @@ -1614,7 +1614,7 @@ ROM_START( netmerc ) ROM_LOAD16_BYTE( "u2", 0x0001, 0x4000, CRC(c589f428) SHA1(98dc0114a5f89636b4e237ed954e19f1cfd186ab) ) ROM_END -static MACHINE_CONFIG_START( model1 ) +MACHINE_CONFIG_START(model1_state::model1) MCFG_CPU_ADD("maincpu", V60, 16000000) MCFG_CPU_PROGRAM_MAP(model1_mem) MCFG_CPU_IO_MAP(model1_io) @@ -1654,7 +1654,7 @@ static MACHINE_CONFIG_START( model1 ) MCFG_M1COMM_ADD("m1comm") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(swa, model1) +MACHINE_CONFIG_DERIVED(model1_state::swa, model1) MCFG_SPEAKER_STANDARD_STEREO("dleft", "dright") MCFG_DSBZ80_ADD(DSBZ80_TAG) MCFG_SOUND_ROUTE(0, "dleft", 1.0) @@ -1672,12 +1672,12 @@ static ADDRESS_MAP_START( polhemus_map, AS_PROGRAM, 16, model1_state ) AM_RANGE(0xf8000, 0xfffff) AM_ROM AM_REGION("polhemus", 0) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( netmerc, model1 ) +MACHINE_CONFIG_DERIVED(model1_state::netmerc, model1) MCFG_CPU_ADD("polhemus", I386SX, 16000000) MCFG_CPU_PROGRAM_MAP(polhemus_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( model1_vr ) +MACHINE_CONFIG_START(model1_state::model1_vr) MCFG_CPU_ADD("maincpu", V60, 16000000) MCFG_CPU_PROGRAM_MAP(model1_vr_mem) MCFG_CPU_IO_MAP(model1_vr_io) diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp index 9279bf41ec7..ecd15bc89dc 100644 --- a/src/mame/drivers/model2.cpp +++ b/src/mame/drivers/model2.cpp @@ -2131,7 +2131,7 @@ ADDRESS_MAP_END #define VIDEO_CLOCK XTAL_32MHz /* original Model 2 */ -static MACHINE_CONFIG_START( model2o ) +MACHINE_CONFIG_START(model2_state::model2o) MCFG_CPU_ADD("maincpu", I960, 25000000) MCFG_CPU_PROGRAM_MAP(model2o_mem) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model2_state, model2_interrupt, "screen", 0, 1) @@ -2213,7 +2213,7 @@ static ADDRESS_MAP_START( drive_io_map, AS_IO, 8, model2_state ) AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("driveadc", msm6253_device, d0_r, address_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START( sj25_0207_01 ) +MACHINE_CONFIG_START(model2_state::sj25_0207_01) MCFG_CPU_ADD("drivecpu", Z80, XTAL_8MHz/2) // confirmed MCFG_CPU_PROGRAM_MAP(drive_map) MCFG_CPU_IO_MAP(drive_io_map) @@ -2229,12 +2229,12 @@ static MACHINE_CONFIG_START( sj25_0207_01 ) MCFG_DEVICE_ADD("driveadc", MSM6253, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( daytona, model2o ) +MACHINE_CONFIG_DERIVED(model2_state::daytona, model2o) MCFG_FRAGMENT_ADD(sj25_0207_01) MACHINE_CONFIG_END /* 2A-CRX */ -static MACHINE_CONFIG_START( model2a ) +MACHINE_CONFIG_START(model2_state::model2a) MCFG_CPU_ADD("maincpu", I960, 25000000) MCFG_CPU_PROGRAM_MAP(model2a_crx_mem) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model2_state, model2_interrupt, "screen", 0, 1) @@ -2292,11 +2292,11 @@ static MACHINE_CONFIG_START( model2a ) MCFG_M2COMM_ADD("m2comm") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( manxtt, model2a ) +MACHINE_CONFIG_DERIVED(model2_state::manxtt, model2a) MCFG_MACHINE_START_OVERRIDE(model2_state,srallyc) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( manxttdx, manxtt ) /* Includes a Model 1 Sound board for additional sounds - Deluxe version only */ +MACHINE_CONFIG_DERIVED(model2_state::manxttdx, manxtt) /* Includes a Model 1 Sound board for additional sounds - Deluxe version only */ MCFG_SEGAM1AUDIO_ADD("m1audio") MCFG_SEGAM1AUDIO_RXD_HANDLER(DEVWRITELINE("uart", i8251_device, write_rxd)) @@ -2310,23 +2310,23 @@ uint16_t model2_state::crypt_read_callback(uint32_t addr) return ((dat&0xff00)>>8)|((dat&0x00ff)<<8); } -static MACHINE_CONFIG_DERIVED( model2a_5881, model2a ) +MACHINE_CONFIG_DERIVED(model2_state::model2a_5881, model2a) MCFG_DEVICE_ADD("315_5881", SEGA315_5881_CRYPT, 0) MCFG_SET_READ_CALLBACK(model2_state, crypt_read_callback) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( model2a_0229, model2a ) +MACHINE_CONFIG_DERIVED(model2_state::model2a_0229, model2a) MCFG_DEVICE_ADD("317_0229", SEGA315_5838_COMP, 0) // MCFG_SET_5838_READ_CALLBACK(model2_state, crypt_read_callback) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( srallyc, model2a ) +MACHINE_CONFIG_DERIVED(model2_state::srallyc, model2a) MCFG_MACHINE_START_OVERRIDE(model2_state,srallyc) MCFG_FRAGMENT_ADD(sj25_0207_01) MACHINE_CONFIG_END /* 2B-CRX */ -static MACHINE_CONFIG_START( model2b ) +MACHINE_CONFIG_START(model2_state::model2b) MCFG_CPU_ADD("maincpu", I960, 25000000) MCFG_CPU_PROGRAM_MAP(model2b_crx_mem) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model2_state, model2_interrupt, "screen", 0, 1) @@ -2388,17 +2388,17 @@ static MACHINE_CONFIG_START( model2b ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( model2b_5881, model2b ) +MACHINE_CONFIG_DERIVED(model2_state::model2b_5881, model2b) MCFG_DEVICE_ADD("315_5881", SEGA315_5881_CRYPT, 0) MCFG_SET_READ_CALLBACK(model2_state, crypt_read_callback) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( model2b_0229, model2b ) +MACHINE_CONFIG_DERIVED(model2_state::model2b_0229, model2b) MCFG_DEVICE_ADD("317_0229", SEGA315_5838_COMP, 0) // MCFG_SET_5838_READ_CALLBACK(model2_state, crypt_read_callback) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( indy500, model2b ) +MACHINE_CONFIG_DERIVED(model2_state::indy500, model2b) MCFG_MACHINE_START_OVERRIDE(model2_state,srallyc) MACHINE_CONFIG_END @@ -2413,7 +2413,7 @@ static ADDRESS_MAP_START( rchase2_ioport_map, AS_IO, 8, model2_state ) AM_RANGE(0x00, 0x07) AM_DEVREADWRITE("ioexp", cxd1095_device, read, write) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( rchase2, model2b ) +MACHINE_CONFIG_DERIVED(model2_state::rchase2, model2b) MCFG_CPU_ADD("iocpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(rchase2_iocpu_map) MCFG_CPU_IO_MAP(rchase2_ioport_map) @@ -2427,7 +2427,7 @@ static ADDRESS_MAP_START( copro_tgpx4_map, AS_PROGRAM, 64, model2_state ) ADDRESS_MAP_END /* 2C-CRX */ -static MACHINE_CONFIG_START( model2c ) +MACHINE_CONFIG_START(model2_state::model2c) MCFG_CPU_ADD("maincpu", I960, 25000000) MCFG_CPU_PROGRAM_MAP(model2c_crx_mem) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model2_state, model2c_interrupt, "screen", 0, 1) @@ -2481,7 +2481,7 @@ static MACHINE_CONFIG_START( model2c ) MCFG_M2COMM_ADD("m2comm") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( stcc, model2c ) +MACHINE_CONFIG_DERIVED(model2_state::stcc, model2c) MCFG_DSBZ80_ADD(DSBZ80_TAG) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -2490,12 +2490,12 @@ static MACHINE_CONFIG_DERIVED( stcc, model2c ) MCFG_I8251_TXD_HANDLER(DEVWRITELINE(DSBZ80_TAG, dsbz80_device, write_txd)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( model2c_5881, model2c ) +MACHINE_CONFIG_DERIVED(model2_state::model2c_5881, model2c) MCFG_DEVICE_ADD("315_5881", SEGA315_5881_CRYPT, 0) MCFG_SET_READ_CALLBACK(model2_state, crypt_read_callback) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( overrev2c, model2c ) +MACHINE_CONFIG_DERIVED(model2_state::overrev2c, model2c) MCFG_MACHINE_START_OVERRIDE(model2_state,srallyc) MACHINE_CONFIG_END diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp index 1f7326f5839..35becc40b66 100644 --- a/src/mame/drivers/model3.cpp +++ b/src/mame/drivers/model3.cpp @@ -5800,7 +5800,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(model3_state::model3_interrupt) } } -static MACHINE_CONFIG_START( model3_10 ) +MACHINE_CONFIG_START(model3_state::model3_10) MCFG_CPU_ADD("maincpu", PPC603E, 66000000) MCFG_PPC_BUS_FREQUENCY(66000000) /* Multiplier 1, Bus = 66MHz, Core = 66MHz */ MCFG_CPU_PROGRAM_MAP(model3_10_mem) @@ -5848,7 +5848,7 @@ static MACHINE_CONFIG_START( model3_10 ) MCFG_LEGACY_SCSI_PORT("scsi") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( model3_15 ) +MACHINE_CONFIG_START(model3_state::model3_15) MCFG_CPU_ADD("maincpu", PPC603E, 100000000) MCFG_PPC_BUS_FREQUENCY(66000000) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */ MCFG_CPU_PROGRAM_MAP(model3_mem) @@ -5896,7 +5896,7 @@ static MACHINE_CONFIG_START( model3_15 ) MCFG_M3COMM_ADD("comm_board") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(scud, model3_15) +MACHINE_CONFIG_DERIVED(model3_state::scud, model3_15) MCFG_DSBZ80_ADD(DSBZ80_TAG) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -5909,7 +5909,7 @@ static MACHINE_CONFIG_DERIVED(scud, model3_15) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START(model3_20) +MACHINE_CONFIG_START(model3_state::model3_20) MCFG_CPU_ADD("maincpu", PPC603R, 166000000) MCFG_PPC_BUS_FREQUENCY(66000000) /* Multiplier 2.5, Bus = 66MHz, Core = 166MHz */ MCFG_CPU_PROGRAM_MAP(model3_mem) @@ -5949,12 +5949,12 @@ static MACHINE_CONFIG_START(model3_20) MCFG_M3COMM_ADD("comm_board") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(model3_20_5881, model3_20) +MACHINE_CONFIG_DERIVED(model3_state::model3_20_5881, model3_20) MCFG_DEVICE_ADD("315_5881", SEGA315_5881_CRYPT, 0) MCFG_SET_READ_CALLBACK(model3_state, crypt_read_callback) MACHINE_CONFIG_END -static MACHINE_CONFIG_START(model3_21) +MACHINE_CONFIG_START(model3_state::model3_21) MCFG_CPU_ADD("maincpu", PPC603R, 166000000) MCFG_PPC_BUS_FREQUENCY(66000000) /* Multiplier 2.5, Bus = 66MHz, Core = 166MHz */ MCFG_CPU_PROGRAM_MAP(model3_mem) @@ -6009,7 +6009,7 @@ uint16_t model3_state::crypt_read_callback(uint32_t addr) return dat; } -static MACHINE_CONFIG_DERIVED( model3_21_5881, model3_21 ) +MACHINE_CONFIG_DERIVED(model3_state::model3_21_5881, model3_21) MCFG_DEVICE_ADD("315_5881", SEGA315_5881_CRYPT, 0) MCFG_SET_READ_CALLBACK(model3_state, crypt_read_callback) MACHINE_CONFIG_END diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp index be748b84b32..6c2b9f8d81b 100644 --- a/src/mame/drivers/modellot.cpp +++ b/src/mame/drivers/modellot.cpp @@ -59,6 +59,7 @@ public: void kbd_put(u8 data); uint32_t screen_update_modellot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void modellot(machine_config &config); private: uint8_t m_term_data; virtual void machine_reset() override; @@ -170,7 +171,7 @@ uint32_t modellot_state::screen_update_modellot(screen_device &screen, bitmap_in return 0; } -static MACHINE_CONFIG_START( modellot ) +MACHINE_CONFIG_START(modellot_state::modellot) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/mogura.cpp b/src/mame/drivers/mogura.cpp index 6f11bb8e5b9..7fcd4c78101 100644 --- a/src/mame/drivers/mogura.cpp +++ b/src/mame/drivers/mogura.cpp @@ -41,6 +41,7 @@ public: virtual void video_start() override; DECLARE_PALETTE_INIT(mogura); uint32_t screen_update_mogura(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void mogura(machine_config &config); }; @@ -202,7 +203,7 @@ void mogura_state::machine_start() { } -static MACHINE_CONFIG_START( mogura ) +MACHINE_CONFIG_START(mogura_state::mogura) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,3000000) /* 3 MHz */ diff --git a/src/mame/drivers/mole.cpp b/src/mame/drivers/mole.cpp index 0a52369fba0..366e259ea09 100644 --- a/src/mame/drivers/mole.cpp +++ b/src/mame/drivers/mole.cpp @@ -85,6 +85,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_mole(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void mole(machine_config &config); }; @@ -317,7 +318,7 @@ void mole_state::machine_reset() m_tile_bank = 0; } -static MACHINE_CONFIG_START( mole ) +MACHINE_CONFIG_START(mole_state::mole) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 4000000) // ??? diff --git a/src/mame/drivers/molecular.cpp b/src/mame/drivers/molecular.cpp index ed9ed2f395d..a300fd237c8 100644 --- a/src/mame/drivers/molecular.cpp +++ b/src/mame/drivers/molecular.cpp @@ -93,6 +93,7 @@ public: DECLARE_PALETTE_INIT(molecula); + void molecula(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -284,7 +285,7 @@ PALETTE_INIT_MEMBER(molecula_state, molecula) { } -static MACHINE_CONFIG_START( molecula ) +MACHINE_CONFIG_START(molecula_state::molecula) /* basic machine hardware */ MCFG_CPU_ADD("filecpu",Z80,Z80_CLOCK/2) diff --git a/src/mame/drivers/momoko.cpp b/src/mame/drivers/momoko.cpp index 462f35174a0..ec300a89838 100644 --- a/src/mame/drivers/momoko.cpp +++ b/src/mame/drivers/momoko.cpp @@ -253,7 +253,7 @@ void momoko_state::machine_reset() m_flipscreen = 0; } -static MACHINE_CONFIG_START( momoko ) +MACHINE_CONFIG_START(momoko_state::momoko) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/2) /* 5.0MHz */ diff --git a/src/mame/drivers/monacogp.cpp b/src/mame/drivers/monacogp.cpp index 16946be8c6d..461d134b6b1 100644 --- a/src/mame/drivers/monacogp.cpp +++ b/src/mame/drivers/monacogp.cpp @@ -145,6 +145,7 @@ public: required_device m_maincpu; required_device m_video; + void monacogp(machine_config &config); protected: // driver_device overrides @@ -185,7 +186,7 @@ void monacogp_state::video_start() { } -static MACHINE_CONFIG_START( monacogp ) +MACHINE_CONFIG_START(monacogp_state::monacogp) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/monty.cpp b/src/mame/drivers/monty.cpp index afdfc30a585..c82732ab6a5 100644 --- a/src/mame/drivers/monty.cpp +++ b/src/mame/drivers/monty.cpp @@ -59,6 +59,8 @@ public: // screen updates uint32_t lcd_update(screen_device& screen, bitmap_rgb32& bitmap, const rectangle& cliprect); + void monty(machine_config &config); + void mmonty(machine_config &config); private: required_device m_maincpu; required_device m_speaker; @@ -252,7 +254,7 @@ SED1520_UPDATE_CB(monty_screen_update) // TODO: Additional machine definition - Master Monty has a different memory layout -static MACHINE_CONFIG_START( monty ) +MACHINE_CONFIG_START(monty_state::monty) // Basic machine hardware MCFG_CPU_ADD("maincpu", Z80, 3580000) // Ceramic resonator labeled 3.58MT MCFG_CPU_PROGRAM_MAP(monty_mem) @@ -276,7 +278,7 @@ static MACHINE_CONFIG_START( monty ) MCFG_SED1520_ADD("sed1520_0", monty_screen_update) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mmonty, monty ) +MACHINE_CONFIG_DERIVED(monty_state::mmonty, monty) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(mmonty_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/monzagp.cpp b/src/mame/drivers/monzagp.cpp index 1f6d863860a..f9992ddde60 100644 --- a/src/mame/drivers/monzagp.cpp +++ b/src/mame/drivers/monzagp.cpp @@ -81,6 +81,7 @@ public: required_ioport m_in1; required_ioport m_dsw; + void monzagp(machine_config &config); private: uint8_t m_p1; uint8_t m_p2; @@ -484,7 +485,7 @@ static GFXDECODE_START( monzagp ) GFXDECODE_ENTRY( "gfx3", 0x0000, tile_layout, 0, 8 ) GFXDECODE_END -static MACHINE_CONFIG_START( monzagp ) +MACHINE_CONFIG_START(monzagp_state::monzagp) MCFG_CPU_ADD("maincpu", I8035, 12000000/4) /* 400KHz ??? - Main board Crystal is 12MHz */ MCFG_CPU_PROGRAM_MAP(monzagp_map) MCFG_CPU_IO_MAP(monzagp_io) diff --git a/src/mame/drivers/moo.cpp b/src/mame/drivers/moo.cpp index a6e18d0b203..6d536a1be3e 100644 --- a/src/mame/drivers/moo.cpp +++ b/src/mame/drivers/moo.cpp @@ -490,7 +490,7 @@ MACHINE_RESET_MEMBER(moo_state,moo) m_sprite_colorbase = 0; } -static MACHINE_CONFIG_START( moo ) +MACHINE_CONFIG_START(moo_state::moo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // 16MHz verified @@ -552,7 +552,7 @@ static MACHINE_CONFIG_START( moo ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( moobl ) +MACHINE_CONFIG_START(moo_state::moobl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16100000) @@ -602,7 +602,7 @@ static MACHINE_CONFIG_START( moobl ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bucky, moo ) +MACHINE_CONFIG_DERIVED(moo_state::bucky, moo) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bucky_map) diff --git a/src/mame/drivers/mosaic.cpp b/src/mame/drivers/mosaic.cpp index 58737257407..ca65a166d7a 100644 --- a/src/mame/drivers/mosaic.cpp +++ b/src/mame/drivers/mosaic.cpp @@ -272,7 +272,7 @@ void mosaic_state::machine_reset() m_prot_val = 0; } -static MACHINE_CONFIG_START( mosaic ) +MACHINE_CONFIG_START(mosaic_state::mosaic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, XTAL_12_288MHz/2) /* 6.144MHz */ @@ -303,7 +303,7 @@ static MACHINE_CONFIG_START( mosaic ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gfire2, mosaic ) +MACHINE_CONFIG_DERIVED(mosaic_state::gfire2, mosaic) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(gfire2_map) MCFG_CPU_IO_MAP(gfire2_io_map) diff --git a/src/mame/drivers/mouser.cpp b/src/mame/drivers/mouser.cpp index 7f6fa859b14..6703f1e90d9 100644 --- a/src/mame/drivers/mouser.cpp +++ b/src/mame/drivers/mouser.cpp @@ -199,7 +199,7 @@ void mouser_state::machine_reset() m_sound_byte = 0; } -static MACHINE_CONFIG_START( mouser ) +MACHINE_CONFIG_START(mouser_state::mouser) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */ diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp index ca03e5a893c..00b6f0eed31 100644 --- a/src/mame/drivers/mpf1.cpp +++ b/src/mame/drivers/mpf1.cpp @@ -352,7 +352,7 @@ void mpf1_state::machine_reset() /* Machine Drivers */ -static MACHINE_CONFIG_START( mpf1 ) +MACHINE_CONFIG_START(mpf1_state::mpf1) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_3_579545MHz/2) @@ -387,7 +387,7 @@ static MACHINE_CONFIG_START( mpf1 ) MCFG_TIMER_DRIVER_ADD_PERIODIC("halt_timer", mpf1_state, check_halt_callback, attotime::from_hz(1)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mpf1b ) +MACHINE_CONFIG_START(mpf1_state::mpf1b) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_3_579545MHz/2) MCFG_CPU_PROGRAM_MAP(mpf1b_map) @@ -424,7 +424,7 @@ static MACHINE_CONFIG_START( mpf1b ) MCFG_TIMER_DRIVER_ADD_PERIODIC("halt_timer", mpf1_state, check_halt_callback, attotime::from_hz(1)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mpf1p ) +MACHINE_CONFIG_START(mpf1_state::mpf1p) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, 2500000) MCFG_CPU_PROGRAM_MAP(mpf1p_map) diff --git a/src/mame/drivers/mps1230.cpp b/src/mame/drivers/mps1230.cpp index 5c9ad989890..074b28e96e2 100644 --- a/src/mame/drivers/mps1230.cpp +++ b/src/mame/drivers/mps1230.cpp @@ -97,6 +97,8 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void mps1000(machine_config &config); + void mps1230(machine_config &config); private: }; @@ -133,12 +135,12 @@ ADDRESS_MAP_END static INPUT_PORTS_START( mps1230 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( mps1230 ) +MACHINE_CONFIG_START(mps1230_state::mps1230) MCFG_CPU_ADD(CPU_TAG, UPD7810, 11060000) MCFG_CPU_PROGRAM_MAP(mps1230_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mps1000 ) +MACHINE_CONFIG_START(mps1230_state::mps1000) MCFG_CPU_ADD(CPU_TAG, Z80, 4000000) MCFG_CPU_PROGRAM_MAP(mps1230_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mpu12wbk.cpp b/src/mame/drivers/mpu12wbk.cpp index 21ebe65a1ca..98882ec18e2 100644 --- a/src/mame/drivers/mpu12wbk.cpp +++ b/src/mame/drivers/mpu12wbk.cpp @@ -239,6 +239,7 @@ public: uint32_t screen_update_mpu12wbk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void mpu12wbk(machine_config &config); }; @@ -483,7 +484,7 @@ GFXDECODE_END * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( mpu12wbk ) +MACHINE_CONFIG_START(mpu12wbk_state::mpu12wbk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, MASTER_CLOCK) diff --git a/src/mame/drivers/mpu2.cpp b/src/mame/drivers/mpu2.cpp index 4526113faec..403414cf471 100644 --- a/src/mame/drivers/mpu2.cpp +++ b/src/mame/drivers/mpu2.cpp @@ -49,6 +49,7 @@ public: m_maincpu(*this, "maincpu") { } + void mpu2(machine_config &config); protected: // devices @@ -70,7 +71,7 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( mpu2 ) +MACHINE_CONFIG_START(mpu2_state::mpu2) MCFG_CPU_ADD("maincpu", M6800, 2000000) // ? MCFG_CPU_PROGRAM_MAP(mpu2_basemap) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mpu3.cpp b/src/mame/drivers/mpu3.cpp index 48cf8dbdd00..d13bafe7dfa 100644 --- a/src/mame/drivers/mpu3.cpp +++ b/src/mame/drivers/mpu3.cpp @@ -267,6 +267,7 @@ public: required_device m_reel3; required_device m_meters; optional_device m_vfd; + void mpu3base(machine_config &config); }; #define DISPLAY_PORT 0 @@ -848,7 +849,7 @@ ADDRESS_MAP_END MCFG_STEPPER_INDEX_PATTERN(0x00)\ MCFG_STEPPER_INIT_PHASE(2) -static MACHINE_CONFIG_START( mpu3base ) +MACHINE_CONFIG_START(mpu3_state::mpu3base) MCFG_CPU_ADD("maincpu", M6808, MPU3_MASTER_CLOCK)///4) MCFG_CPU_PROGRAM_MAP(mpu3_basemap) diff --git a/src/mame/drivers/mpu4.cpp b/src/mame/drivers/mpu4.cpp index 7443c63f5c4..56379156786 100644 --- a/src/mame/drivers/mpu4.cpp +++ b/src/mame/drivers/mpu4.cpp @@ -13,12 +13,6 @@ #include "emu.h" #include "includes/mpu4.h" -MACHINE_CONFIG_EXTERN( mod4oki ); -MACHINE_CONFIG_EXTERN( mod4yam ); -MACHINE_CONFIG_EXTERN( mpu4crys ); -MACHINE_CONFIG_EXTERN( bwboki ); -MACHINE_CONFIG_EXTERN( mod2 ); - INPUT_PORTS_EXTERN( mpu4 ); INPUT_PORTS_EXTERN( mpu4_cw ); INPUT_PORTS_EXTERN( mpu4jackpot8tkn ); diff --git a/src/mame/drivers/mpu4avan.cpp b/src/mame/drivers/mpu4avan.cpp index ac610909a87..e90bc74414b 100644 --- a/src/mame/drivers/mpu4avan.cpp +++ b/src/mame/drivers/mpu4avan.cpp @@ -10,7 +10,6 @@ #include "emu.h" #include "includes/mpu4.h" -MACHINE_CONFIG_EXTERN( mod4oki ); INPUT_PORTS_EXTERN( mpu4 ); #define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL) diff --git a/src/mame/drivers/mpu4bwb.cpp b/src/mame/drivers/mpu4bwb.cpp index 7cd3bc76b29..a905042a023 100644 --- a/src/mame/drivers/mpu4bwb.cpp +++ b/src/mame/drivers/mpu4bwb.cpp @@ -24,9 +24,6 @@ #include "emu.h" #include "includes/mpu4.h" -MACHINE_CONFIG_EXTERN( mod4oki ); -MACHINE_CONFIG_EXTERN( bwboki ); -MACHINE_CONFIG_EXTERN( mod2 ); INPUT_PORTS_EXTERN( mpu4 ); #define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL) diff --git a/src/mame/drivers/mpu4concept.cpp b/src/mame/drivers/mpu4concept.cpp index 9ce465f8a4f..a5c69f443d4 100644 --- a/src/mame/drivers/mpu4concept.cpp +++ b/src/mame/drivers/mpu4concept.cpp @@ -5,7 +5,6 @@ #include "emu.h" #include "includes/mpu4.h" -MACHINE_CONFIG_EXTERN( mod4oki ); INPUT_PORTS_EXTERN( mpu4 ); #define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL) diff --git a/src/mame/drivers/mpu4crystal.cpp b/src/mame/drivers/mpu4crystal.cpp index a14016d7bc2..8e7f9268847 100644 --- a/src/mame/drivers/mpu4crystal.cpp +++ b/src/mame/drivers/mpu4crystal.cpp @@ -7,8 +7,6 @@ #include "emu.h" #include "includes/mpu4.h" -MACHINE_CONFIG_EXTERN( mod4oki ); -MACHINE_CONFIG_EXTERN( mpu4crys ); INPUT_PORTS_EXTERN( mpu4 ); #define M4FRKSTN_SOUND \ diff --git a/src/mame/drivers/mpu4dealem.cpp b/src/mame/drivers/mpu4dealem.cpp index a1797b42da3..2fb4e27530f 100644 --- a/src/mame/drivers/mpu4dealem.cpp +++ b/src/mame/drivers/mpu4dealem.cpp @@ -38,6 +38,7 @@ public: uint32_t screen_update_dealem(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(dealem_vsync_changed); required_device m_gfxdecode; + void dealem(machine_config &config); }; @@ -194,7 +195,7 @@ MACHINE_RESET_MEMBER(mpu4dealem_state,dealem_vid) /* machine driver for Zenitone Deal 'Em board */ -static MACHINE_CONFIG_START( dealem ) +MACHINE_CONFIG_START(mpu4dealem_state::dealem) MCFG_MACHINE_START_OVERRIDE(mpu4dealem_state,mod2) /* main mpu4 board initialisation */ MCFG_MACHINE_RESET_OVERRIDE(mpu4dealem_state,dealem_vid) diff --git a/src/mame/drivers/mpu4empire.cpp b/src/mame/drivers/mpu4empire.cpp index 2588230f782..2f78f4f945c 100644 --- a/src/mame/drivers/mpu4empire.cpp +++ b/src/mame/drivers/mpu4empire.cpp @@ -5,7 +5,6 @@ #include "emu.h" #include "includes/mpu4.h" -MACHINE_CONFIG_EXTERN( mod4oki ); INPUT_PORTS_EXTERN( mpu4 ); #include "m4apachg.lh" diff --git a/src/mame/drivers/mpu4mdm.cpp b/src/mame/drivers/mpu4mdm.cpp index 87ea9938c1e..893d34dd8f1 100644 --- a/src/mame/drivers/mpu4mdm.cpp +++ b/src/mame/drivers/mpu4mdm.cpp @@ -5,7 +5,6 @@ #include "emu.h" #include "includes/mpu4.h" -MACHINE_CONFIG_EXTERN( mod4oki ); INPUT_PORTS_EXTERN( mpu4 ); ROM_START( m42punlm ) diff --git a/src/mame/drivers/mpu4misc.cpp b/src/mame/drivers/mpu4misc.cpp index 327ec54c461..d39af661c44 100644 --- a/src/mame/drivers/mpu4misc.cpp +++ b/src/mame/drivers/mpu4misc.cpp @@ -5,7 +5,6 @@ #include "emu.h" #include "includes/mpu4.h" -MACHINE_CONFIG_EXTERN( mod4oki ); INPUT_PORTS_EXTERN( mpu4 ); diff --git a/src/mame/drivers/mpu4mod2sw.cpp b/src/mame/drivers/mpu4mod2sw.cpp index 1b3963cb28a..4a04ea002d1 100644 --- a/src/mame/drivers/mpu4mod2sw.cpp +++ b/src/mame/drivers/mpu4mod2sw.cpp @@ -23,7 +23,6 @@ #include "m4alpha.lh" #include "connect4.lh" -MACHINE_CONFIG_EXTERN( mod2 ); INPUT_PORTS_EXTERN( mpu4 ); INPUT_PORTS_EXTERN( mpu4jackpot8tkn ); diff --git a/src/mame/drivers/mpu4mod4yam.cpp b/src/mame/drivers/mpu4mod4yam.cpp index 643207b831d..57a60be1496 100644 --- a/src/mame/drivers/mpu4mod4yam.cpp +++ b/src/mame/drivers/mpu4mod4yam.cpp @@ -5,7 +5,6 @@ #include "emu.h" #include "includes/mpu4.h" -MACHINE_CONFIG_EXTERN( mod4yam ); INPUT_PORTS_EXTERN( mpu4 ); diff --git a/src/mame/drivers/mpu4plasma.cpp b/src/mame/drivers/mpu4plasma.cpp index dc141ff5d7d..35bf356b998 100644 --- a/src/mame/drivers/mpu4plasma.cpp +++ b/src/mame/drivers/mpu4plasma.cpp @@ -34,12 +34,9 @@ public: { } uint32_t screen_update_mpu4plasma(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void mpu4plasma(machine_config &config); }; - - - -MACHINE_CONFIG_EXTERN( mod2 ); INPUT_PORTS_EXTERN( mpu4 ); static ADDRESS_MAP_START( mpu4plasma_map, AS_PROGRAM, 16, mpu4plasma_state ) @@ -87,7 +84,7 @@ uint32_t mpu4plasma_state::screen_update_mpu4plasma(screen_device &screen, bitma } -MACHINE_CONFIG_DERIVED( mpu4plasma, mod2 ) +MACHINE_CONFIG_DERIVED(mpu4plasma_state::mpu4plasma, mod2) MCFG_CPU_ADD("plasmacpu", M68000, 10000000) MCFG_CPU_PROGRAM_MAP(mpu4plasma_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", mpu4plasma_state, irq4_line_hold) diff --git a/src/mame/drivers/mpu4sw.cpp b/src/mame/drivers/mpu4sw.cpp index 2c4f2335cf7..f8b2dc10823 100644 --- a/src/mame/drivers/mpu4sw.cpp +++ b/src/mame/drivers/mpu4sw.cpp @@ -22,9 +22,6 @@ #include "emu.h" #include "includes/mpu4.h" -MACHINE_CONFIG_EXTERN( mod4yam ); -MACHINE_CONFIG_EXTERN( mod4oki ); -MACHINE_CONFIG_EXTERN( mod2 ); INPUT_PORTS_EXTERN( mpu4 ); INPUT_PORTS_EXTERN( grtecp ); INPUT_PORTS_EXTERN( mpu4jackpot8tkn ); diff --git a/src/mame/drivers/mpu4union.cpp b/src/mame/drivers/mpu4union.cpp index d1656115bf8..ba275980f56 100644 --- a/src/mame/drivers/mpu4union.cpp +++ b/src/mame/drivers/mpu4union.cpp @@ -5,8 +5,6 @@ #include "emu.h" #include "includes/mpu4.h" -MACHINE_CONFIG_EXTERN( mod4oki ); -MACHINE_CONFIG_EXTERN( mod2 ); INPUT_PORTS_EXTERN( mpu4 ); ROM_START( m4cwalk ) diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp index b3f0b32cb9e..5086f210e03 100644 --- a/src/mame/drivers/mpu4vid.cpp +++ b/src/mame/drivers/mpu4vid.cpp @@ -297,6 +297,11 @@ public: DECLARE_WRITE_LINE_MEMBER(mpu_video_reset); DECLARE_WRITE8_MEMBER( vram_w ); DECLARE_READ8_MEMBER( vram_r ); + void mpu4_vid(machine_config &config); + void bwbvid(machine_config &config); + void crmaze(machine_config &config); + void bwbvid5(machine_config &config); + void mating(machine_config &config); }; /************************************* @@ -1258,7 +1263,7 @@ ADDRESS_MAP_END -static MACHINE_CONFIG_START( mpu4_vid ) +MACHINE_CONFIG_START(mpu4vid_state::mpu4_vid) MCFG_CPU_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4 ) MCFG_CPU_PROGRAM_MAP(mpu4_6809_map) @@ -1321,14 +1326,14 @@ static MACHINE_CONFIG_START( mpu4_vid ) MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(mpu4vid_state, m68k_acia_irq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( crmaze, mpu4_vid ) +MACHINE_CONFIG_DERIVED(mpu4vid_state::crmaze, mpu4_vid) MCFG_DEVICE_MODIFY("pia_ic5") MCFG_PIA_READPA_HANDLER(READ8(mpu4vid_state, pia_ic5_porta_track_r)) MCFG_PIA_WRITEPA_HANDLER(NOOP) MCFG_PIA_WRITEPB_HANDLER(NOOP) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mating, crmaze ) +MACHINE_CONFIG_DERIVED(mpu4vid_state::mating, crmaze) MCFG_CPU_MODIFY("video") MCFG_CPU_PROGRAM_MAP(mpu4oki_68k_map) @@ -1339,12 +1344,12 @@ static MACHINE_CONFIG_DERIVED( mating, crmaze ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bwbvid, mpu4_vid ) +MACHINE_CONFIG_DERIVED(mpu4vid_state::bwbvid, mpu4_vid) MCFG_CPU_MODIFY("video") MCFG_CPU_PROGRAM_MAP(bwbvid_68k_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bwbvid5, bwbvid ) +MACHINE_CONFIG_DERIVED(mpu4vid_state::bwbvid5, bwbvid) MCFG_CPU_MODIFY("video") MCFG_CPU_PROGRAM_MAP(bwbvid5_68k_map) diff --git a/src/mame/drivers/mpu5.cpp b/src/mame/drivers/mpu5.cpp index 3982b74e42c..34cb769c132 100644 --- a/src/mame/drivers/mpu5.cpp +++ b/src/mame/drivers/mpu5.cpp @@ -232,6 +232,7 @@ public: DECLARE_READ32_MEMBER(pic_r); DECLARE_WRITE32_MEMBER(pic_w); + void mpu5(machine_config &config); protected: // devices @@ -541,7 +542,7 @@ void mpu5_state::machine_start() } -MACHINE_CONFIG_START( mpu5 ) +MACHINE_CONFIG_START(mpu5_state::mpu5) MCFG_CPU_ADD("maincpu", M68340, 16000000) // ? MCFG_CPU_PROGRAM_MAP(mpu5_map) diff --git a/src/mame/drivers/mpu5.hxx b/src/mame/drivers/mpu5.hxx index 745c5f7907e..64f6626fa35 100644 --- a/src/mame/drivers/mpu5.hxx +++ b/src/mame/drivers/mpu5.hxx @@ -2,7 +2,6 @@ // copyright-holders:David Haywood /* for MPU5 hardware emulation see mpu5hw.c, this just contains the set listing and per machine configs */ -MACHINE_CONFIG_EXTERN( mpu5 ); INPUT_PORTS_EXTERN( mpu5 ); diff --git a/src/mame/drivers/mpz80.cpp b/src/mame/drivers/mpz80.cpp index ef5dae6f6ed..8b28bc18ce4 100644 --- a/src/mame/drivers/mpz80.cpp +++ b/src/mame/drivers/mpz80.cpp @@ -709,7 +709,7 @@ void mpz80_state::machine_reset() // MACHINE_CONFIG( mpz80 ) //------------------------------------------------- -static MACHINE_CONFIG_START( mpz80 ) +MACHINE_CONFIG_START(mpz80_state::mpz80) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(mpz80_mem) diff --git a/src/mame/drivers/mquake.cpp b/src/mame/drivers/mquake.cpp index 274ab4aa73f..fe2447f2b4d 100644 --- a/src/mame/drivers/mquake.cpp +++ b/src/mame/drivers/mquake.cpp @@ -60,6 +60,7 @@ public: DECLARE_READ16_MEMBER( coin_chip_r ); DECLARE_WRITE16_MEMBER( coin_chip_w ); + void mquake(machine_config &config); private: required_device m_es5503; required_region_ptr m_es5503_rom; @@ -302,7 +303,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( mquake ) +MACHINE_CONFIG_START(mquake_state::mquake) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC) diff --git a/src/mame/drivers/mrdo.cpp b/src/mame/drivers/mrdo.cpp index 62117895c62..93de5bf76bc 100644 --- a/src/mame/drivers/mrdo.cpp +++ b/src/mame/drivers/mrdo.cpp @@ -170,7 +170,7 @@ static GFXDECODE_START( mrdo ) GFXDECODE_END -static MACHINE_CONFIG_START( mrdo ) +MACHINE_CONFIG_START(mrdo_state::mrdo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/2) /* Verified */ @@ -198,7 +198,7 @@ static MACHINE_CONFIG_START( mrdo ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mrlo, mrdo ) +MACHINE_CONFIG_DERIVED(mrdo_state::mrlo, mrdo) //MCFG_DEVICE_REMOVE("pal16r6") MACHINE_CONFIG_END diff --git a/src/mame/drivers/mrflea.cpp b/src/mame/drivers/mrflea.cpp index a9acc38e4a3..6ad7ff7a517 100644 --- a/src/mame/drivers/mrflea.cpp +++ b/src/mame/drivers/mrflea.cpp @@ -251,7 +251,7 @@ void mrflea_state::machine_reset() m_gfx_bank = 0; } -static MACHINE_CONFIG_START( mrflea ) +MACHINE_CONFIG_START(mrflea_state::mrflea) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */ diff --git a/src/mame/drivers/mrgame.cpp b/src/mame/drivers/mrgame.cpp index 5cc52fad082..27f05afa0ab 100644 --- a/src/mame/drivers/mrgame.cpp +++ b/src/mame/drivers/mrgame.cpp @@ -85,6 +85,7 @@ public: required_shared_ptr m_p_videoram; required_shared_ptr m_p_objectram; required_device m_gfxdecode; + void mrgame(machine_config &config); private: bool m_ack1; bool m_ack2; @@ -460,7 +461,7 @@ uint32_t mrgame_state::screen_update_mrgame(screen_device &screen, bitmap_ind16 return 0; } -static MACHINE_CONFIG_START( mrgame ) +MACHINE_CONFIG_START(mrgame_state::mrgame) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_6MHz) MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/mrjong.cpp b/src/mame/drivers/mrjong.cpp index e417e14a2d5..8d089d53437 100644 --- a/src/mame/drivers/mrjong.cpp +++ b/src/mame/drivers/mrjong.cpp @@ -183,7 +183,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( mrjong ) +MACHINE_CONFIG_START(mrjong_state::mrjong) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,15468000/6) /* 2.578 MHz?? */ diff --git a/src/mame/drivers/ms0515.cpp b/src/mame/drivers/ms0515.cpp index 62485cb85ec..d1a64c6611f 100644 --- a/src/mame/drivers/ms0515.cpp +++ b/src/mame/drivers/ms0515.cpp @@ -100,6 +100,7 @@ public: DECLARE_WRITE_LINE_MEMBER(irq9_w); DECLARE_WRITE_LINE_MEMBER(irq11_w); + void ms0515(machine_config &config); protected: virtual void machine_reset() override; @@ -513,7 +514,7 @@ WRITE_LINE_MEMBER(ms0515_state::irq11_w) irq_encoder(11, state); } -static MACHINE_CONFIG_START( ms0515 ) +MACHINE_CONFIG_START(ms0515_state::ms0515) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", T11, XTAL_15MHz / 2) // actual CPU is T11 clone, KR1807VM1 MCFG_T11_INITIAL_MODE(0xf2ff) diff --git a/src/mame/drivers/ms32.cpp b/src/mame/drivers/ms32.cpp index 588e80d2576..72563b9f8d6 100644 --- a/src/mame/drivers/ms32.cpp +++ b/src/mame/drivers/ms32.cpp @@ -1399,7 +1399,7 @@ void ms32_state::machine_reset() /********** MACHINE DRIVER **********/ -static MACHINE_CONFIG_START( ms32 ) +MACHINE_CONFIG_START(ms32_state::ms32) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V70, 20000000) // 20MHz @@ -1436,7 +1436,7 @@ static MACHINE_CONFIG_START( ms32 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( f1superb, ms32 ) +MACHINE_CONFIG_DERIVED(ms32_state::f1superb, ms32) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(f1superb_map) diff --git a/src/mame/drivers/ms6102.cpp b/src/mame/drivers/ms6102.cpp index e722393dfce..9ce1cea1f59 100644 --- a/src/mame/drivers/ms6102.cpp +++ b/src/mame/drivers/ms6102.cpp @@ -88,6 +88,7 @@ public: DECLARE_READ8_MEMBER(kbd_get); void kbd_put(u8 data); + void ms6102(machine_config &config); private: bool m_kbd_ready; uint8_t m_kbd_data; @@ -247,7 +248,7 @@ DRIVER_INIT_MEMBER( ms6102_state, ms6102 ) } -static MACHINE_CONFIG_START( ms6102 ) +MACHINE_CONFIG_START(ms6102_state::ms6102) MCFG_CPU_ADD("maincpu", I8080, XTAL_18_432MHz / 9) MCFG_CPU_PROGRAM_MAP(ms6102_mem) MCFG_CPU_IO_MAP(ms6102_io) diff --git a/src/mame/drivers/ms9540.cpp b/src/mame/drivers/ms9540.cpp index c9cf9871bf0..bc7d8560994 100644 --- a/src/mame/drivers/ms9540.cpp +++ b/src/mame/drivers/ms9540.cpp @@ -40,6 +40,7 @@ public: void kbd_put(u8 data); + void ms9540(machine_config &config); private: uint8_t m_term_data; virtual void machine_reset() override; @@ -75,7 +76,7 @@ void ms9540_state::kbd_put(u8 data) m_term_data = data; } -static MACHINE_CONFIG_START( ms9540 ) +MACHINE_CONFIG_START(ms9540_state::ms9540) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) // unknown clock MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/msbc1.cpp b/src/mame/drivers/msbc1.cpp index de6785b02cb..9fc12b93035 100644 --- a/src/mame/drivers/msbc1.cpp +++ b/src/mame/drivers/msbc1.cpp @@ -65,6 +65,7 @@ public: , m_maincpu(*this, MC68000R12_TAG) { } + void msbc1(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -90,7 +91,7 @@ void msbc1_state::machine_reset() m_maincpu->reset(); } -static MACHINE_CONFIG_START( msbc1 ) +MACHINE_CONFIG_START(msbc1_state::msbc1) /* basic machine hardware */ MCFG_CPU_ADD(MC68000R12_TAG, M68000, XTAL_12_5MHz) MCFG_CPU_PROGRAM_MAP(msbc1_mem) diff --git a/src/mame/drivers/msisaac.cpp b/src/mame/drivers/msisaac.cpp index e2dd831c401..e6e9e48b0f7 100644 --- a/src/mame/drivers/msisaac.cpp +++ b/src/mame/drivers/msisaac.cpp @@ -444,7 +444,7 @@ void msisaac_state::machine_reset() #endif } -static MACHINE_CONFIG_START( msisaac ) +MACHINE_CONFIG_START(msisaac_state::msisaac) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) diff --git a/src/mame/drivers/mstation.cpp b/src/mame/drivers/mstation.cpp index c91fb7fefa4..f3de69f9ef3 100644 --- a/src/mame/drivers/mstation.cpp +++ b/src/mame/drivers/mstation.cpp @@ -97,6 +97,7 @@ public: DECLARE_PALETTE_INIT(mstation); TIMER_DEVICE_CALLBACK_MEMBER(mstation_1hz_timer); TIMER_DEVICE_CALLBACK_MEMBER(mstation_kb_timer); + void mstation(machine_config &config); }; @@ -436,7 +437,7 @@ PALETTE_INIT_MEMBER(mstation_state, mstation) } -static MACHINE_CONFIG_START( mstation ) +MACHINE_CONFIG_START(mstation_state::mstation) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) //unknown clock MCFG_CPU_PROGRAM_MAP(mstation_mem) diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp index 02705ff7f37..898fb0367f9 100644 --- a/src/mame/drivers/msx.cpp +++ b/src/mame/drivers/msx.cpp @@ -1243,31 +1243,31 @@ WRITE_LINE_MEMBER(msx_state::turbo_w) #define MSX_VISIBLE_YBORDER_PIXELS 24 -static MACHINE_CONFIG_START( msx1_cartlist ) +MACHINE_CONFIG_START(msx_state::msx1_cartlist) MCFG_SOFTWARE_LIST_ADD("cart_list", "msx1_cart") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx1_floplist ) +MACHINE_CONFIG_START(msx_state::msx1_floplist) MCFG_SOFTWARE_LIST_ADD("flop_list", "msx1_flop") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx2_cartlist ) +MACHINE_CONFIG_START(msx_state::msx2_cartlist) MCFG_SOFTWARE_LIST_ADD("cart_list", "msx2_cart") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_crt_l", "msx1_cart") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx2_floplist ) +MACHINE_CONFIG_START(msx_state::msx2_floplist) MCFG_SOFTWARE_LIST_ADD("flop_list", "msx2_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx2p_floplist ) +MACHINE_CONFIG_START(msx_state::msx2p_floplist) MCFG_SOFTWARE_LIST_ADD("flop_list", "msx2p_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2_flp_l", "msx2_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") // maybe not? MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msxr_floplist ) +MACHINE_CONFIG_START(msx_state::msxr_floplist) MCFG_SOFTWARE_LIST_ADD("flop_list", "msxr_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2p_flp_l", "msx2p_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2_flp_l", "msx2_flop") // maybe not? @@ -1284,12 +1284,12 @@ static SLOT_INTERFACE_START( msx_floppies ) SLOT_INTERFACE( "35ssdd", FLOPPY_35_SSDD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( msx_fd1793 ) +MACHINE_CONFIG_START(msx_state::msx_fd1793) MCFG_FD1793_ADD("fdc", XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx_wd2793_force_ready ) +MACHINE_CONFIG_START(msx_state::msx_wd2793_force_ready) // From NMS8245 schematics: // READY + HLT - pulled high // SSO/-ENMF + -DDEN + ENP + -5/8 - pulled low @@ -1297,11 +1297,11 @@ static MACHINE_CONFIG_START( msx_wd2793_force_ready ) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx_wd2793 ) +MACHINE_CONFIG_START(msx_state::msx_wd2793) MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx_mb8877a ) +MACHINE_CONFIG_START(msx_state::msx_mb8877a) // From CF-3300 FDC schematic: // READY + HLT - pulled high // -DDEN - pulled low @@ -1309,39 +1309,39 @@ static MACHINE_CONFIG_START( msx_mb8877a ) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx_tc8566af ) +MACHINE_CONFIG_START(msx_state::msx_tc8566af) MCFG_TC8566AF_ADD("fdc") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx_microsol ) +MACHINE_CONFIG_START(msx_state::msx_microsol) MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx_1_35_ssdd_drive ) +MACHINE_CONFIG_START(msx_state::msx_1_35_ssdd_drive) MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35ssdd", msx_state::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx_1_35_dd_drive ) +MACHINE_CONFIG_START(msx_state::msx_1_35_dd_drive) MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35dd", msx_state::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx_2_35_dd_drive ) +MACHINE_CONFIG_START(msx_state::msx_2_35_dd_drive) MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35dd", msx_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", msx_floppies, "35dd", msx_state::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx_ym2413 ) +MACHINE_CONFIG_START(msx_state::msx_ym2413) MCFG_SOUND_ADD("ym2413", YM2413, XTAL_21_4772MHz/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx2_64kb_vram ) +MACHINE_CONFIG_START(msx_state::msx2_64kb_vram) MCFG_DEVICE_MODIFY("v9938") v9938_device::static_set_vram_size(*device, 0x10000); MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx ) +MACHINE_CONFIG_START(msx_state::msx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3) /* 3.579545 MHz */ MCFG_CPU_PROGRAM_MAP(msx_memory_map) @@ -1391,7 +1391,7 @@ static MACHINE_CONFIG_START( msx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( msx_ntsc, msx ) +MACHINE_CONFIG_DERIVED(msx_state::msx_ntsc, msx) /* Video hardware */ MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -1401,7 +1401,7 @@ static MACHINE_CONFIG_DERIVED( msx_ntsc, msx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( msx_tms9118, msx ) +MACHINE_CONFIG_DERIVED(msx_state::msx_tms9118, msx) /* Video hardware */ MCFG_DEVICE_ADD( "tms9928a", TMS9118, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -1411,7 +1411,7 @@ static MACHINE_CONFIG_DERIVED( msx_tms9118, msx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( msx_tms9128, msx ) +MACHINE_CONFIG_DERIVED(msx_state::msx_tms9128, msx) /* Video hardware */ MCFG_DEVICE_ADD( "tms9928a", TMS9128, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -1421,7 +1421,7 @@ static MACHINE_CONFIG_DERIVED( msx_tms9128, msx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( msx_tms9918, msx ) +MACHINE_CONFIG_DERIVED(msx_state::msx_tms9918, msx) /* Video hardware */ MCFG_DEVICE_ADD( "tms9928a", TMS9918, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -1431,7 +1431,7 @@ static MACHINE_CONFIG_DERIVED( msx_tms9918, msx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( msx_tms9918a, msx ) +MACHINE_CONFIG_DERIVED(msx_state::msx_tms9918a, msx) /* Video hardware */ MCFG_DEVICE_ADD( "tms9928a", TMS9918A, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -1441,7 +1441,7 @@ static MACHINE_CONFIG_DERIVED( msx_tms9918a, msx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( msx_tms9928, msx ) +MACHINE_CONFIG_DERIVED(msx_state::msx_tms9928, msx) /* Video hardware */ MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -1451,7 +1451,7 @@ static MACHINE_CONFIG_DERIVED( msx_tms9928, msx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( msx_pal, msx ) +MACHINE_CONFIG_DERIVED(msx_state::msx_pal, msx) /* Video hardware */ MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -1461,7 +1461,7 @@ static MACHINE_CONFIG_DERIVED( msx_pal, msx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( msx_tms9129, msx ) +MACHINE_CONFIG_DERIVED(msx_state::msx_tms9129, msx) /* Video hardware */ MCFG_DEVICE_ADD( "tms9928a", TMS9129, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -1471,7 +1471,7 @@ static MACHINE_CONFIG_DERIVED( msx_tms9129, msx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( msx_tms9929, msx ) +MACHINE_CONFIG_DERIVED(msx_state::msx_tms9929, msx) /* Video hardware */ MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -1481,7 +1481,7 @@ static MACHINE_CONFIG_DERIVED( msx_tms9929, msx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx2 ) +MACHINE_CONFIG_START(msx_state::msx2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) /* 3.579545 MHz */ MCFG_CPU_PROGRAM_MAP(msx_memory_map) @@ -1539,7 +1539,7 @@ static MACHINE_CONFIG_START( msx2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( msx2p ) +MACHINE_CONFIG_START(msx_state::msx2p) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) /* 3.579545 MHz */ MCFG_CPU_PROGRAM_MAP(msx_memory_map) @@ -1597,7 +1597,7 @@ static MACHINE_CONFIG_START( msx2p ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( msx2_pal, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::msx2_pal, msx2) MCFG_DEVICE_REMOVE("screen") MCFG_V99X8_SCREEN_ADD_PAL("screen", "v9938", XTAL_21_4772MHz) MACHINE_CONFIG_END @@ -1619,7 +1619,7 @@ ROM_START(ax150) ROM_LOAD ("ax150arab.rom", 0x8000, 0x8000, CRC(339cd1aa) SHA1(0287b2ec897b9196788cd9f10c99e1487d7adbbb)) ROM_END -static MACHINE_CONFIG_DERIVED( ax150, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::ax150, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -1642,7 +1642,7 @@ ROM_START (ax170) ROM_END -static MACHINE_CONFIG_DERIVED( ax170, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::ax170, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -1664,7 +1664,7 @@ ROM_START (canonv8) ROM_LOAD ("v8bios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( canonv8, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::canonv8, msx_ntsc) // AY8910/YM2149?? // FDC: None, 0 drives // 2 Cartridge slots @@ -1685,7 +1685,7 @@ ROM_START (canonv10) ROM_LOAD ("v10bios.rom", 0x0000, 0x8000, CRC(e9ccd789) SHA1(8963fc041975f31dc2ab1019cfdd4967999de53e)) ROM_END -static MACHINE_CONFIG_DERIVED( canonv10, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::canonv10, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -1705,7 +1705,7 @@ ROM_START (canonv20) ROM_LOAD ("v20bios.rom", 0x0000, 0x8000, CRC(e9ccd789) SHA1(8963fc041975f31dc2ab1019cfdd4967999de53e)) ROM_END -static MACHINE_CONFIG_DERIVED( canonv20, msx_tms9929 ) +MACHINE_CONFIG_DERIVED(msx_state::canonv20, msx_tms9929) // YM2149 // FDC: None, 0 drives // 2 Cartridge slots @@ -1753,7 +1753,7 @@ ROM_START (mx10) ROM_LOAD( "mx10bios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( mx10, msx_tms9118 ) +MACHINE_CONFIG_DERIVED(msx_state::mx10, msx_tms9118) // FDC: None, 0 drives // 2? Cartridge slots // Z80: uPD780C-1 @@ -1773,7 +1773,7 @@ ROM_START (mx15) ROM_LOAD( "mx15bios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( mx15, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::mx15, msx_ntsc) // FDC: None, 0 drives // 3 Cartridge slots // T6950 @@ -1794,7 +1794,7 @@ ROM_START (mx101) ROM_LOAD( "mx101bios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( mx101, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::mx101, msx_ntsc) // FDC: None, 0 drives // 2? Cartridge slots @@ -1813,7 +1813,7 @@ ROM_START (pv7) ROM_LOAD("pv7bios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( pv7, msx_tms9118 ) +MACHINE_CONFIG_DERIVED(msx_state::pv7, msx_tms9118) // AY8910? // FDC: None, 0 drives // 1 Cartridge slot + expansion slot, or 2 cartridge slots? @@ -1838,7 +1838,7 @@ ROM_START (pv16) ROM_LOAD("pv16.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( pv16, msx_tms9118 ) +MACHINE_CONFIG_DERIVED(msx_state::pv16, msx_tms9118) // AY8910 // FDC: None, 0 drives // 1 Cartridge slot @@ -1860,7 +1860,7 @@ ROM_START (cpc88) ROM_RELOAD (0xa000, 0x2000) ROM_END -static MACHINE_CONFIG_DERIVED( cpc88, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::cpc88, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2? Cartridge slots @@ -1882,7 +1882,7 @@ ROM_START (dpc100) ROM_LOAD ("100han.rom", 0x8000, 0x4000, CRC(97478efb) SHA1(4421fa2504cbce18f7c84b5ea97f04e017007f07)) ROM_END -static MACHINE_CONFIG_DERIVED( dpc100, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::dpc100, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -1904,7 +1904,7 @@ ROM_START (dpc180) ROM_LOAD ("180han.rom", 0x8000, 0x4000, CRC(97478efb) SHA1(4421fa2504cbce18f7c84b5ea97f04e017007f07)) ROM_END -static MACHINE_CONFIG_DERIVED( dpc180, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::dpc180, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -1926,7 +1926,7 @@ ROM_START (dpc200) ROM_LOAD ("200han.rom", 0x8000, 0x4000, CRC(97478efb) SHA1(4421fa2504cbce18f7c84b5ea97f04e017007f07)) ROM_END -static MACHINE_CONFIG_DERIVED( dpc200, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::dpc200, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -1947,7 +1947,7 @@ ROM_START (dpc200e) ROM_LOAD ("dpc200ebios.rom", 0x0000, 0x8000, CRC(8205795e) SHA1(829c00c3114f25b3dae5157c0a238b52a3ac37db)) ROM_END -static MACHINE_CONFIG_DERIVED( dpc200e, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::dpc200e, msx_pal) // AY8910 // FDC: None, 0 drives // 2 Cartridge slots @@ -1967,7 +1967,7 @@ ROM_START (cpc50a) ROM_LOAD ("50abios.rom", 0x0000, 0x8000, CRC(c3a868ef) SHA1(a08a940aa87313509e00bc5ac7494d53d8e03492)) ROM_END -static MACHINE_CONFIG_DERIVED( cpc50a, msx_tms9918 ) +MACHINE_CONFIG_DERIVED(msx_state::cpc50a, msx_tms9918) // AY8910/YM2149? // FDC: None, 0 drives // 1? Cartridge slot @@ -1990,7 +1990,7 @@ ROM_START (cpc50b) ROM_LOAD ("50bbios.rom", 0x0000, 0x8000, CRC(c3a868ef) SHA1(a08a940aa87313509e00bc5ac7494d53d8e03492)) ROM_END -static MACHINE_CONFIG_DERIVED( cpc50b, msx_tms9118 ) +MACHINE_CONFIG_DERIVED(msx_state::cpc50b, msx_tms9118) // AY8910/YM2149? // FDC: None, 0 drives // 1? Cartridge slot @@ -2012,7 +2012,7 @@ ROM_START (cpc51) ROM_LOAD ("51bios.rom", 0x0000, 0x8000, CRC(c3a868ef) SHA1(a08a940aa87313509e00bc5ac7494d53d8e03492)) ROM_END -static MACHINE_CONFIG_DERIVED( cpc51, msx_tms9118 ) +MACHINE_CONFIG_DERIVED(msx_state::cpc51, msx_tms9118) // AY8910/YM2149? // FDC: None, 0 drives // 1 Cartridge slot @@ -2034,7 +2034,7 @@ ROM_START (fdpc200) ROM_LOAD ("dpc200bios.rom", 0x0000, 0x8000, CRC(8205795e) SHA1(829c00c3114f25b3dae5157c0a238b52a3ac37db)) ROM_END -static MACHINE_CONFIG_DERIVED( fdpc200, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::fdpc200, msx_pal) // AY8910 // FDC: None, 0 drives // 2 Cartridge slots @@ -2054,7 +2054,7 @@ ROM_START (fpc500) ROM_LOAD ("fpc500bios.rom", 0x0000, 0x8000, CRC(8205795e) SHA1(829c00c3114f25b3dae5157c0a238b52a3ac37db)) ROM_END -static MACHINE_CONFIG_DERIVED( fpc500, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::fpc500, msx_pal) // AY8910? // FDC: None, 0 drives // 2 Cartridge slots @@ -2074,7 +2074,7 @@ ROM_START (fspc800) ROM_LOAD ("spc800bios.rom", 0x0000, 0x8000, CRC(8205795e) SHA1(829c00c3114f25b3dae5157c0a238b52a3ac37db)) ROM_END -static MACHINE_CONFIG_DERIVED( fspc800, msx_tms9929 ) +MACHINE_CONFIG_DERIVED(msx_state::fspc800, msx_tms9929) // AY8910? // FDC: None, 0 drives // 2 Cartridge slots @@ -2095,7 +2095,7 @@ ROM_START (bruc100) ROM_LOAD("bruc100-1bios.rom", 0x0000, 0x8000, CRC(c7bc4298) SHA1(3abca440cba16ac5e162b602557d30169f77adab)) ROM_END -static MACHINE_CONFIG_DERIVED( bruc100, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::bruc100, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -2115,7 +2115,7 @@ ROM_START (fmx) ROM_LOAD ("fmxbios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( fmx, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::fmx, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 1 Cartridge slot, 2 "Fujistu expansion slots @@ -2138,7 +2138,7 @@ ROM_START (gsfc80u) ROM_RELOAD (0xa000, 0x2000) ROM_END -static MACHINE_CONFIG_DERIVED( gsfc80u, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::gsfc80u, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2160,7 +2160,7 @@ ROM_START (gsfc200) ROM_LOAD ("fc200bios.rom.u5b", 0x4000, 0x4000, CRC(1a99b1a1) SHA1(e18f72271b64693a2a2bc226e1b9ebd0448e07c0)) ROM_END -static MACHINE_CONFIG_DERIVED( gsfc200, msx_tms9129 ) +MACHINE_CONFIG_DERIVED(msx_state::gsfc200, msx_tms9129) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2182,7 +2182,7 @@ ROM_START (gfc1080) ROM_LOAD ("gfc1080pasocalc.rom", 0xC000, 0x4000, CRC(4014f7ea) SHA1(a5581fa3ce10f90f15ba3dc53d57b02d6e4af172)) ROM_END -static MACHINE_CONFIG_DERIVED( gfc1080, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::gfc1080, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -2204,7 +2204,7 @@ ROM_START (gfc1080a) ROM_RELOAD (0xa000, 0x2000) ROM_END -static MACHINE_CONFIG_DERIVED( gfc1080a, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::gfc1080a, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -2224,7 +2224,7 @@ ROM_START (expert10) ROM_LOAD ("expbios.rom", 0x0000, 0x8000, CRC(07610d77) SHA1(ef3e010eb57e4476700a3bbff9d2119ab3acdf62)) ROM_END -static MACHINE_CONFIG_DERIVED( expert10, msx_tms9128 ) +MACHINE_CONFIG_DERIVED(msx_state::expert10, msx_tms9128) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2243,7 +2243,7 @@ ROM_START (expert11) ROM_LOAD ("expbios11.rom", 0x0000, 0x8000, CRC(efb4b972) SHA1(d6720845928ee848cfa88a86accb067397685f02)) ROM_END -static MACHINE_CONFIG_DERIVED( expert11, msx_tms9128 ) +MACHINE_CONFIG_DERIVED(msx_state::expert11, msx_tms9128) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2262,7 +2262,7 @@ ROM_START (expert13) ROM_LOAD ("expbios13.rom", 0x0000, 0x8000, CRC(5638bc38) SHA1(605f5af3f358c6811f54e0173bad908614a198c0)) ROM_END -static MACHINE_CONFIG_DERIVED( expert13, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::expert13, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -2282,7 +2282,7 @@ ROM_START (expertdp) ROM_LOAD ("eddpdisk.rom", 0x8000, 0x4000, CRC(549f1d90) SHA1(f1525de4e0b60a6687156c2a96f8a8b2044b6c56)) ROM_END -static MACHINE_CONFIG_DERIVED( expertdp, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::expertdp, msx_ntsc) // AY8910/YM2149? // FDC: mb8877a, 1 3.5" DSDD drive // 2 Cartridge slots @@ -2309,7 +2309,7 @@ ROM_START (expertpl) ROM_LOAD ("exppdemo.rom", 0x8000, 0x4000, CRC(a9bbef64) SHA1(d4cea8c815f3eeabe0c6a1c845f902ec4318bf6b)) ROM_END -static MACHINE_CONFIG_DERIVED( expertpl, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::expertpl, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2332,7 +2332,7 @@ ROM_START (mbh2) ROM_LOAD ("mbh2firm.rom", 0x8000, 0x4000, CRC(4f03c947) SHA1(e2140fa2e8e59090ecccf55b62323ea9dcc66d0b)) ROM_END -static MACHINE_CONFIG_DERIVED( mbh2, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::mbh2, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2354,7 +2354,7 @@ ROM_START (mbh25) ROM_LOAD ("mbh25bios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( mbh25, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::mbh25, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2374,7 +2374,7 @@ ROM_START (mbh50) ROM_LOAD ("mbh50bios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( mbh50, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::mbh50, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2395,7 +2395,7 @@ ROM_START (jvchc7gb) ROM_LOAD ("hc7gbbios.rom", 0x0000, 0x8000, CRC(e9ccd789) SHA1(8963fc041975f31dc2ab1019cfdd4967999de53e)) ROM_END -static MACHINE_CONFIG_DERIVED( jvchc7gb, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::jvchc7gb, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2415,7 +2415,7 @@ ROM_START (mlf48) ROM_LOAD ("mlf48bios.rom", 0x0000, 0x8000, CRC(e9ccd789) SHA1(8963fc041975f31dc2ab1019cfdd4967999de53e)) ROM_END -static MACHINE_CONFIG_DERIVED( mlf48, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::mlf48, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2435,7 +2435,7 @@ ROM_START (mlf80) ROM_LOAD ("mlf80bios.rom", 0x0000, 0x8000, CRC(e9ccd789) SHA1(8963fc041975f31dc2ab1019cfdd4967999de53e)) ROM_END -static MACHINE_CONFIG_DERIVED( mlf80, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::mlf80, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2455,7 +2455,7 @@ ROM_START (mlf110) ROM_LOAD ("mlf110bios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( mlf110, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::mlf110, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2476,7 +2476,7 @@ ROM_START (mlf120) ROM_LOAD ("mlf120firm.rom", 0x8000, 0x4000, CRC(4b5f3173) SHA1(21a9f60cb6370d0617ce54c42bb7d8e40a4ab560)) ROM_END -static MACHINE_CONFIG_DERIVED( mlf120, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::mlf120, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2? Cartridge slots @@ -2497,7 +2497,7 @@ ROM_START (mlfx1) ROM_LOAD ("mlfx1bios.rom", 0x0000, 0x8000, CRC(62867dce) SHA1(0cbe0df4af45e8f531e9c761403ac9e71808f20c)) ROM_END -static MACHINE_CONFIG_DERIVED( mlfx1, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::mlfx1, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2517,7 +2517,7 @@ ROM_START (cf1200) ROM_LOAD ("1200bios.rom", 0x0000, 0x8000, CRC(5ad03407) SHA1(c7a2c5baee6a9f0e1c6ee7d76944c0ab1886796c)) ROM_END -static MACHINE_CONFIG_DERIVED( cf1200, msx_tms9918a ) +MACHINE_CONFIG_DERIVED(msx_state::cf1200, msx_tms9918a) // AY8910 // FDC: None, 0 drives // 2 Cartridge slots @@ -2537,7 +2537,7 @@ ROM_START (cf2000) ROM_LOAD ("2000bios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( cf2000, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::cf2000, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2556,7 +2556,7 @@ ROM_START (cf2700) ROM_LOAD ("2700bios.rom.ic32", 0x0000, 0x8000, CRC(5ad03407) SHA1(c7a2c5baee6a9f0e1c6ee7d76944c0ab1886796c)) ROM_END -static MACHINE_CONFIG_DERIVED( cf2700, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::cf2700, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2576,7 +2576,7 @@ ROM_START (cf3000) ROM_LOAD ("3000bios.rom", 0x0000, 0x8000, CRC(5ad03407) SHA1(c7a2c5baee6a9f0e1c6ee7d76944c0ab1886796c)) ROM_END -static MACHINE_CONFIG_DERIVED( cf3000, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::cf3000, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2596,7 +2596,7 @@ ROM_START (cf3300) ROM_LOAD ("3300disk.rom", 0x8000, 0x4000, CRC(549f1d90) SHA1(f1525de4e0b60a6687156c2a96f8a8b2044b6c56)) ROM_END -static MACHINE_CONFIG_DERIVED( cf3300, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::cf3300, msx_ntsc) // AY8910/YM2149? // FDC: mb8877a, 1 3.5" SSDD drive // 2 Cartridge slots @@ -2621,7 +2621,7 @@ ROM_START (fs1300) ROM_LOAD ("1300bios.rom", 0x0000, 0x8000, CRC(5ad03407) SHA1(c7a2c5baee6a9f0e1c6ee7d76944c0ab1886796c)) ROM_END -static MACHINE_CONFIG_DERIVED( fs1300, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::fs1300, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2646,7 +2646,7 @@ ROM_START (fs4000) ROM_LOAD ("4000kfn.rom", 0, 0x20000, CRC(956dc96d) SHA1(9ed3ab6d893632b9246e91b412cd5db519e7586b)) ROM_END -static MACHINE_CONFIG_DERIVED( fs4000, msx_tms9128 ) +MACHINE_CONFIG_DERIVED(msx_state::fs4000, msx_tms9128) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2673,7 +2673,7 @@ ROM_START (fs4000a) ROM_LOAD ("4000kfn.rom", 0, 0x20000, CRC(956dc96d) SHA1(9ed3ab6d893632b9246e91b412cd5db519e7586b)) ROM_END -static MACHINE_CONFIG_DERIVED( fs4000a, msx_tms9128 ) +MACHINE_CONFIG_DERIVED(msx_state::fs4000a, msx_tms9128) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2695,7 +2695,7 @@ ROM_START (phc2) ROM_LOAD ("phc2bios.rom", 0x0000, 0x8000, CRC(4f7bb04b) SHA1(ab0177624d46dd77ab4f50ffcb983c3ba88223f4)) ROM_END -static MACHINE_CONFIG_DERIVED( phc2, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::phc2, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -2715,7 +2715,7 @@ ROM_START (phc28) ROM_LOAD ("phc28bios.rom", 0x0000, 0x8000, CRC(eceb2802) SHA1(195950173701abeb460a1a070d83466f3f53b337)) ROM_END -static MACHINE_CONFIG_DERIVED( phc28, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::phc28, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -2735,7 +2735,7 @@ ROM_START (cf2700g) ROM_LOAD ("cf2700g.rom", 0x0000, 0x8000, CRC(4aa194f4) SHA1(69bf27b610e11437dad1f7a1c37a63179a293d12)) ROM_END -static MACHINE_CONFIG_DERIVED( cf2700g, msx_tms9929 ) +MACHINE_CONFIG_DERIVED(msx_state::cf2700g, msx_tms9929) // AY8910 // FDC: None, 0 drives // 2 Cartridge slots @@ -2757,7 +2757,7 @@ ROM_START (perfect1) ROM_RELOAD (0x10000, 0x8000) ROM_END -static MACHINE_CONFIG_DERIVED( perfect1, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::perfect1, msx_pal) // AY8910/YM2149? // FDC: None, 0 dribes // 1 Cartridge slot @@ -2777,7 +2777,7 @@ ROM_START (nms801) ROM_LOAD ("801bios.rom", 0x0000, 0x8000, CRC(fa089461) SHA1(21329398c0f350e330b353f45f21aa7ba338fc8d)) ROM_END -static MACHINE_CONFIG_DERIVED( nms801, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::nms801, msx_pal) // AY8910 // FDC: None, 0 drives // 0 Cartridge slots @@ -2794,7 +2794,7 @@ ROM_START (vg8000) ROM_LOAD ("8000bios.rom", 0x0000, 0x8000, CRC(efd970b0) SHA1(42252cf87deeb58181a7bfec7c874190a1351779)) ROM_END -static MACHINE_CONFIG_DERIVED( vg8000, msx_tms9129 ) +MACHINE_CONFIG_DERIVED(msx_state::vg8000, msx_tms9129) // AY8910 // FDC: None, 0 drives // 2 Cartridge slots @@ -2815,7 +2815,7 @@ ROM_START (vg8010) ROM_LOAD ("8010bios.rom", 0x0000, 0x8000, CRC(efd970b0) SHA1(42252cf87deeb58181a7bfec7c874190a1351779)) ROM_END -static MACHINE_CONFIG_DERIVED( vg8010, msx_tms9129 ) +MACHINE_CONFIG_DERIVED(msx_state::vg8010, msx_tms9129) // AY8910 // FDC: None, 0 drives // 2 Cartridge slots @@ -2836,7 +2836,7 @@ ROM_START (vg8010f) ROM_LOAD ("8010fbios.rom", 0x0000, 0x8000, CRC(df57c9ca) SHA1(898630ad1497dc9a329580c682ee55c4bcb9c30c)) ROM_END -static MACHINE_CONFIG_DERIVED( vg8010f, msx_tms9129 ) +MACHINE_CONFIG_DERIVED(msx_state::vg8010f, msx_tms9129) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2857,7 +2857,7 @@ ROM_START (vg802000) ROM_LOAD ("8020-00bios.rom", 0x0000, 0x8000, CRC(8205795e) SHA1(829c00c3114f25b3dae5157c0a238b52a3ac37db)) ROM_END -static MACHINE_CONFIG_DERIVED( vg802000, msx_tms9929 ) +MACHINE_CONFIG_DERIVED(msx_state::vg802000, msx_tms9929) // YM2149 // FDC: None, 0 drives // 2 Cartridge slots @@ -2877,7 +2877,7 @@ ROM_START (vg802020) ROM_LOAD ("8020-20bios.rom", 0x0000, 0x8000, CRC(a317e6b4) SHA1(e998f0c441f4f1800ef44e42cd1659150206cf79)) ROM_END -static MACHINE_CONFIG_DERIVED( vg802020, msx_tms9129 ) +MACHINE_CONFIG_DERIVED(msx_state::vg802020, msx_tms9129) // YM2149 (in S-3527 MSX Engine) // FDC: None, 0 drives // 2 Cartridge slots @@ -2898,7 +2898,7 @@ ROM_START (vg8020f) ROM_LOAD ("vg8020f.rom", 0x0000, 0x8000, CRC(6e692fa1) SHA1(9eaad185efc8e224368d1db4949eb9659c26fb2c)) ROM_END -static MACHINE_CONFIG_DERIVED( vg8020f, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::vg8020f, msx_pal) // YM2149 (in S-3527 MSX Engine) // FDC: None, 0 drives // 2 Cartridge slots @@ -2921,7 +2921,7 @@ ROM_START (piopx7) ROM_FILL( 0xa000, 0x2000, 0x6E ) ROM_END -static MACHINE_CONFIG_DERIVED( piopx7, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::piopx7, msx_pal) // TMS9129NL VDP with sync/overlay interface // AY-3-8910 PSG // Pioneer System Remote (SR) system control interface @@ -2965,7 +2965,7 @@ ROM_START (piopx7uk) ROM_LOAD ("videoart.rom", 0xc000, 0x8000, CRC(0ba148dc) SHA1(b7b4e4cd40a856bb071976e6cf0f5e546fc86a78)) ROM_END -static MACHINE_CONFIG_DERIVED( piopx7uk, msx_tms9129 ) +MACHINE_CONFIG_DERIVED(msx_state::piopx7uk, msx_tms9129) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -2988,7 +2988,7 @@ ROM_START (piopxv60) ROM_FILL( 0xa000, 0x2000, 0x6E ) ROM_END -static MACHINE_CONFIG_DERIVED( piopxv60, msx_tms9128 ) +MACHINE_CONFIG_DERIVED(msx_state::piopxv60, msx_tms9128) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -3010,7 +3010,7 @@ ROM_START (spc800) ROM_LOAD ("spc800han.rom", 0x8000, 0x4000, CRC(5ae2b013) SHA1(1e7616261a203580c1044205ad8766d104f1d874)) ROM_END -static MACHINE_CONFIG_DERIVED( spc800, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::spc800, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3031,7 +3031,7 @@ ROM_START (mpc64) ROM_LOAD ("mpc64bios.rom", 0x0000, 0x8000, CRC(d6e704ad) SHA1(d67be6d7d56d7229418f4e122f2ec27990db7d19)) ROM_END -static MACHINE_CONFIG_DERIVED( mpc64, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::mpc64, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3051,7 +3051,7 @@ ROM_START (mpc100) ROM_LOAD ("mpc100bios.rom", 0x0000, 0x8000, CRC(e9ccd789) SHA1(8963fc041975f31dc2ab1019cfdd4967999de53e)) ROM_END -static MACHINE_CONFIG_DERIVED( mpc100, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::mpc100, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -3071,7 +3071,7 @@ ROM_START (mpc200) ROM_LOAD ("mpc200bios.rom", 0x0000, 0x8000, CRC(e9ccd789) SHA1(8963fc041975f31dc2ab1019cfdd4967999de53e)) ROM_END -static MACHINE_CONFIG_DERIVED( mpc200, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::mpc200, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2? Cartridge slots @@ -3093,7 +3093,7 @@ ROM_START (mpc200sp) ROM_LOAD ("mpcsp200bios.rom", 0x0000, 0x8000, CRC(bcd79900) SHA1(fc8c2b69351e60dc902add232032c2d69f00e41e)) ROM_END -static MACHINE_CONFIG_DERIVED( mpc200sp, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::mpc200sp, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2? Cartridge slots @@ -3113,7 +3113,7 @@ ROM_START (phc28l) ROM_LOAD ("28lbios.rom", 0x0000, 0x8000, CRC(d2110d66) SHA1(d3af963e2529662eae63f04a2530454685a1989f)) ROM_END -static MACHINE_CONFIG_DERIVED( phc28l, msx_tms9929 ) +MACHINE_CONFIG_DERIVED(msx_state::phc28l, msx_tms9929) // YM2149 // FDC: None, 0 drives // 2 Cartridge slots @@ -3133,7 +3133,7 @@ ROM_START (phc28s) ROM_LOAD ("28sbios.rom", 0x0000, 0x8000, CRC(e5cf6b3c) SHA1(b1cce60ef61c058f5e42ef7ac635018d1a431168)) ROM_END -static MACHINE_CONFIG_DERIVED( phc28s, msx_tms9929 ) +MACHINE_CONFIG_DERIVED(msx_state::phc28s, msx_tms9929) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3153,7 +3153,7 @@ ROM_START (mpc10) ROM_LOAD ("mpc10.rom", 0x0000, 0x8000, CRC(e9ccd789) SHA1(8963fc041975f31dc2ab1019cfdd4967999de53e)) ROM_END -static MACHINE_CONFIG_DERIVED( mpc10, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::mpc10, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3173,7 +3173,7 @@ ROM_START (hotbit11) ROM_LOAD ("hotbit11.rom", 0x0000, 0x8000, CRC(b6942694) SHA1(663f8c512d04d213fa616b0db5eefe3774012a4b)) ROM_END -static MACHINE_CONFIG_DERIVED( hotbit11, msx_tms9128 ) +MACHINE_CONFIG_DERIVED(msx_state::hotbit11, msx_tms9128) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -3193,7 +3193,7 @@ ROM_START (hotbit12) ROM_LOAD ("hotbit12.rom", 0x0000, 0x8000, CRC(f59a4a0c) SHA1(9425815446d468058705bae545ffa13646744a87)) ROM_END -static MACHINE_CONFIG_DERIVED( hotbit12, msx_tms9128 ) +MACHINE_CONFIG_DERIVED(msx_state::hotbit12, msx_tms9128) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -3213,7 +3213,7 @@ ROM_START (hotbi13b) ROM_LOAD ("hotbit13b.rom", 0x0000, 0x8000, CRC(7a19820e) SHA1(e0c2bfb078562d15acabc5831020a2370ea87052)) ROM_END -static MACHINE_CONFIG_DERIVED( hotbi13b, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::hotbi13b, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3233,7 +3233,7 @@ ROM_START (hotbi13p) ROM_LOAD ("hotbit13p.rom", 0x0000, 0x8000, CRC(150e239c) SHA1(942f9507d206cd8156f15601fe8032fcf0e3875b)) ROM_END -static MACHINE_CONFIG_DERIVED( hotbi13p, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::hotbi13p, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3253,7 +3253,7 @@ ROM_START (hb10) ROM_LOAD ("hb10bios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( hb10, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::hb10, msx_ntsc) // YM2149 (in S-1985 MSX-Engine) // FDC: None, 0 drives // 2 Cartridge slots @@ -3276,7 +3276,7 @@ ROM_START (hb10p) ROM_LOAD ("10pbios.rom", 0x0000, 0x8000, CRC(0f488dd8) SHA1(5e7c8eab238712d1e18b0219c0f4d4dae180420d)) ROM_END -static MACHINE_CONFIG_DERIVED( hb10p, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hb10p, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -3297,7 +3297,7 @@ ROM_START (hb20p) ROM_LOAD ("20pbios.rom", 0x0000, 0x8000, CRC(21af423f) SHA1(365c93d7652c9f727221689bcc348652832a7b7a)) ROM_END -static MACHINE_CONFIG_DERIVED( hb20p, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hb20p, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -3320,7 +3320,7 @@ ROM_START (hb201) ROM_FILL( 0xc000, 0x4000, 0xff ) ROM_END -static MACHINE_CONFIG_DERIVED( hb201, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::hb201, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3342,7 +3342,7 @@ ROM_START (hb201p) ROM_LOAD ("201pnote.rom.ic8", 0x8000, 0x4000, CRC(1ff9b6ec) SHA1(e84d3ec7a595ee36b50e979683c84105c1871857)) ROM_END -static MACHINE_CONFIG_DERIVED( hb201p, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hb201p, msx_pal) // YM2149 // FDC: None, 0 drives // 2 Cartridge slots @@ -3363,7 +3363,7 @@ ROM_START (hb501p) ROM_LOAD ("501pbios.rom", 0x0000, 0x8000, CRC(0f488dd8) SHA1(5e7c8eab238712d1e18b0219c0f4d4dae180420d)) ROM_END -static MACHINE_CONFIG_DERIVED( hb501p, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hb501p, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -3384,7 +3384,7 @@ ROM_START (hb55) ROM_LOAD ("hb55note.rom", 0x8000, 0x2000, CRC(5743ab55) SHA1(b9179db93608c4da649532e704f072e0a3ea1b22)) ROM_END -static MACHINE_CONFIG_DERIVED( hb55, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::hb55, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3406,7 +3406,7 @@ ROM_START (hb55d) ROM_LOAD ("55dnote.rom", 0x8000, 0x4000, CRC(8aae0494) SHA1(97ce59892573cac3c440efff6d74c8a1c29a5ad3)) ROM_END -static MACHINE_CONFIG_DERIVED( hb55d, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hb55d, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3429,7 +3429,7 @@ ROM_START (hb55p) ROM_LOAD ("55pnote.ic44", 0x8000, 0x4000, CRC(492b12f8) SHA1(b262aedc71b445303f84efe5e865cbb71fd7d952)) ROM_END -static MACHINE_CONFIG_DERIVED( hb55p, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hb55p, msx_pal) // AY8910 // FDC: None, 0 drives // 2 Cartridge slots @@ -3451,7 +3451,7 @@ ROM_START (hb75d) ROM_LOAD ("75dnote.rom", 0x8000, 0x4000, CRC(8aae0494) SHA1(97ce59892573cac3c440efff6d74c8a1c29a5ad3)) ROM_END -static MACHINE_CONFIG_DERIVED( hb75d, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hb75d, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3474,7 +3474,7 @@ ROM_START (hb75p) ROM_LOAD ("75pnote.ic44", 0x8000, 0x4000, CRC(492b12f8) SHA1(b262aedc71b445303f84efe5e865cbb71fd7d952)) ROM_END -static MACHINE_CONFIG_DERIVED( hb75p, msx_tms9929 ) +MACHINE_CONFIG_DERIVED(msx_state::hb75p, msx_tms9929) // AY8910 // FDC: None, 0 drives // 2 Cartridge slots? @@ -3496,7 +3496,7 @@ ROM_START (hb101p) ROM_LOAD ("101pnote.rom", 0x8000, 0x4000, CRC(525017c2) SHA1(8ffc24677fd9d2606a79718764261cdf02434f0a)) ROM_END -static MACHINE_CONFIG_DERIVED( hb101p, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hb101p, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -3518,7 +3518,7 @@ ROM_START (hb701fd) ROM_LOAD ("hb701fddisk.rom", 0x8000, 0x4000, CRC(71961d9d) SHA1(2144036d6573d666143e890e5413956bfe8f66c5)) ROM_END -static MACHINE_CONFIG_DERIVED( hb701fd, msx_tms9928 ) +MACHINE_CONFIG_DERIVED(msx_state::hb701fd, msx_tms9928) // YM2149 (in S-1985) // FDC: WD2793?, 1 3.5" SSDD drive // 2 Cartridge slots @@ -3545,7 +3545,7 @@ ROM_START (svi728) // ROM_LOAD ("707disk.rom", 0x8000, 0x4000, CRC(f9978853) SHA1(6aa856cc56eb98863c9da7a566571605682b5c6b)) ROM_END -static MACHINE_CONFIG_DERIVED( svi728, msx_tms9129 ) +MACHINE_CONFIG_DERIVED(msx_state::svi728, msx_tms9129) // AY8910 // FDC: None, 0 drives // 1 Cartridge slots, 1 Expansion slot (eg for SVI-707) @@ -3569,7 +3569,7 @@ ROM_START (svi738) ROM_FILL (0xe000, 0x2000, 0xff) ROM_END -static MACHINE_CONFIG_DERIVED( svi738, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::svi738, msx_pal) // AY8910 // FDC: wd1793, 1 3.5" SSDD drive // 2 Cartridge slots @@ -3601,7 +3601,7 @@ ROM_START (svi738ar) ROM_LOAD ("738arab.rom", 0x10000, 0x8000, CRC(339cd1aa) SHA1(0287b2ec897b9196788cd9f10c99e1487d7adbbb)) ROM_END -static MACHINE_CONFIG_DERIVED( svi738ar, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::svi738ar, msx_pal) // AY8910 // FDC: wd2793, 1 3.5" SSDD drive // 2 Cartridge slots @@ -3633,7 +3633,7 @@ ROM_START (svi738dk) ROM_FILL (0xe000, 0x2000, 0xff) ROM_END -static MACHINE_CONFIG_DERIVED( svi738dk, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::svi738dk, msx_pal) // AY8910 // FDC: wd2793, 1 3.5" SSDD drive // 2 Cartridge slots @@ -3664,7 +3664,7 @@ ROM_START (svi738sp) ROM_FILL (0xe000, 0x2000, 0xff) ROM_END -static MACHINE_CONFIG_DERIVED( svi738sp, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::svi738sp, msx_pal) // AY8910 // FDC: wd2793, 1 3.5" SSDD drive // 2 Cartridge slots @@ -3695,7 +3695,7 @@ ROM_START (svi738sw) ROM_FILL (0xe000, 0x2000, 0xff) ROM_END -static MACHINE_CONFIG_DERIVED( svi738sw, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::svi738sw, msx_pal) // AY8910 // FDC: wd2793, 1 3.5" SSDD drive // 2 Cartridge slots @@ -3726,7 +3726,7 @@ ROM_START (svi738pl) ROM_FILL (0xe000, 0x2000, 0xff) ROM_END -static MACHINE_CONFIG_DERIVED( svi738pl, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::svi738pl, msx_pal) // AY8910 // FDC: wd2793, 1 3.5" SSDD drive // 2 Cartridge slots @@ -3754,7 +3754,7 @@ ROM_START (tadpc200) ROM_LOAD ("dpc200bios.rom", 0x0000, 0x8000, CRC(8205795e) SHA1(829c00c3114f25b3dae5157c0a238b52a3ac37db)) ROM_END -static MACHINE_CONFIG_DERIVED( tadpc200, msx_tms9129 ) +MACHINE_CONFIG_DERIVED(msx_state::tadpc200, msx_tms9129) // AY8910 // FDC: None, 0 drives // 2 Cartridge slots @@ -3774,7 +3774,7 @@ ROM_START (tadpc20a) ROM_LOAD ("dpc200abios.rom", 0x0000, 0x8000, CRC(8205795e) SHA1(829c00c3114f25b3dae5157c0a238b52a3ac37db)) ROM_END -static MACHINE_CONFIG_DERIVED( tadpc20a, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::tadpc20a, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3795,7 +3795,7 @@ ROM_START (hx10) ROM_LOAD ("tcx-1007.ic15", 0x0000, 0x8000, CRC(5486b711) SHA1(4dad9de7c28b452351cc12910849b51bd9a37ab3)) ROM_END -static MACHINE_CONFIG_DERIVED( hx10, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hx10, msx_pal) // AY8910 // FDC: None, 0 drives // 1 Cartridge slot, 1 Toshiba Expension slot @@ -3815,7 +3815,7 @@ ROM_START (hx10d) ROM_LOAD ("hx10dbios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( hx10d, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::hx10d, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3835,7 +3835,7 @@ ROM_START (hx10dp) ROM_LOAD ("hx10dpbios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( hx10dp, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::hx10dp, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3855,7 +3855,7 @@ ROM_START (hx10e) ROM_LOAD ("hx10ebios.rom", 0x0000, 0x8000, CRC(5486b711) SHA1(4dad9de7c28b452351cc12910849b51bd9a37ab3)) ROM_END -static MACHINE_CONFIG_DERIVED( hx10e, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hx10e, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3875,7 +3875,7 @@ ROM_START (hx10f) ROM_LOAD ("hx10fbios.rom", 0x0000, 0x8000, CRC(e0e894b7) SHA1(d99eebded5db5fce1e072d08e642c0909bc7efdd)) ROM_END -static MACHINE_CONFIG_DERIVED( hx10f, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hx10f, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3895,7 +3895,7 @@ ROM_START (hx10s) ROM_LOAD ("hx10sbios.rom", 0x0000, 0x8000, CRC(5486b711) SHA1(4dad9de7c28b452351cc12910849b51bd9a37ab3)) ROM_END -static MACHINE_CONFIG_DERIVED( hx10s, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hx10s, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3915,7 +3915,7 @@ ROM_START (hx10sa) ROM_LOAD ("hx10sabios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( hx10sa, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::hx10sa, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -3936,7 +3936,7 @@ ROM_START (hx20) ROM_LOAD ("hx20word.rom", 0x8000, 0x8000, CRC(39b3e1c0) SHA1(9f7cfa932bd7dfd0d9ecaadc51655fb557c2e125)) ROM_END -static MACHINE_CONFIG_DERIVED( hx20, msx_tms9129 ) +MACHINE_CONFIG_DERIVED(msx_state::hx20, msx_tms9129) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -3960,7 +3960,7 @@ ROM_START (hx20i) ROM_LOAD ("hx20iword.rom", 0x8000, 0x8000, CRC(39b3e1c0) SHA1(9f7cfa932bd7dfd0d9ecaadc51655fb557c2e125)) ROM_END -static MACHINE_CONFIG_DERIVED( hx20i, msx_tms9129 ) +MACHINE_CONFIG_DERIVED(msx_state::hx20i, msx_tms9129) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -3987,7 +3987,7 @@ ROM_START (hx21) ROM_LOAD ("hx21kfn.rom", 0x0000, 0x20000, CRC(d23d4d2d) SHA1(db03211b7db46899df41db2b1dfbec972109a967)) ROM_END -static MACHINE_CONFIG_DERIVED( hx21, msx_tms9928 ) +MACHINE_CONFIG_DERIVED(msx_state::hx21, msx_tms9928) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -4009,7 +4009,7 @@ ROM_START (hx21i) ROM_LOAD ("hx21iword.rom", 0x8000, 0x8000, CRC(f9e29c66) SHA1(3289336b2c12161fd926a7e5ce865770ae7038af)) ROM_END -static MACHINE_CONFIG_DERIVED( hx21i, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hx21i, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -4035,7 +4035,7 @@ ROM_START (hx22) ROM_LOAD ("hx22kfn.rom", 0x0000, 0x20000, CRC(d23d4d2d) SHA1(db03211b7db46899df41db2b1dfbec972109a967)) ROM_END -static MACHINE_CONFIG_DERIVED( hx22, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::hx22, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -4058,7 +4058,7 @@ ROM_START (hx22i) ROM_LOAD ("hx22iword.rom", 0x8000, 0x8000, CRC(f9e29c66) SHA1(3289336b2c12161fd926a7e5ce865770ae7038af)) ROM_END -static MACHINE_CONFIG_DERIVED( hx22i, msx_tms9929 ) +MACHINE_CONFIG_DERIVED(msx_state::hx22i, msx_tms9929) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -4082,7 +4082,7 @@ ROM_START (hc5) ROM_LOAD ("hc5bios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( hc5, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::hc5, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives, // 2 Cartridge slots? @@ -4102,7 +4102,7 @@ ROM_START (hc6) ROM_LOAD ("hc6bios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( hc6, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::hc6, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives, // 2 Cartridge slots? @@ -4122,7 +4122,7 @@ ROM_START (hc7) ROM_LOAD ("hc7bios.rom", 0x0000, 0x8000, CRC(ee229390) SHA1(302afb5d8be26c758309ca3df611ae69cced2821)) ROM_END -static MACHINE_CONFIG_DERIVED( hc7, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::hc7, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives, // 2 Cartridge slots? @@ -4142,7 +4142,7 @@ ROM_START (cx5f1) ROM_LOAD ("cx5fbios.rom", 0x0000, 0x8000, CRC(dc662057) SHA1(36d77d357a5fd15af2ab266ee66e5091ba4770a3)) ROM_END -static MACHINE_CONFIG_DERIVED( cx5f1, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::cx5f1, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 1 Cartridge slot? @@ -4164,7 +4164,7 @@ ROM_START (cx5f) ROM_LOAD ("cx5fbios.rom", 0x0000, 0x8000, CRC(dc662057) SHA1(36d77d357a5fd15af2ab266ee66e5091ba4770a3)) ROM_END -static MACHINE_CONFIG_DERIVED( cx5f, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::cx5f, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 1 Cartridge slot? @@ -4186,7 +4186,7 @@ ROM_START (cx5m) ROM_LOAD ("cx5mbios.rom", 0x0000, 0x8000, CRC(e2242b53) SHA1(706dd67036baeec7127e4ccd8c8db8f6ce7d0e4c)) ROM_END -static MACHINE_CONFIG_DERIVED( cx5m, msx_tms9929 ) +MACHINE_CONFIG_DERIVED(msx_state::cx5m, msx_tms9929) // YM2149 // FDC: None, 0 drives // 2 Cartridge slots @@ -4210,7 +4210,7 @@ ROM_START (cx5m128) ROM_LOAD ("yrm502.rom", 0x14000, 0x4000, CRC(5330fe21) SHA1(7b1798561ee1844a7d6432924fbee9b4fc591c19)) ROM_END -static MACHINE_CONFIG_DERIVED( cx5m128, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::cx5m128, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -4234,7 +4234,7 @@ ROM_START (cx5m2) ROM_LOAD ("cx5m2ext.rom", 0x8000, 0x4000, CRC(feada82e) SHA1(48b0c2ff1f1e407cc44394219f7b3878efaa919f)) ROM_END -static MACHINE_CONFIG_DERIVED( cx5m2, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::cx5m2, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -4257,7 +4257,7 @@ ROM_START (yis303) ROM_FILL( 0x8000, 0xc000, 0xff ) ROM_END -static MACHINE_CONFIG_DERIVED( yis303, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::yis303, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -4279,7 +4279,7 @@ ROM_START (yis503) ROM_FILL( 0x8000, 0xc000, 0xff ) ROM_END -static MACHINE_CONFIG_DERIVED( yis503, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::yis503, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -4300,7 +4300,7 @@ ROM_START (yis503f) ROM_LOAD ("yis503f.rom", 0x0000, 0x8000, CRC(e9ccd789) SHA1(8963fc041975f31dc2ab1019cfdd4967999de53e)) ROM_END -static MACHINE_CONFIG_DERIVED( yis503f, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::yis503f, msx_pal) // YM2149 // FDC: None, 0 drives // 2 Cartridge slots @@ -4320,7 +4320,7 @@ ROM_START (yis503ii) ROM_LOAD ("yis503iibios.rom", 0x0000, 0x8000, CRC(e2242b53) SHA1(706dd67036baeec7127e4ccd8c8db8f6ce7d0e4c)) ROM_END -static MACHINE_CONFIG_DERIVED( yis503ii, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::yis503ii, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -4342,7 +4342,7 @@ ROM_START (y503iir) ROM_LOAD ("yis503iirnet.rom", 0xc000, 0x2000, CRC(0731db3f) SHA1(264fbb2de69fdb03f87dc5413428f6aa19511a7f)) ROM_END -static MACHINE_CONFIG_DERIVED( y503iir, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::y503iir, msx_pal) // YM2149 (in S-3527 MSX Engine) // FDC: wd2793/mb8877?, 1 3.5" DSDD drive // 2 Cartridge slots @@ -4373,7 +4373,7 @@ ROM_START (y503iir2) ROM_LOAD ("yis503iirnet.rom", 0xc000, 0x2000, CRC(0731db3f) SHA1(264fbb2de69fdb03f87dc5413428f6aa19511a7f)) ROM_END -static MACHINE_CONFIG_DERIVED( y503iir2, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::y503iir2, msx_pal) // AY8910/YM2149? // FDC: wd2793/mb8877?, 1 3.5" DSDD drive? // 2 Cartridge slots? @@ -4399,7 +4399,7 @@ ROM_START (yis503m) ROM_LOAD ("yis503mbios.rom", 0x0000, 0x8000, CRC(e2242b53) SHA1(706dd67036baeec7127e4ccd8c8db8f6ce7d0e4c)) ROM_END -static MACHINE_CONFIG_DERIVED( yis503m, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::yis503m, msx_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -4420,7 +4420,7 @@ ROM_START (yc64) ROM_LOAD ("yc64bios.rom", 0x0000, 0x8000, CRC(e9ccd789) SHA1(8963fc041975f31dc2ab1019cfdd4967999de53e)) ROM_END -static MACHINE_CONFIG_DERIVED( yc64, msx_pal ) +MACHINE_CONFIG_DERIVED(msx_state::yc64, msx_pal) // YM2149 // FDC: None, 0 drives // 1 Cartridge slot (slot 1) @@ -4439,7 +4439,7 @@ ROM_START (mx64) ROM_LOAD ("mx64bios.rom", 0x0000, 0x8000, CRC(e0e894b7) SHA1(d99eebded5db5fce1e072d08e642c0909bc7efdd)) ROM_END -static MACHINE_CONFIG_DERIVED( mx64, msx_ntsc ) +MACHINE_CONFIG_DERIVED(msx_state::mx64, msx_ntsc) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -4467,7 +4467,7 @@ ROM_START (ax350) ROM_LOAD ("ax350disk.rom", 0x2c000, 0x4000, CRC(1e7d6512) SHA1(78cd7f847e77fd8cd51a647efb2725ba93f4c471)) ROM_END -static MACHINE_CONFIG_DERIVED( ax350, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::ax350, msx2_pal) // AY8910/YM2149? // FDC: wd2793/tc8566af?, 1 3.5" DSDD drive // 2 Cartridge slots? @@ -4502,7 +4502,7 @@ ROM_START (ax370) ROM_LOAD ("ax370disk.rom", 0x2c000, 0x4000, CRC(60f8baba) SHA1(95de8809d2758fc0a743390ea5085b602e59e101)) ROM_END -static MACHINE_CONFIG_DERIVED( ax370, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::ax370, msx2_pal) // AY8910/YM2149? // FDC: tc8566af, 1 3.5" DSDD drive // 2 Cartridge slots? @@ -4533,7 +4533,7 @@ ROM_START (canonv25) ROM_LOAD ("v25ext.rom", 0x8000, 0x4000, CRC(4a48779c) SHA1(b8e30d604d319d511cbfbc61e5d8c38fbb9c5a33)) ROM_END -static MACHINE_CONFIG_DERIVED( canonv25, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::canonv25, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: None, 0 drives // 2 Cartridge slots @@ -4562,7 +4562,7 @@ ROM_START (canonv30) ROM_LOAD ("v30disk.rom", 0xc000, 0x4000, CRC(54c73ad6) SHA1(12f2cc79b3d09723840bae774be48c0d721ec1c6)) ROM_END -static MACHINE_CONFIG_DERIVED( canonv30, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::canonv30, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: ??, 2 3.5" DSDD drive // 2 Cartridge slots @@ -4593,7 +4593,7 @@ ROM_START (canonv30f) ROM_LOAD ("v30fdisk.rom", 0xc000, 0x4000, CRC(54c73ad6) SHA1(12f2cc79b3d09723840bae774be48c0d721ec1c6)) ROM_END -static MACHINE_CONFIG_DERIVED( canonv30f, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::canonv30f, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: ??, 2 3.5" DSDD drive // 2 Cartridge slots @@ -4624,7 +4624,7 @@ ROM_START (cpc300) ROM_LOAD ("300han.rom", 0x10000, 0x8000, CRC(e78cd87f) SHA1(47a9d9a24e4fc6f9467c6e7d61a02d45f5a753ef)) ROM_END -static MACHINE_CONFIG_DERIVED( cpc300, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::cpc300, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: None, 0 drives // 2 Cartridge slots @@ -4653,7 +4653,7 @@ ROM_START (cpc300e) ROM_LOAD ("300ehan.rom", 0x10000, 0x4000, BAD_DUMP CRC(5afea78d) SHA1(f08c91f8c78d681e1f02eaaaaafb87ad81112b60)) ROM_END -static MACHINE_CONFIG_DERIVED( cpc300e, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::cpc300e, msx2) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -4680,7 +4680,7 @@ ROM_START (cpc330k) ROM_LOAD ("330khan.rom", 0x10000, 0x4000, CRC(3d6dd335) SHA1(d2b058989a700ca772b9591f42c01ed0f45f74d6)) ROM_END -static MACHINE_CONFIG_DERIVED( cpc330k, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::cpc330k, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: None, 0 drives // 2 Cartridge slots @@ -4713,7 +4713,7 @@ ROM_START (cpc400) ROM_LOAD ("400kfn.rom", 0, 0x20000, CRC(b663c605) SHA1(965f4982790f1817bcbabbb38c8777183b231a55)) ROM_END -static MACHINE_CONFIG_DERIVED( cpc400, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::cpc400, msx2) // AY8910/YM2149? // FDC: mb8877a, 1 3.5" DS?DD drive // 2 Cartridge slots? @@ -4747,7 +4747,7 @@ ROM_START (cpc400s) ROM_LOAD ("400skfn.rom", 0, 0x20000, CRC(fa85368c) SHA1(30fff22e3e3d464993707488442721a5e56a9707)) ROM_END -static MACHINE_CONFIG_DERIVED( cpc400s, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::cpc400s, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: mb8877a, 1 3.5" DS?DD drive // 2 Cartridge slots @@ -4782,7 +4782,7 @@ ROM_START (cpc61) ROM_LOAD ("61kfn.rom", 0x00000, 0x40000, CRC(9a3cf67c) SHA1(22d5f4e522250dc5eb17e15b68f4a51bb752cba1)) ROM_END -static MACHINE_CONFIG_DERIVED( cpc61, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::cpc61, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: None, 0 drives // 1 Cartridge slot @@ -4814,7 +4814,7 @@ ROM_START (cpg120) ROM_LOAD ("cpg120kfn.rom", 0x0000, 0x40000, CRC(9a3cf67c) SHA1(22d5f4e522250dc5eb17e15b68f4a51bb752cba1)) ROM_END -static MACHINE_CONFIG_DERIVED( cpg120, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::cpg120, msx2) // YM2149 (in S1985) // FDC: None, 0 drives // 2 Cartridge slots? @@ -4851,7 +4851,7 @@ ROM_START (fpc900) ROM_LOAD ("fpc900disk.rom", 0xc000, 0x4000, CRC(ca3307d3) SHA1(c3efedda7ab947a06d9345f7b8261076fa7ceeef)) ROM_END -static MACHINE_CONFIG_DERIVED( fpc900, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::fpc900, msx2_pal) // YM2149 (in S-3527 MSX Engine) // FDC: WD2793?, 1 3.5" DSDD drive // 2? Cartridge slots @@ -4882,7 +4882,7 @@ ROM_START (expert20) ROM_LOAD ("microsoldisk.rom", 0x10000, 0x4000, CRC(6704ef81) SHA1(a3028515ed829e900cc8deb403e17b09a38bf9b0)) ROM_END -static MACHINE_CONFIG_DERIVED( expert20, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::expert20, msx2_pal) // AY8910/YM2149? // FDC: microsol, 1? 3.5"? DS?DD drive // 2 Cartridge slots? @@ -4916,7 +4916,7 @@ ROM_START (mbh70) ROM_LOAD ("mbh70kfn.rom", 0x0000, 0x20000, CRC(d23d4d2d) SHA1(db03211b7db46899df41db2b1dfbec972109a967)) ROM_END -static MACHINE_CONFIG_DERIVED( mbh70, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::mbh70, msx2) // YM2149 (in S-1985) // FDC: WD2793?, 1? 3.5" DSDD drive // S-1985 MSX Engine @@ -4952,7 +4952,7 @@ ROM_START (kmc5000) ROM_LOAD ("kmc5000kfn.rom", 0, 0x20000, CRC(c61ddc5d) SHA1(5e872d5853698731a0ed22fb72dbcdfd59cd19c3)) ROM_END -static MACHINE_CONFIG_DERIVED( kmc5000, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::kmc5000, msx2) // YM2149 (in S-1985) // FDC: TC8566AF?, 1? 3.5" DSDD drive // S-1985 MSX Engine @@ -4984,7 +4984,7 @@ ROM_START (mlg1) ROM_LOAD ("mlg1paint.rom", 0xc000, 0x8000, CRC(64df1750) SHA1(5cf0abca6dbcf940bc33c433ecb4e4ada02fbfe6)) ROM_END -static MACHINE_CONFIG_DERIVED( mlg1, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::mlg1, msx2_pal) // YM2149 (in S-1985) // FDC: None, 0 drives // S-1985 MSX Engine @@ -5012,7 +5012,7 @@ ROM_START (mlg3) ROM_LOAD ("mlg3rs232c.rom", 0x10000, 0x4000, CRC(90b8a114) SHA1(dc50f2c9db233e505b0981c244ff3de553ac9d68)) ROM_END -static MACHINE_CONFIG_DERIVED( mlg3, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::mlg3, msx2_pal) // YM2149 (in S-1985) // FDC: wd2793?, 1 3.5" DSDD drive // S-1985 MSX Engine @@ -5046,7 +5046,7 @@ ROM_START (mlg10) ROM_LOAD ("mlg10kfn.rom", 0, 0x20000, CRC(d23d4d2d) SHA1(db03211b7db46899df41db2b1dfbec972109a967)) ROM_END -static MACHINE_CONFIG_DERIVED( mlg10, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::mlg10, msx2) // YM2149 (in S-1985) // FDC: None, 0 drives // S-1985 MSX Engine @@ -5075,7 +5075,7 @@ ROM_START (mlg30) ROM_LOAD ("g30kfn.rom", 0x0000, 0x20000, CRC(d23d4d2d) SHA1(db03211b7db46899df41db2b1dfbec972109a967)) ROM_END -static MACHINE_CONFIG_DERIVED( mlg30, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::mlg30, msx2) // AY8910/YM2149? // FDC: wd2793/tc8566af?, 1 or 2? 3.5" DSDD drives // 2 Cartridge slots? @@ -5116,7 +5116,7 @@ ROM_START (fs4500) ROM_LOAD ("4500budi.rom", 0, 0x20000, CRC(f94590f8) SHA1(1ebb06062428fcdc66808a03761818db2bba3c73)) ROM_END -static MACHINE_CONFIG_DERIVED( fs4500, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::fs4500, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: None, 0 drives // 2 Cartridge slots @@ -5163,7 +5163,7 @@ ROM_START (fs4600) ROM_LOAD ("4600kf12.rom", 0, 0x20000, CRC(340d1ef7) SHA1(a7a23dc01314e88381eee88b4878b39931ab4818)) ROM_END -static MACHINE_CONFIG_DERIVED( fs4600, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::fs4600, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: mb8877a, 1 3.5" DSDD drive // 2 Cartridge slots @@ -5213,7 +5213,7 @@ ROM_START (fs4700) ROM_LOAD ("4700budi.rom", 0, 0x20000, CRC(f94590f8) SHA1(1ebb06062428fcdc66808a03761818db2bba3c73)) ROM_END -static MACHINE_CONFIG_DERIVED( fs4700, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::fs4700, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: mb8877a, 1 3.5" DSDD drive // 2 Cartridge slots @@ -5260,7 +5260,7 @@ ROM_START (fs5000) ROM_LOAD ("5000kfn.rom", 0, 0x20000, CRC(c61ddc5d) SHA1(5e872d5853698731a0ed22fb72dbcdfd59cd19c3)) ROM_END -static MACHINE_CONFIG_DERIVED( fs5000, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::fs5000, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: wd2793, 2 3.5" DSDD drives // 2 Cartridge slots @@ -5306,7 +5306,7 @@ ROM_START (fs5500f1) ROM_LOAD ("5500kfn.rom", 0, 0x20000, CRC(956dc96d) SHA1(9ed3ab6d893632b9246e91b412cd5db519e7586b)) ROM_END -static MACHINE_CONFIG_DERIVED( fs5500f1, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::fs5500f1, msx2) // YM2149 in (S-1985 MSX Engine) // FDC: mb8877a, 1 3.5" DSDD drive // 2 Cartridge slots @@ -5354,7 +5354,7 @@ ROM_START (fs5500f2) ROM_LOAD ("5500kfn.rom", 0, 0x20000, CRC(956dc96d) SHA1(9ed3ab6d893632b9246e91b412cd5db519e7586b)) ROM_END -static MACHINE_CONFIG_DERIVED( fs5500f2, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::fs5500f2, msx2) // YM2149 in (S-1985 MSX Engine) // FDC: mb8877a, 2 3.5" DSDD drive // 2 Cartridge slots @@ -5394,7 +5394,7 @@ ROM_START (fsa1) ROM_LOAD ("a1desk2.rom", 0x18000, 0x8000, CRC(7f6f4aa1) SHA1(7f5b76605e3d898cc4b5aacf1d7682b82fe84353)) ROM_END -static MACHINE_CONFIG_DERIVED( fsa1, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::fsa1, msx2) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -5420,7 +5420,7 @@ ROM_START (fsa1a) ROM_LOAD ("a1desk2.rom", 0x14000, 0x8000, CRC(7f6f4aa1) SHA1(7f5b76605e3d898cc4b5aacf1d7682b82fe84353)) ROM_END -static MACHINE_CONFIG_DERIVED( fsa1a, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::fsa1a, msx2) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -5450,7 +5450,7 @@ ROM_START (fsa1f) ROM_LOAD ("a1fkfn.rom", 0, 0x20000, CRC(c61ddc5d) SHA1(5e872d5853698731a0ed22fb72dbcdfd59cd19c3)) ROM_END -static MACHINE_CONFIG_DERIVED( fsa1f, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::fsa1f, msx2) // AY8910/YM2149? // FDC: tc8566af, 1 3.5" DSDD drive // 2 Cartridge slots @@ -5489,7 +5489,7 @@ ROM_START (fsa1fm) ROM_LOAD ("a1fmkf12.rom", 0, 0x20000, CRC(340d1ef7) SHA1(a7a23dc01314e88381eee88b4878b39931ab4818)) ROM_END -static MACHINE_CONFIG_DERIVED( fsa1fm, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::fsa1fm, msx2) // AY8910/YM2149? // FDC: tc8566af, 1 3.5" DSDD drive // 2 Cartridge slots @@ -5523,7 +5523,7 @@ ROM_START (fsa1mk2) ROM_LOAD ("a1mkcoc3.rom", 0x18000, 0x8000, CRC(c1945676) SHA1(a3f4e2e4934074925d775afe30ac72f150ede543)) ROM_END -static MACHINE_CONFIG_DERIVED( fsa1mk2, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::fsa1mk2, msx2) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -5550,7 +5550,7 @@ ROM_START (nms8220) ROM_LOAD ("8220pen.rom.u13", 0xc000, 0x4000, CRC(3d38c53e) SHA1(cb754aed85b3e97a7d3c5894310df7ca18f89f41)) ROM_END -static MACHINE_CONFIG_DERIVED( nms8220, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::nms8220, msx2_pal) // YM2149 (in S-3527 MSX Engine) // FDC: None, 0 drives // 2 Cartridge slots @@ -5576,7 +5576,7 @@ ROM_START (nms8220a) ROM_LOAD ("8220pena.rom.u13", 0xc000, 0x4000, CRC(17817b5a) SHA1(5df95d033ae70b107697b69470126ce1b7ae9eb5)) ROM_END -static MACHINE_CONFIG_DERIVED( nms8220a, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::nms8220a, msx2_pal) // YM2149 (in S-3527 MSX Engine) // FDC: None, 0 drives // 2 Cartridge slots @@ -5603,7 +5603,7 @@ ROM_START (nms8245) ROM_LOAD ("nms8245.u7", 0x0000, 0x20000, BAD_DUMP CRC(0c827d5f) SHA1(064e706cb1f12b99b329944ceeedc0efc3b2d9be)) ROM_END -static MACHINE_CONFIG_DERIVED( nms8245, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::nms8245, msx2_pal) // YM2149 (in S-3527 MSX Engine) // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots @@ -5632,7 +5632,7 @@ ROM_START (nms8245f) ROM_LOAD ("nms8245.u7", 0x0000, 0x20000, BAD_DUMP CRC(0c827d5f) SHA1(064e706cb1f12b99b329944ceeedc0efc3b2d9be)) ROM_END -static MACHINE_CONFIG_DERIVED( nms8245f, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::nms8245f, msx2_pal) // YM2149 (in S-3527 MSX Engine) // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots @@ -5663,7 +5663,7 @@ ROM_START (nms8250) ROM_LOAD ("jq00014.ic117", 0xc000, 0x4000, CRC(ca3307d3) SHA1(c3efedda7ab947a06d9345f7b8261076fa7ceeef)) ROM_END -static MACHINE_CONFIG_DERIVED( nms8250, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::nms8250, msx2_pal) // YM2149 (in S-3527 MSX Engine) // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots @@ -5693,7 +5693,7 @@ ROM_START (nms8250f) ROM_LOAD ("nms8250fdisk.rom", 0xc000, 0x4000, CRC(13b60725) SHA1(58ba1887e8fd21c912b6859cae6514bd874ffcca)) ROM_END -static MACHINE_CONFIG_DERIVED( nms8250f, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::nms8250f, msx2_pal) // YM2149 (in S-3527 MSX Engine) // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots @@ -5726,7 +5726,7 @@ ROM_START (nms8250j) ROM_LOAD ("8250jkfn.rom", 0x00000, 0x20000, CRC(5a59926e) SHA1(6acaf2eeb57f65f7408235d5e07b7563229de799)) ROM_END -static MACHINE_CONFIG_DERIVED( nms8250j, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::nms8250j, msx2) // AY8910/YM2149? // FDC: wd2793?, 1 3.5" DSDD drive // 2 Cartridge slots? @@ -5754,7 +5754,7 @@ ROM_START (nms8255) ROM_LOAD ("8255disk.rom.ic117", 0xc000, 0x4000, CRC(ca3307d3) SHA1(c3efedda7ab947a06d9345f7b8261076fa7ceeef)) ROM_END -static MACHINE_CONFIG_DERIVED( nms8255, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::nms8255, msx2_pal) // YM2149 (in S-3527 MSX Engine) // FDC: wd2793, 2 3.5" DSDD drives // 2 Cartridge slots @@ -5784,7 +5784,7 @@ ROM_START (nms8255f) ROM_LOAD ("nms8255fdisk.rom", 0xc000, 0x4000, CRC(13b60725) SHA1(58ba1887e8fd21c912b6859cae6514bd874ffcca)) ROM_END -static MACHINE_CONFIG_DERIVED( nms8255f, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::nms8255f, msx2_pal) // YM2149 (in S-3527 MSX Engine) // FDC: wd2793, 2 3.5" DSDD drives // 2 Cartridge slots @@ -5816,7 +5816,7 @@ ROM_START (nms8260) ROM_LOAD ("nms8260hdd.rom", 0x10000, 0x4000, CRC(0051afc3) SHA1(77f9fe964f6d8cb8c4af3b5fe63ce6591d5288e6)) ROM_END -static MACHINE_CONFIG_DERIVED( nms8260, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::nms8260, msx2_pal) // YM2149 (in S-3527 MSX Engine) // FDC: wd2793, 1 3.5" DSDD drives // 2 Cartridge slots @@ -5849,7 +5849,7 @@ ROM_START (nms8280) ROM_LOAD ("8280disk.rom.ic117", 0xc000, 0x4000, CRC(ca3307d3) SHA1(c3efedda7ab947a06d9345f7b8261076fa7ceeef)) ROM_END -static MACHINE_CONFIG_DERIVED( nms8280, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::nms8280, msx2_pal) // AY8910/YM2149? // FDC: wd2793, 2 3.5" DSDD drives // 2 Cartridge slots @@ -5878,7 +5878,7 @@ ROM_START (nms8280f) ROM_LOAD ("8280fdisk.rom", 0xc000, 0x4000, CRC(13b60725) SHA1(58ba1887e8fd21c912b6859cae6514bd874ffcca)) ROM_END -static MACHINE_CONFIG_DERIVED( nms8280f, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::nms8280f, msx2_pal) // AY8910/YM2149? // FDC: wd2793, 2 3.5" DSDD drives // 2 Cartridge slots @@ -5907,7 +5907,7 @@ ROM_START (nms8280g) ROM_LOAD ("8280gdisk.rom.ic117", 0xc000, 0x4000, CRC(d0beebb8) SHA1(d1001f93c87ff7fb389e418e33bf7bc81bdbb65f)) ROM_END -static MACHINE_CONFIG_DERIVED( nms8280g, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::nms8280g, msx2_pal) // AY8910/YM2149? // FDC: wd2793, 2 3.5" DSDD drives // 2 Cartridge slots @@ -5936,7 +5936,7 @@ ROM_START (vg8230) ROM_LOAD ("8230disk.rom.u13", 0xc000, 0x4000, CRC(77c4e5bc) SHA1(849f93867ff7846b27f84d0be418569faf058ac2)) ROM_END -static MACHINE_CONFIG_DERIVED( vg8230, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::vg8230, msx2_pal) // YM2149 (in S-3527 MSX Engine) // FDC: wd2793, 1 3.5" SSDD drive // 2 Cartridge slots @@ -5969,7 +5969,7 @@ ROM_START (vg8230j) ROM_LOAD ("8230jkfn.rom", 0x00000, 0x20000, CRC(5a59926e) SHA1(6acaf2eeb57f65f7408235d5e07b7563229de799)) ROM_END -static MACHINE_CONFIG_DERIVED( vg8230j, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::vg8230j, msx2) // AY8910/YM2149? // FDC: wd2793?, 1 3.5" SSDD drive? // 2 Cartridge slots? @@ -5997,7 +5997,7 @@ ROM_START (vg8235) ROM_LOAD ("8235disk.rom.u50", 0xc000, 0x4000, CRC(51daeb25) SHA1(8954e59aa79310c7b719ecf0cde1e82fb731dcd1)) ROM_END -static MACHINE_CONFIG_DERIVED( vg8235, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::vg8235, msx2_pal) // YM2149 (in S-3527 MSX Engine) // FDC: wd2793, 1 3.5" SSDD drive // 2 Cartridge slots @@ -6027,7 +6027,7 @@ ROM_START (vg8235f) ROM_LOAD ("8235fdisk.rom.u50", 0xc000, 0x4000, CRC(77c4e5bc) SHA1(849f93867ff7846b27f84d0be418569faf058ac2)) ROM_END -static MACHINE_CONFIG_DERIVED( vg8235f, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::vg8235f, msx2_pal) // YM2149 (in S-3527 MSX Engine) // FDC: wd2793, 1 3.5" SSDD drive // 2 Cartridge slots @@ -6057,7 +6057,7 @@ ROM_START (vg8240) ROM_LOAD ("8240disk.rom", 0xc000, 0x4000, CRC(ca3307d3) SHA1(c3efedda7ab947a06d9345f7b8261076fa7ceeef)) ROM_END -static MACHINE_CONFIG_DERIVED( vg8240, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::vg8240, msx2_pal) // AY8910/YM2149? // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots? @@ -6085,7 +6085,7 @@ ROM_START (mpc2300) ROM_LOAD ("2300ext.rom", 0x8000, 0x4000, CRC(3d7dc718) SHA1(e1f834b28c3ee7c9f79fe6fbf2b23c8a0617892b)) ROM_END -static MACHINE_CONFIG_DERIVED( mpc2300, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::mpc2300, msx2) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -6108,7 +6108,7 @@ ROM_START (mpc2500f) ROM_LOAD ("mpc2500fddisk.rom", 0xc000, 0x4000, CRC(38454059) SHA1(58ac78bba29a06645ca8d6a94ef2ac68b743ad32)) ROM_END -static MACHINE_CONFIG_DERIVED( mpc2500f, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::mpc2500f, msx2) // YM2149 // FDC: wd2793?, 1? 3.5" DSDD drive? // 2 Cartridge slots? @@ -6137,7 +6137,7 @@ ROM_START (mpc25fd) ROM_LOAD ("25fddisk.rom", 0xc000, 0x4000, CRC(38454059) SHA1(58ac78bba29a06645ca8d6a94ef2ac68b743ad32)) ROM_END -static MACHINE_CONFIG_DERIVED( mpc25fd, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::mpc25fd, msx2) // YM2149 (in S-3527 MSX Engine) // FDC: wd2793, 1 drive // 1 Cartridge slot (slot 1) @@ -6167,7 +6167,7 @@ ROM_START (mpc27) ROM_RELOAD (0x12000, 0x2000) ROM_END -static MACHINE_CONFIG_DERIVED( mpc27, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::mpc27, msx2) // YM2149 (in S-3527 MSX Engine) // FDC: wd2793?, 1 drive // 2 Cartridge slots? @@ -6196,7 +6196,7 @@ ROM_START (phc23) ROM_LOAD ("23ext.rom", 0x8000, 0x4000, CRC(90ca25b5) SHA1(fd9fa78bac25aa3c0792425b21d14e364cf7eea4)) ROM_END -static MACHINE_CONFIG_DERIVED( phc23, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::phc23, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: None, 0 drives // 2 Cartridge slots @@ -6222,7 +6222,7 @@ ROM_START (phc55fd2) ROM_LOAD ("phc55fd2disk.rom", 0xc000, 0x4000, CRC(38454059) SHA1(58ac78bba29a06645ca8d6a94ef2ac68b743ad32)) ROM_END -static MACHINE_CONFIG_DERIVED( phc55fd2, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::phc55fd2, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: wd2793?, 2 3.5" DSDD drives // 2 Cartridge slots @@ -6257,7 +6257,7 @@ ROM_START (phc77) ROM_LOAD ("phc77kfn.rom", 0x0000, 0x20000, CRC(3b8fdf44) SHA1(fc71561a64f73da0e0043d256f67fd18d7fc3a7f)) ROM_END -static MACHINE_CONFIG_DERIVED( phc77, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::phc77, msx2) // YM2149 (in S-1985 MSX Engine) // FDC: wd2793?, 1 drive // 2 Cartridge slots @@ -6291,7 +6291,7 @@ ROM_START (hotbit20) ROM_LOAD ("microsoldisk.rom", 0x10000, 0x4000, CRC(6704ef81) SHA1(a3028515ed829e900cc8deb403e17b09a38bf9b0)) ROM_END -static MACHINE_CONFIG_DERIVED( hotbit20, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hotbit20, msx2_pal) // AY8910/YM2149? // FDC: microsol, 1 or 2 drives? // 2 Cartridge slots? @@ -6323,7 +6323,7 @@ ROM_START (hbf1) ROM_LOAD ("f1note3.rom", 0x18000, 0x8000, CRC(73eb9329) SHA1(58accf41a90693874b86ce98d8d43c27beb8b6dc)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf1, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::hbf1, msx2) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -6351,7 +6351,7 @@ ROM_START (hbf12) ROM_LOAD ("f12note3.rom", 0x18000, 0x8000, CRC(44a10e6a) SHA1(917d1c079e03c4a44de864f123d03c4e32c8daae)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf12, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::hbf12, msx2) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -6378,7 +6378,7 @@ ROM_START (hbf1xd) ROM_LOAD ("f1xddisk.rom.ic27", 0xc000, 0x4000, BAD_DUMP CRC(54c73ad6) SHA1(12f2cc79b3d09723840bae774be48c0d721ec1c6)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf1xd, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::hbf1xd, msx2) // YM2149 (in S-1895 MSX Engine) // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots @@ -6410,7 +6410,7 @@ ROM_START (hbf1xdm2) ROM_LOAD ("f1m2disk.rom.ic27", 0xc000, 0x4000, BAD_DUMP CRC(54c73ad6) SHA1(12f2cc79b3d09723840bae774be48c0d721ec1c6)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf1xdm2, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::hbf1xdm2, msx2) // AY8910/YM2149? // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots? @@ -6439,7 +6439,7 @@ ROM_START (hbf5) ROM_LOAD ("hbf5note.rom", 0xc000, 0x4000, CRC(0cdc0777) SHA1(06ba91d6732ee8a2ecd5dcc38b0ce42403d86708)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf5, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hbf5, msx2_pal) // YM2149 // FDC: None, 0 drives // 2 Cartridge slots @@ -6466,7 +6466,7 @@ ROM_START (hbf500) ROM_LOAD ("f500kfn.rom", 0, 0x20000, CRC(5a59926e) SHA1(6acaf2eeb57f65f7408235d5e07b7563229de799)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf500, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::hbf500, msx2) // AY8910/YM2149? // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots? @@ -6495,7 +6495,7 @@ ROM_START (hbf500f) ROM_LOAD ("hbf500fdisk.rom", 0xc000, 0x4000, CRC(6e718f5c) SHA1(0e081572f84555dc13bdb0c7044a19d6c164d985)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf500f, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hbf500f, msx2_pal) // AY8910/YM2149? // FDC: wd2793, 1 3.5" DSDD drive // 3 Cartridge slots or 2 Cartridge slots and 1 expansion slot ? @@ -6524,7 +6524,7 @@ ROM_START (hbf500p) ROM_FILL (0x10000, 0xc000, 0xFF) ROM_END -static MACHINE_CONFIG_DERIVED( hbf500p, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hbf500p, msx2_pal) // AY8910/YM2149? // FDC: wd2793, 1 3.5" DSDD drive // 3 Cartridge slots or 2 Cartridge slots and 1 expansion slot ? @@ -6553,7 +6553,7 @@ ROM_START (hbf700d) ROM_LOAD ("700dext.ic6", 0x8000, 0x8000, CRC(100cf756) SHA1(317722fa36c2ed31c07c5218b43490fd5badf1f8)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf700d, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hbf700d, msx2_pal) // YM2149 (in S-1985 MSX Engine) // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots @@ -6584,7 +6584,7 @@ ROM_START (hbf700f) ROM_LOAD ("700fext.ic6", 0x8000, 0x8000, CRC(7c8b07b1) SHA1(ecacb20ba0a9bbd25e8c0f128d64dd66f8cd8bee)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf700f, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hbf700f, msx2_pal) // AY8910/YM2149? // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots @@ -6612,7 +6612,7 @@ ROM_START (hbf700p) ROM_LOAD ("700pext.ic6", 0x8000, 0x8000, CRC(63e1bffc) SHA1(496698a60432490dc1306c8cc1d4a6ded275261a)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf700p, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hbf700p, msx2_pal) // YM2149 (in S-1985 MSX Engine) // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots @@ -6643,7 +6643,7 @@ ROM_START (hbf700s) ROM_LOAD ("700sext.ic6", 0x8000, 0x8000, CRC(28d1badf) SHA1(ae3ed88a2d7034178e08f7bdf5409f462bf67fc9)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf700s, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hbf700s, msx2_pal) // AY8910/YM2149? // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots @@ -6676,7 +6676,7 @@ ROM_START (hbf900) ROM_LOAD ("f900kfn.rom", 0, 0x20000, CRC(5a59926e) SHA1(6acaf2eeb57f65f7408235d5e07b7563229de799)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf900, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::hbf900, msx2) // AY8910/YM2149? // FDC: wd2793, 2 3.5" DSDD drives // 2 Cartridge slots @@ -6710,7 +6710,7 @@ ROM_START (hbf900a) ROM_LOAD ("f900kfn.rom", 0, 0x20000, CRC(5a59926e) SHA1(6acaf2eeb57f65f7408235d5e07b7563229de799)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf900a, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::hbf900a, msx2) // AY8910/YM2149? // FDC: wd2793, 2 3.5" DSDD drives // 2 Cartridge slots @@ -6740,7 +6740,7 @@ ROM_START (hbf9p) ROM_LOAD ("f9pfirm2.rom.ic13", 0x10000, 0x8000, CRC(ea97069f) SHA1(2d1880d1f5a6944fcb1b198b997a3d90ecd1903d)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf9p, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hbf9p, msx2_pal) // YM2149 (in S-1985 MSX Engine) // FDC: None, 0 drives // 2 Cartridge slots @@ -6767,7 +6767,7 @@ ROM_START (hbf9pr) ROM_LOAD ("f9prext.rom", 0x8000, 0x4000, CRC(8b966f50) SHA1(65253cb38ab11084f355a2d4ad78fa6c64cbe660)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf9pr, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hbf9pr, msx2_pal) // YM2149 (in S-1985 MSX Engine) // FDC: None, 0 drives // 2 Cartridge slots @@ -6793,7 +6793,7 @@ ROM_START (hbf9s) ROM_LOAD ("f9sfirm2.ic13", 0x10000, 0x8000, CRC(ea97069f) SHA1(2d1880d1f5a6944fcb1b198b997a3d90ecd1903d)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf9s, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hbf9s, msx2_pal) // YM2149 (in S-1985 MSX Engine) // FDC: None, 0 drives // 2 Cartridge slots @@ -6829,7 +6829,7 @@ ROM_START (hbg900ap) ROM_LOAD ("g900util.rom", 0x14000, 0x4000, CRC(d0417c20) SHA1(8779b004e7605a3c419825f0373a5d8fa84e1d5b)) ROM_END -static MACHINE_CONFIG_DERIVED( hbg900ap, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hbg900ap, msx2_pal) // AY8910/YM2149? // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots? @@ -6862,7 +6862,7 @@ ROM_START (hbg900p) ROM_LOAD ("g900util.rom", 0x14000, 0x4000, CRC(d0417c20) SHA1(8779b004e7605a3c419825f0373a5d8fa84e1d5b)) ROM_END -static MACHINE_CONFIG_DERIVED( hbg900p, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hbg900p, msx2_pal) // AY8910/YM2149? // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots? @@ -6894,7 +6894,7 @@ ROM_START (tpc310) ROM_LOAD ("tpc310acc.rom", 0x14000, 0x8000, CRC(4fb8fab3) SHA1(cdeb0ed8adecaaadb78d5a5364fd603238591685)) ROM_END -static MACHINE_CONFIG_DERIVED( tpc310, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::tpc310, msx2_pal) // YM2149 (in S-1985 MSX Engine) // FDC: mb8877a?, 1 3.5" DSDD drive // 1 Cartridge slot (slot 2) @@ -6927,7 +6927,7 @@ ROM_START (tpp311) ROM_LOAD ("311logo.rom", 0xc000, 0x8000, CRC(0e6ecb9f) SHA1(e45ddc5bf1a1e63756d11fb43fc50276ca35cab0)) ROM_END -static MACHINE_CONFIG_DERIVED( tpp311, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::tpp311, msx2_pal) // AY8910/YM2149? // FDC: None, 0 drives // 0 Cartridge slots? @@ -6951,7 +6951,7 @@ ROM_START (tps312) ROM_LOAD ("312write.rom", 0x14000, 0x4000, CRC(63c6992f) SHA1(93682f5baba7697c40088e26f99ee065c78e83b8)) ROM_END -static MACHINE_CONFIG_DERIVED( tps312, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::tps312, msx2_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -6980,7 +6980,7 @@ ROM_START (hx23) ROM_LOAD ("hx23word.rom", 0xc000, 0x8000, CRC(39b3e1c0) SHA1(9f7cfa932bd7dfd0d9ecaadc51655fb557c2e125)) ROM_END -static MACHINE_CONFIG_DERIVED( hx23, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hx23, msx2_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -7008,7 +7008,7 @@ ROM_START (hx23f) ROM_LOAD ("hx23fword.rom", 0xc000, 0x8000, CRC(39b3e1c0) SHA1(9f7cfa932bd7dfd0d9ecaadc51655fb557c2e125)) ROM_END -static MACHINE_CONFIG_DERIVED( hx23f, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hx23f, msx2_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -7033,7 +7033,7 @@ ROM_START (hx23i) ROM_LOAD ("hx23iword.rom", 0xc000, 0x8000, CRC(d50db5b4) SHA1(64cf27a6be1393b1da9f8d5d43df617c9f22fbd2)) ROM_END -static MACHINE_CONFIG_DERIVED( hx23i, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hx23i, msx2_pal) // YM2149 (in S-1985) // FDC: None, 0 drives // 2 Cartridge slots? @@ -7063,7 +7063,7 @@ ROM_START (hx33) ROM_LOAD ("hx33kfn.rom", 0x0000, 0x20000, CRC(d23d4d2d) SHA1(db03211b7db46899df41db2b1dfbec972109a967)) ROM_END -static MACHINE_CONFIG_DERIVED( hx33, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::hx33, msx2) // YM2149 (in S-1985) // FDC: None, 0, drives // 2 Cartridge slots? @@ -7098,7 +7098,7 @@ ROM_REGION (0x18000, "maincpu", 0) ROM_LOAD ("hx34kfn.rom", 0x0000, 0x20000, CRC(d23d4d2d) SHA1(db03211b7db46899df41db2b1dfbec972109a967)) ROM_END -static MACHINE_CONFIG_DERIVED( hx34, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::hx34, msx2) // YM2149 (in S-1985) // FDC: wd2793??, 1 3.5" DSDD drive // 2 Cartridge slots? @@ -7133,7 +7133,7 @@ ROM_START (hx34i) ROM_LOAD ("hx34ifirm.rom", 0x10000, 0x8000, CRC(f9e29c66) SHA1(3289336b2c12161fd926a7e5ce865770ae7038af)) ROM_END -static MACHINE_CONFIG_DERIVED( hx34i, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::hx34i, msx2_pal) // YM2149 (in S-1985) // FDC: wd2793??, 1 3.5" DSDD drive // 2 Cartridge slots? @@ -7167,7 +7167,7 @@ ROM_START (fstm1) ROM_LOAD ("fstm1desk2.rom", 0x14000, 0x8000, CRC(304820ea) SHA1(ff6e07d3976b0874164fae680ae028d598752049)) ROM_END -static MACHINE_CONFIG_DERIVED( fstm1, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::fstm1, msx2_pal) // YM2149 (in S-1985) // FDC: None, 0 drives // 2 Cartridge slots @@ -7199,7 +7199,7 @@ ROM_START (victhc90) ROM_LOAD ("hc90kfn.rom", 0x0000, 0x20000, CRC(d23d4d2d) SHA1(db03211b7db46899df41db2b1dfbec972109a967)) ROM_END -static MACHINE_CONFIG_DERIVED( victhc90, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::victhc90, msx2) // YM2149 (in S-1985) // FDC: wd2793?, 1 3.5" DSDD drive // RS232C builtin @@ -7236,7 +7236,7 @@ ROM_START (victhc95) ROM_LOAD ("hc95kfn.rom", 0x0000, 0x20000, CRC(d23d4d2d) SHA1(db03211b7db46899df41db2b1dfbec972109a967)) ROM_END -static MACHINE_CONFIG_DERIVED( victhc95, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::victhc95, msx2) // YM2149 (in S-1985) // FDC: wd2793?, 2 3.5" DSDD drive // RS232C builtin @@ -7273,7 +7273,7 @@ ROM_START (victhc95a) ROM_LOAD ("hc95akfn.rom", 0x0000, 0x20000, CRC(d23d4d2d) SHA1(db03211b7db46899df41db2b1dfbec972109a967)) ROM_END -static MACHINE_CONFIG_DERIVED( victhc95a, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::victhc95a, msx2) // YM2149 (in S-1985) // FDC: wd2793?, 2 3.5" DSDD drive // RS232C builtin @@ -7306,7 +7306,7 @@ ROM_START (cx7m) ROM_LOAD ("cx7mext.rom", 0x8000, 0x4000, CRC(66237ecf) SHA1(5c1f9c7fb655e43d38e5dd1fcc6b942b2ff68b02)) ROM_END -static MACHINE_CONFIG_DERIVED( cx7m, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::cx7m, msx2_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -7331,7 +7331,7 @@ ROM_START (cx7m128) ROM_LOAD ("yrm502.rom", 0xc000, 0x4000, CRC(51f7ddd1) SHA1(2a4b4a4657e3077df8a88f98210b76883d3702b1)) ROM_END -static MACHINE_CONFIG_DERIVED( cx7m128, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::cx7m128, msx2_pal) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -7358,7 +7358,7 @@ ROM_START (y503iiir) ROM_LOAD ("yis503iiirnet.rom", 0x10000, 33121, CRC(b10fb61c) SHA1(af2b7004a8888d7a72eee937783fccaca0f38621)) // Very odd size for a rom... ROM_END -static MACHINE_CONFIG_DERIVED( y503iiir, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::y503iiir, msx2_pal) // YM2149 (in S-3527) // FDC: wd2793?, 1 3.5" DSDD drive // 2 Cartridge slots @@ -7390,7 +7390,7 @@ ROM_START (y503iiire) ROM_LOAD ("yis503iiirenet.rom", 0x10000, 33121, CRC(b10fb61c) SHA1(af2b7004a8888d7a72eee937783fccaca0f38621)) // Very odd size for a rom... ROM_END -static MACHINE_CONFIG_DERIVED( y503iiire, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::y503iiire, msx2_pal) // YM2149 (in S-3527) // FDC: wd2793?, 1 3.5" DSDD drive // 2 Cartridge slots @@ -7423,7 +7423,7 @@ ROM_START (yis60464) ROM_LOAD ("yis604kfn.rom", 0x0000, 0x20000, CRC(5a59926e) SHA1(6acaf2eeb57f65f7408235d5e07b7563229de799)) ROM_END -static MACHINE_CONFIG_DERIVED( yis60464, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::yis60464, msx2) // YM2149 (in S-3527) // FDC: None, 0 drives // 2 Cartridge slots @@ -7451,7 +7451,7 @@ ROM_START (yis604) ROM_LOAD ("yis604kfn.rom", 0x0000, 0x20000, CRC(5a59926e) SHA1(6acaf2eeb57f65f7408235d5e07b7563229de799)) ROM_END -static MACHINE_CONFIG_DERIVED( yis604, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::yis604, msx2) // YM2149 (in S-3527) // FDC: None, 0 drives // 2 Cartridge slots @@ -7481,7 +7481,7 @@ ROM_START (y805128) ROM_LOAD ("yis805128kfn.rom", 0x0000, 0x20000, CRC(5a59926e) SHA1(6acaf2eeb57f65f7408235d5e07b7563229de799)) ROM_END -static MACHINE_CONFIG_DERIVED( y805128, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::y805128, msx2) // YM2149 (in S-3527) // FDC: wd2793?, 1 3.5" DSDD drive // 2 Cartridge slots @@ -7514,7 +7514,7 @@ ROM_START (y805128r2) ROM_LOAD ("yis805128r2paint.rom", 0x18000, 0x10000, CRC(1bda68a3) SHA1(7fd2a28c4fdaeb140f3c8c8fb90271b1472c97b9)) ROM_END -static MACHINE_CONFIG_DERIVED( y805128r2, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::y805128r2, msx2_pal) // YM2149 (in S-3527) // FDC: wd2793?, 1 3.5" DSDD drive // 2 Cartridge slots @@ -7548,7 +7548,7 @@ ROM_START (y805128r2e) ROM_LOAD ("yis805128r2epaint.rom", 0x18000, 0x10000, CRC(1bda68a3) SHA1(7fd2a28c4fdaeb140f3c8c8fb90271b1472c97b9)) ROM_END -static MACHINE_CONFIG_DERIVED( y805128r2e, msx2_pal ) +MACHINE_CONFIG_DERIVED(msx_state::y805128r2e, msx2_pal) // YM2149 (in S-3527) // FDC: wd2793?, 1 3.5" DSDD drive // 2 Cartridge slots @@ -7584,7 +7584,7 @@ ROM_START (y805256) ROM_LOAD ("yis805256kfn.rom", 0x0000, 0x20000, CRC(5a59926e) SHA1(6acaf2eeb57f65f7408235d5e07b7563229de799)) ROM_END -static MACHINE_CONFIG_DERIVED( y805256, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::y805256, msx2) // YM2149 (in S-3527) // FDC: wd2793?, 1 3.5" DSDD drive // 2 Cartridge slots @@ -7619,7 +7619,7 @@ ROM_START (expert3i ) ROM_LOAD ("ide240a.rom", 0x14000, 0x10000, CRC(7adf857f) SHA1(8a919dbeed92db8c06a611279efaed8552810239)) ROM_END -static MACHINE_CONFIG_DERIVED( expert3i, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::expert3i, msx2p) // AY8910/YM2149? // FDC: wd2793, 1 or 2? drives // 2 Cartridge slots? @@ -7654,7 +7654,7 @@ ROM_START (expert3t ) ROM_LOAD ("turbo.rom", 0x14000, 0x4000, CRC(ab528416) SHA1(d468604269ae7664ac739ea9f922a05e14ffa3d1)) ROM_END -static MACHINE_CONFIG_DERIVED( expert3t, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::expert3t, msx2p) // AY8910 // FDC: wd2793?, 1 or 2? drives // 4 Cartridge/Expansion slots? @@ -7689,7 +7689,7 @@ ROM_START (expertac) ROM_LOAD ("xbasic2.rom", 0x14000, 0x4000, CRC(2825b1a0) SHA1(47370bec7ca1f0615a54eda548b07fbc0c7ef398)) ROM_END -static MACHINE_CONFIG_DERIVED( expertac, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::expertac, msx2p) // AY8910/YM2149? // FDC: wd2793?, 1 or 2? drives // 2 Cartridge slots? @@ -7721,7 +7721,7 @@ ROM_START (expertdx) ROM_LOAD ("kanji.rom", 0x14000, 0x8000, CRC(b4fc574d) SHA1(dcc3a67732aa01c4f2ee8d1ad886444a4dbafe06)) ROM_END -static MACHINE_CONFIG_DERIVED( expertdx, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::expertdx, msx2p) // AY8910/YM2149? // FDC: tc8566af, 1 3.5" DSDD drive? // 2 Cartridge slots? @@ -7756,7 +7756,7 @@ ROM_START (fsa1fx) ROM_LOAD ("a1fxkfn.rom", 0, 0x20000, CRC(b244f6cf) SHA1(e0e99cd91e88ce2676445663f832c835d74d6fd4)) ROM_END -static MACHINE_CONFIG_DERIVED( fsa1fx, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::fsa1fx, msx2p) // AY8910/YM2149? // FDC: tc8566af, 1 3.5" DSDD drive // 2 Cartridge slots? @@ -7798,7 +7798,7 @@ ROM_START (fsa1wsx) ROM_LOAD ("a1wskfn.rom", 0, 0x40000, CRC(1f6406fb) SHA1(5aff2d9b6efc723bc395b0f96f0adfa83cc54a49)) ROM_END -static MACHINE_CONFIG_DERIVED( fsa1wsx, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::fsa1wsx, msx2p) // AY8910/YM2149? // FDC: tc8566af, 1 3.5" DSDD drive // 2 Cartridge slots @@ -7845,7 +7845,7 @@ ROM_START (fsa1wx) ROM_LOAD ("a1wxkfn.rom", 0, 0x40000, CRC(1f6406fb) SHA1(5aff2d9b6efc723bc395b0f96f0adfa83cc54a49)) ROM_END -static MACHINE_CONFIG_DERIVED( fsa1wx, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::fsa1wx, msx2p) // AY8910/YM2149? // FDC: tc8566af, 1 3.5" DSDD drive // 2 Cartridge slots @@ -7891,7 +7891,7 @@ ROM_START (fsa1wxa) ROM_LOAD ("a1wxkfn.rom", 0, 0x40000, CRC(1f6406fb) SHA1(5aff2d9b6efc723bc395b0f96f0adfa83cc54a49)) ROM_END -static MACHINE_CONFIG_DERIVED( fsa1wxa, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::fsa1wxa, msx2p) // AY8910/YM2149? // FDC: tc8566af, 1 3.5" DSDD drive // 2 Cartridge slots? @@ -7934,7 +7934,7 @@ ROM_START (phc35j) ROM_LOAD ("35jkfn.rom", 0, 0x20000, CRC(c9651b32) SHA1(84a645becec0a25d3ab7a909cde1b242699a8662)) ROM_END -static MACHINE_CONFIG_DERIVED( phc35j, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::phc35j, msx2p) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots @@ -7967,7 +7967,7 @@ ROM_START (phc70fd) ROM_LOAD ("70fdkfn.rom", 0, 0x20000, CRC(c9651b32) SHA1(84a645becec0a25d3ab7a909cde1b242699a8662)) ROM_END -static MACHINE_CONFIG_DERIVED( phc70fd, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::phc70fd, msx2p) // AY8910/YM2149? // FDC: tc8566af, 1 3.5" DSDD drive // 2 Cartridge slots @@ -8009,7 +8009,7 @@ ROM_START (phc70fd2) ROM_LOAD ("70f2kfn.rom", 0, 0x40000, CRC(9a850db9) SHA1(bcdb4dae303dfe5234f372d70a5e0271d3202c36)) ROM_END -static MACHINE_CONFIG_DERIVED( phc70fd2, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::phc70fd2, msx2p) // AY8910/YM2149? // FDC: tc8566af, 2 3.5" DSDD drives // 2 Cartridge slots @@ -8052,7 +8052,7 @@ ROM_START (hbf1xdj) ROM_LOAD ("f1xjkfn.rom", 0, 0x40000, CRC(7016dfd0) SHA1(218d91eb6df2823c924d3774a9f455492a10aecb)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf1xdj, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::hbf1xdj, msx2p) // YM2149 (in S-1985 MSX Engine) // FDC: wd2793, 1 3.5" DSDD drive // 2 Cartridge slots @@ -8098,7 +8098,7 @@ ROM_START (hbf1xv) ROM_LOAD ("f1xvkfn.rom", 0, 0x40000, CRC(7016dfd0) SHA1(218d91eb6df2823c924d3774a9f455492a10aecb)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf1xv, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::hbf1xv, msx2p) // YM2149 (in S-1985 MSX Engine) // FDC: wd2793, 1 3.5" DSDD drives // 2 Cartridge slots @@ -8139,7 +8139,7 @@ ROM_START (hbf9sp) ROM_LOAD ("f9spfrm2.rom", 0x10000, 0x8000, CRC(ea97069f) SHA1(2d1880d1f5a6944fcb1b198b997a3d90ecd1903d)) ROM_END -static MACHINE_CONFIG_DERIVED( hbf9sp, msx2p ) +MACHINE_CONFIG_DERIVED(msx_state::hbf9sp, msx2p) // AY8910/YM2149? // FDC: None, 0 drives // 2 Cartridge slots? @@ -8171,7 +8171,7 @@ ROM_START (fsa1gt) ROM_LOAD ("a1gtfirm.rom", 0x6c000, 0x400000, CRC(feefeadc) SHA1(e779c338eb91a7dea3ff75f3fde76b8af22c4a3a)) ROM_END -static MACHINE_CONFIG_DERIVED( fsa1gt, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::fsa1gt, msx2) // AY8910/YM2149? // FDC: tc8566af, 1 3.5" DSDD drive // 2 Cartridge slots @@ -8214,7 +8214,7 @@ ROM_START (fsa1st) ROM_LOAD ("a1stfirm.rom", 0x6c000, 0x400000, CRC(139ac99c) SHA1(c212b11fda13f83dafed688c54d098e7e47ab225)) ROM_END -static MACHINE_CONFIG_DERIVED( fsa1st, msx2 ) +MACHINE_CONFIG_DERIVED(msx_state::fsa1st, msx2) // AY8910/YM2149? // FDC: tc8566af, 1 3.5" DSDD drive // 2 Cartridge slots diff --git a/src/mame/drivers/mt735.cpp b/src/mame/drivers/mt735.cpp index 87a891cbf79..883fea205d1 100644 --- a/src/mame/drivers/mt735.cpp +++ b/src/mame/drivers/mt735.cpp @@ -20,6 +20,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void mt735(machine_config &config); }; mt735_state::mt735_state(const machine_config &mconfig, device_type type, const char *tag) : @@ -59,7 +60,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( mt735 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( mt735 ) +MACHINE_CONFIG_START(mt735_state::mt735) MCFG_CPU_ADD("maincpu", M68000, XTAL_48MHz/6) MCFG_CPU_PROGRAM_MAP(mt735_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mtouchxl.cpp b/src/mame/drivers/mtouchxl.cpp index e1fe37ad47e..78e1465b189 100644 --- a/src/mame/drivers/mtouchxl.cpp +++ b/src/mame/drivers/mtouchxl.cpp @@ -75,6 +75,8 @@ public: DECLARE_READ8_MEMBER(key_r); DECLARE_WRITE8_MEMBER(key_w); DECLARE_READ8_MEMBER(coin_r); + void at486(machine_config &config); + static void cdrom(device_t *device); }; WRITE8_MEMBER(mtxl_state::bank_w) @@ -185,16 +187,21 @@ static SLOT_INTERFACE_START(mt6k_ata_devices) SLOT_INTERFACE("cdrom", ATAPI_FIXED_CDROM) SLOT_INTERFACE_END -static MACHINE_CONFIG_START(cdrom) - MCFG_DEVICE_MODIFY("ide:0") - MCFG_DEVICE_SLOT_INTERFACE(mt6k_ata_devices, "cdrom", true) - MCFG_DEVICE_MODIFY("ide:1") - MCFG_SLOT_DEFAULT_OPTION("") - MCFG_SLOT_FIXED(true) +void mtxl_state::cdrom(device_t *device) +{ + auto ide0 = device->subdevice("ide:0"); + device_slot_interface::static_option_reset(*ide0); + SLOT_INTERFACE_NAME(mt6k_ata_devices)(ide0); + device_slot_interface::static_set_default_option(*ide0, "cdrom"); + device_slot_interface::static_set_fixed(*ide0, true); + + auto ide1 = device->subdevice("ide:1"); + device_slot_interface::static_set_default_option(*ide1, ""); + device_slot_interface::static_set_fixed(*ide1, true); MACHINE_CONFIG_END #endif -static MACHINE_CONFIG_START( at486 ) +MACHINE_CONFIG_START(mtxl_state::at486) MCFG_CPU_ADD("maincpu", I486DX4, 33000000) MCFG_CPU_PROGRAM_MAP(at32_map) MCFG_CPU_IO_MAP(at32_io) diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp index 7665567c963..028f0ca5c16 100644 --- a/src/mame/drivers/mtx.cpp +++ b/src/mame/drivers/mtx.cpp @@ -280,7 +280,7 @@ WRITE_LINE_MEMBER(mtx_state::mtx_tms9929a_interrupt) MACHINE_CONFIG_START( mtx512 ) -------------------------------------------------*/ -static MACHINE_CONFIG_START( mtx512 ) +MACHINE_CONFIG_START(mtx_state::mtx512) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz) @@ -351,7 +351,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED( mtx500, mtx512 ) -------------------------------------------------*/ -static MACHINE_CONFIG_DERIVED( mtx500, mtx512 ) +MACHINE_CONFIG_DERIVED(mtx_state::mtx500, mtx512) /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) @@ -363,7 +363,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED( rs128, mtx512 ) -------------------------------------------------*/ -static MACHINE_CONFIG_DERIVED( rs128, mtx512 ) +MACHINE_CONFIG_DERIVED(mtx_state::rs128, mtx512) /* basic machine hardware */ MCFG_CPU_MODIFY(Z80_TAG) diff --git a/src/mame/drivers/mugsmash.cpp b/src/mame/drivers/mugsmash.cpp index 4e0ce05237f..316a52a52c4 100644 --- a/src/mame/drivers/mugsmash.cpp +++ b/src/mame/drivers/mugsmash.cpp @@ -396,7 +396,7 @@ void mugsmash_state::machine_start() { } -static MACHINE_CONFIG_START( mugsmash ) +MACHINE_CONFIG_START(mugsmash_state::mugsmash) MCFG_CPU_ADD("maincpu", M68000, 12000000) MCFG_CPU_PROGRAM_MAP(mugsmash_map) diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp index 2d17657197d..e01c579d640 100644 --- a/src/mame/drivers/multfish.cpp +++ b/src/mame/drivers/multfish.cpp @@ -1020,7 +1020,7 @@ void igrosoft_gamble_state::machine_reset() m_rambk = 0; } -MACHINE_CONFIG_START( igrosoft_gamble ) +MACHINE_CONFIG_START(igrosoft_gamble_state::igrosoft_gamble) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) MCFG_CPU_PROGRAM_MAP(igrosoft_gamble_map) @@ -1050,7 +1050,7 @@ MACHINE_CONFIG_START( igrosoft_gamble ) MCFG_HOPPER_ADD("hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( rollfr, igrosoft_gamble ) +MACHINE_CONFIG_DERIVED(igrosoft_gamble_state::rollfr, igrosoft_gamble) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(rollfr_portmap) MACHINE_CONFIG_END diff --git a/src/mame/drivers/multi16.cpp b/src/mame/drivers/multi16.cpp index 5fddd89b9a0..46ccf106522 100644 --- a/src/mame/drivers/multi16.cpp +++ b/src/mame/drivers/multi16.cpp @@ -37,6 +37,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_multi16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void multi16(machine_config &config); }; @@ -130,7 +131,7 @@ void multi16_state::machine_reset() } -static MACHINE_CONFIG_START( multi16 ) +MACHINE_CONFIG_START(multi16_state::multi16) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, 8000000) MCFG_CPU_PROGRAM_MAP(multi16_map) diff --git a/src/mame/drivers/multi8.cpp b/src/mame/drivers/multi8.cpp index 3568b75031a..3827d17e167 100644 --- a/src/mame/drivers/multi8.cpp +++ b/src/mame/drivers/multi8.cpp @@ -61,6 +61,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(keyboard_callback); MC6845_UPDATE_ROW(crtc_update_row); + void multi8(machine_config &config); private: uint8_t *m_p_vram; uint8_t *m_p_wram; @@ -559,7 +560,7 @@ void multi8_state::machine_reset() m_mcu_init = 0; } -static MACHINE_CONFIG_START( multi8 ) +MACHINE_CONFIG_START(multi8_state::multi8) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(multi8_mem) diff --git a/src/mame/drivers/multigam.cpp b/src/mame/drivers/multigam.cpp index 34a36ab29f5..485b42e4914 100644 --- a/src/mame/drivers/multigam.cpp +++ b/src/mame/drivers/multigam.cpp @@ -204,6 +204,10 @@ public: void multigm3_decrypt(uint8_t* mem, int memsize, const uint8_t* decode_nibble); void multigam3_mmc3_scanline_cb(int scanline, int vblank, int blanked); void ppu_irq(int *ppu_regs); + void multigam(machine_config &config); + void supergm3(machine_config &config); + void multigmt(machine_config &config); + void multigm3(machine_config &config); }; @@ -1212,7 +1216,7 @@ MACHINE_START_MEMBER(multigam_state,supergm3) m_multigmc_mmc3_6000_ram = std::make_unique(0x2000); } -static MACHINE_CONFIG_START( multigam ) +MACHINE_CONFIG_START(multigam_state::multigam) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK) MCFG_CPU_PROGRAM_MAP(multigam_map) @@ -1238,7 +1242,7 @@ static MACHINE_CONFIG_START( multigam ) MCFG_SPEAKER_STANDARD_MONO("mono") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( multigm3, multigam ) +MACHINE_CONFIG_DERIVED(multigam_state::multigm3, multigam) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(multigm3_map) @@ -1246,12 +1250,12 @@ static MACHINE_CONFIG_DERIVED( multigm3, multigam ) MCFG_MACHINE_RESET_OVERRIDE(multigam_state, multigm3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( multigmt, multigam ) +MACHINE_CONFIG_DERIVED(multigam_state::multigmt, multigam) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(multigmt_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( supergm3, multigam ) +MACHINE_CONFIG_DERIVED(multigam_state::supergm3, multigam) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(supergm3_map) diff --git a/src/mame/drivers/munchmo.cpp b/src/mame/drivers/munchmo.cpp index e1ed3d09a8d..c3c6213a2a8 100644 --- a/src/mame/drivers/munchmo.cpp +++ b/src/mame/drivers/munchmo.cpp @@ -313,7 +313,7 @@ void munchmo_state::machine_start() save_item(NAME(m_nmi_enable)); } -static MACHINE_CONFIG_START( mnchmobl ) +MACHINE_CONFIG_START(munchmo_state::mnchmobl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_15MHz/4) // from pin 13 of XTAL-driven 163 diff --git a/src/mame/drivers/murogem.cpp b/src/mame/drivers/murogem.cpp index 37adb074bc2..fb79733e70a 100644 --- a/src/mame/drivers/murogem.cpp +++ b/src/mame/drivers/murogem.cpp @@ -137,6 +137,7 @@ public: DECLARE_PALETTE_INIT(murogem); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void murogem(machine_config &config); }; @@ -245,7 +246,7 @@ uint32_t murogem_state::screen_update(screen_device &screen, bitmap_ind16 &bitma } -static MACHINE_CONFIG_START( murogem ) +MACHINE_CONFIG_START(murogem_state::murogem) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6802, 8000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(murogem_map) diff --git a/src/mame/drivers/murogmbl.cpp b/src/mame/drivers/murogmbl.cpp index 326cdda02b9..bc8435bffee 100644 --- a/src/mame/drivers/murogmbl.cpp +++ b/src/mame/drivers/murogmbl.cpp @@ -64,6 +64,7 @@ public: DECLARE_PALETTE_INIT(murogmbl); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void murogmbl(machine_config &config); }; class slotunbl_state : public driver_device @@ -86,6 +87,7 @@ public: DECLARE_PALETTE_INIT(slotunbl); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void slotunbl(machine_config &config); }; PALETTE_INIT_MEMBER(murogmbl_state, murogmbl) @@ -329,7 +331,7 @@ static GFXDECODE_START( slotunbl ) GFXDECODE_ENTRY( "gfx1", 0, layout8x8x2, 0x0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( murogmbl ) +MACHINE_CONFIG_START(murogmbl_state::murogmbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 1000000) /* Z80? */ MCFG_CPU_PROGRAM_MAP(murogmbl_map) @@ -355,7 +357,7 @@ static MACHINE_CONFIG_START( murogmbl ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( slotunbl ) +MACHINE_CONFIG_START(slotunbl_state::slotunbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 1000000) /* Z80? */ MCFG_CPU_PROGRAM_MAP(slotunbl_map) diff --git a/src/mame/drivers/mustache.cpp b/src/mame/drivers/mustache.cpp index 6caa21a1f7a..4eb540302ef 100644 --- a/src/mame/drivers/mustache.cpp +++ b/src/mame/drivers/mustache.cpp @@ -177,7 +177,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mustache_state::scanline) -static MACHINE_CONFIG_START( mustache ) +MACHINE_CONFIG_START(mustache_state::mustache) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) diff --git a/src/mame/drivers/mvme147.cpp b/src/mame/drivers/mvme147.cpp index 8421f2a169b..ea4c5279023 100644 --- a/src/mame/drivers/mvme147.cpp +++ b/src/mame/drivers/mvme147.cpp @@ -215,6 +215,7 @@ mvme147_state(const machine_config &mconfig, device_type type, const char *tag) //DECLARE_WRITE16_MEMBER (vme_a16_w); virtual void machine_start () override; virtual void machine_reset () override; + void mvme147(machine_config &config); protected: private: @@ -644,7 +645,7 @@ SLOT_INTERFACE_END /* * Machine configuration */ -static MACHINE_CONFIG_START (mvme147) +MACHINE_CONFIG_START(mvme147_state::mvme147) /* basic machine hardware */ MCFG_CPU_ADD ("maincpu", M68030, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP (mvme147_mem) diff --git a/src/mame/drivers/mw18w.cpp b/src/mame/drivers/mw18w.cpp index 07605d7f2cb..b824f6a0bc3 100644 --- a/src/mame/drivers/mw18w.cpp +++ b/src/mame/drivers/mw18w.cpp @@ -38,6 +38,7 @@ public: DECLARE_WRITE8_MEMBER(mw18w_led_display_w); DECLARE_WRITE8_MEMBER(mw18w_irq0_clear_w); DECLARE_CUSTOM_INPUT_MEMBER(mw18w_sensors_r); + void mw18w(machine_config &config); }; @@ -265,7 +266,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( mw18w ) +MACHINE_CONFIG_START(mw18w_state::mw18w) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_19_968MHz/8) diff --git a/src/mame/drivers/mw8080bw.cpp b/src/mame/drivers/mw8080bw.cpp index d1f5025e82b..ff4b4444e8d 100644 --- a/src/mame/drivers/mw8080bw.cpp +++ b/src/mame/drivers/mw8080bw.cpp @@ -229,7 +229,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_START( mw8080bw_root ) +MACHINE_CONFIG_START(mw8080bw_state::mw8080bw_root) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080,MW8080BW_CPU_CLOCK) @@ -405,7 +405,7 @@ static INPUT_PORTS_START( seawolf ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( seawolf, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::seawolf, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -505,7 +505,7 @@ static INPUT_PORTS_START( gunfight ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( gunfight, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::gunfight, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -733,7 +733,7 @@ static INPUT_PORTS_START( tornbase ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( tornbase, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::tornbase, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -840,7 +840,7 @@ static INPUT_PORTS_START( lagunar ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( zzzap, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::zzzap, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -952,7 +952,7 @@ static INPUT_PORTS_START( maze ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( maze, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::maze, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1044,7 +1044,7 @@ static INPUT_PORTS_START( boothill ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( boothill, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::boothill, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1151,7 +1151,7 @@ static INPUT_PORTS_START( checkmat ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( checkmat, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::checkmat, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1278,7 +1278,7 @@ static INPUT_PORTS_START( desertgu ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( desertgu, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::desertgu, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1480,7 +1480,7 @@ static INPUT_PORTS_START( einning ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( dplay, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::dplay, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1575,7 +1575,7 @@ static INPUT_PORTS_START( gmissile ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( gmissile, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::gmissile, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1669,7 +1669,7 @@ static INPUT_PORTS_START( m4 ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( m4, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::m4, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1838,7 +1838,7 @@ static INPUT_PORTS_START( clowns1 ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( clowns, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::clowns, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1934,7 +1934,7 @@ static INPUT_PORTS_START( spacwalk ) PORT_ADJUSTER( 40, "R507 - Music Volume" ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( spacwalk, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::spacwalk, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2017,7 +2017,7 @@ static INPUT_PORTS_START( shuffle ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( shuffle, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::shuffle, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2104,7 +2104,7 @@ static INPUT_PORTS_START( dogpatch ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( dogpatch, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::dogpatch, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2254,7 +2254,7 @@ static INPUT_PORTS_START( spcenctr ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( spcenctr, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::spcenctr, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2350,7 +2350,7 @@ static INPUT_PORTS_START( phantom2 ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( phantom2, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::phantom2, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2491,7 +2491,7 @@ static INPUT_PORTS_START( bowler ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( bowler, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::bowler, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2702,7 +2702,7 @@ static INPUT_PORTS_START( invaders ) INPUT_PORTS_END -MACHINE_CONFIG_DERIVED( invaders, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::invaders, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2787,7 +2787,7 @@ static INPUT_PORTS_START( blueshrk ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( blueshrk, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::blueshrk, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2889,7 +2889,7 @@ static INPUT_PORTS_START( invad2ct ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( invad2ct, mw8080bw_root ) +MACHINE_CONFIG_DERIVED(mw8080bw_state::invad2ct, mw8080bw_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/mwarr.cpp b/src/mame/drivers/mwarr.cpp index 2e87cf92e63..72af2db69d7 100644 --- a/src/mame/drivers/mwarr.cpp +++ b/src/mame/drivers/mwarr.cpp @@ -114,6 +114,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void mwarr(machine_config &config); }; @@ -562,7 +563,7 @@ void mwarr_state::machine_reset() m_which = 0; } -static MACHINE_CONFIG_START( mwarr ) +MACHINE_CONFIG_START(mwarr_state::mwarr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK) diff --git a/src/mame/drivers/mwsub.cpp b/src/mame/drivers/mwsub.cpp index 81a07b44d43..78edffbc9a0 100644 --- a/src/mame/drivers/mwsub.cpp +++ b/src/mame/drivers/mwsub.cpp @@ -36,6 +36,7 @@ public: DECLARE_WRITE8_MEMBER(submar_sound_w); DECLARE_WRITE8_MEMBER(submar_led_w); DECLARE_WRITE8_MEMBER(submar_irq_clear_w); + void submar(machine_config &config); }; @@ -196,7 +197,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( submar ) +MACHINE_CONFIG_START(submar_state::submar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_19_968MHz/8) diff --git a/src/mame/drivers/mx2178.cpp b/src/mame/drivers/mx2178.cpp index 29d4f11fdcb..abbf1dae590 100644 --- a/src/mame/drivers/mx2178.cpp +++ b/src/mame/drivers/mx2178.cpp @@ -45,6 +45,7 @@ public: MC6845_UPDATE_ROW(crtc_update_row); + void mx2178(machine_config &config); private: virtual void machine_reset() override; required_device m_palette; @@ -123,7 +124,7 @@ void mx2178_state::machine_reset() { } -static MACHINE_CONFIG_START( mx2178 ) +MACHINE_CONFIG_START(mx2178_state::mx2178) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_8696MHz / 5) // guess MCFG_CPU_PROGRAM_MAP(mx2178_mem) diff --git a/src/mame/drivers/myb3k.cpp b/src/mame/drivers/myb3k.cpp index a7d2ebb6339..0a66728c42e 100644 --- a/src/mame/drivers/myb3k.cpp +++ b/src/mame/drivers/myb3k.cpp @@ -123,6 +123,9 @@ public: DECLARE_WRITE_LINE_MEMBER( tc_w ); void select_dma_channel(int channel, bool state); + void stepone(machine_config &config); + void jb3000(machine_config &config); + void myb3k(machine_config &config); protected: required_device m_maincpu; required_device m_pic8259; @@ -531,7 +534,7 @@ static SLOT_INTERFACE_START(stepone_isa_cards) SLOT_INTERFACE("myb3k_fdc4711", ISA8_MYB3K_FDC4711) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( myb3k ) +MACHINE_CONFIG_START(myb3k_state::myb3k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz / 3) /* 14.3182 main crystal divided by three through a 8284A */ MCFG_CPU_PROGRAM_MAP(myb3k_map) @@ -620,10 +623,10 @@ static MACHINE_CONFIG_START( myb3k ) MCFG_MC6845_CHAR_WIDTH(8) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jb3000, myb3k ) +MACHINE_CONFIG_DERIVED(myb3k_state::jb3000, myb3k) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( stepone, myb3k ) +MACHINE_CONFIG_DERIVED(myb3k_state::stepone, myb3k) MACHINE_CONFIG_END /* ROM definitions, ROM area is 8 x 8Kb and can be populated with 2732 mask ROMs or 2764s */ diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp index 257db4b633a..523c9e5e460 100644 --- a/src/mame/drivers/mycom.cpp +++ b/src/mame/drivers/mycom.cpp @@ -99,6 +99,7 @@ public: DECLARE_WRITE8_MEMBER(mycom_rtc_w); MC6845_UPDATE_ROW(crtc_update_row); + void mycom(machine_config &config); private: uint8_t m_0a; uint16_t m_i_videoram; @@ -497,7 +498,7 @@ DRIVER_INIT_MEMBER(mycom_state,mycom) membank("boot")->configure_entries(0, 2, &RAM[0x0000], 0x10000); } -static MACHINE_CONFIG_START( mycom ) +MACHINE_CONFIG_START(mycom_state::mycom) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_10MHz / 4) MCFG_CPU_PROGRAM_MAP(mycom_map) diff --git a/src/mame/drivers/mystston.cpp b/src/mame/drivers/mystston.cpp index ac3bd274b94..4da9c1a0d69 100644 --- a/src/mame/drivers/mystston.cpp +++ b/src/mame/drivers/mystston.cpp @@ -191,7 +191,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( mystston ) +MACHINE_CONFIG_START(mystston_state::mystston) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp index 1fe6a6bfd99..c9d2b7861bd 100644 --- a/src/mame/drivers/mystwarr.cpp +++ b/src/mame/drivers/mystwarr.cpp @@ -910,7 +910,7 @@ MACHINE_RESET_MEMBER(mystwarr_state,gaiapols) } -static MACHINE_CONFIG_START( mystwarr ) +MACHINE_CONFIG_START(mystwarr_state::mystwarr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz (confirmed) */ @@ -980,7 +980,7 @@ static MACHINE_CONFIG_START( mystwarr ) MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( viostorm, mystwarr ) +MACHINE_CONFIG_DERIVED(mystwarr_state::viostorm, mystwarr) MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,viostorm) @@ -1011,7 +1011,7 @@ static MACHINE_CONFIG_DERIVED( viostorm, mystwarr ) MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_RNG, -62, -23) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( metamrph, mystwarr ) +MACHINE_CONFIG_DERIVED(mystwarr_state::metamrph, mystwarr) MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,metamrph) @@ -1044,7 +1044,7 @@ static MACHINE_CONFIG_DERIVED( metamrph, mystwarr ) MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_RNG, -51, -24) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dadandrn, mystwarr ) +MACHINE_CONFIG_DERIVED(mystwarr_state::dadandrn, mystwarr) MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,dadandrn) @@ -1077,7 +1077,7 @@ static MACHINE_CONFIG_DERIVED( dadandrn, mystwarr ) MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX, -42, -22) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gaiapols, mystwarr ) +MACHINE_CONFIG_DERIVED(mystwarr_state::gaiapols, mystwarr) MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,gaiapols) @@ -1113,7 +1113,7 @@ static MACHINE_CONFIG_DERIVED( gaiapols, mystwarr ) MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_RNG, -61, -22) // stage2 brick walls MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( martchmp, mystwarr ) +MACHINE_CONFIG_DERIVED(mystwarr_state::martchmp, mystwarr) MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,martchmp) diff --git a/src/mame/drivers/myvision.cpp b/src/mame/drivers/myvision.cpp index 37a3e5e9959..70bd79cc767 100644 --- a/src/mame/drivers/myvision.cpp +++ b/src/mame/drivers/myvision.cpp @@ -55,6 +55,7 @@ public: DECLARE_WRITE8_MEMBER( ay_port_a_w ); DECLARE_WRITE8_MEMBER( ay_port_b_w ); + void myvision(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -207,7 +208,7 @@ WRITE8_MEMBER( myvision_state::ay_port_b_w ) m_column = data; } -static MACHINE_CONFIG_START( myvision ) +MACHINE_CONFIG_START(myvision_state::myvision) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_10_738635MHz/3) /* Not verified */ MCFG_CPU_PROGRAM_MAP(myvision_mem) diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp index 866895c3afe..ad2972fccf6 100644 --- a/src/mame/drivers/mz2000.cpp +++ b/src/mame/drivers/mz2000.cpp @@ -127,6 +127,8 @@ public: DECLARE_READ8_MEMBER(mz2000_pio1_portb_r); DECLARE_READ8_MEMBER(mz2000_pio1_porta_r); + void mz2000(machine_config &config); + void mz80b(machine_config &config); protected: required_device m_maincpu; required_device m_mb8877a; @@ -861,7 +863,7 @@ static SLOT_INTERFACE_START( mz2000_floppies ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( mz2000 ) +MACHINE_CONFIG_START(mz2000_state::mz2000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(mz2000_map) @@ -923,7 +925,7 @@ static MACHINE_CONFIG_START( mz2000 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mz80b, mz2000 ) +MACHINE_CONFIG_DERIVED(mz2000_state::mz80b, mz2000) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(mz80b_io) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp index f3a3c8ce3ef..ed3ce76aa8f 100644 --- a/src/mame/drivers/mz2500.cpp +++ b/src/mame/drivers/mz2500.cpp @@ -237,6 +237,7 @@ public: uint8_t pal_256_param(int index, int param); void mz2500_reset(mz2500_state *state, uint8_t type); required_device m_palette; + void mz2500(machine_config &config); }; @@ -2076,7 +2077,7 @@ static SLOT_INTERFACE_START( mz2500_floppies ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( mz2500 ) +MACHINE_CONFIG_START(mz2500_state::mz2500) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 6000000) MCFG_CPU_PROGRAM_MAP(mz2500_map) diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp index 0b53f5ddfe3..1e30dbbb234 100644 --- a/src/mame/drivers/mz3500.cpp +++ b/src/mame/drivers/mz3500.cpp @@ -103,6 +103,7 @@ public: UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); + void mz3500(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -800,7 +801,7 @@ static SLOT_INTERFACE_START( mz3500_floppies ) SLOT_INTERFACE_END /* TODO: clocks */ -static MACHINE_CONFIG_START( mz3500 ) +MACHINE_CONFIG_START(mz3500_state::mz3500) /* basic machine hardware */ MCFG_CPU_ADD("master",Z80,MAIN_CLOCK/2) diff --git a/src/mame/drivers/mz6500.cpp b/src/mame/drivers/mz6500.cpp index bdbb53d0d33..5adb093a7de 100644 --- a/src/mame/drivers/mz6500.cpp +++ b/src/mame/drivers/mz6500.cpp @@ -37,6 +37,7 @@ public: required_device m_maincpu; required_device m_palette; UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); + void mz6500(machine_config &config); }; UPD7220_DISPLAY_PIXELS_MEMBER( mz6500_state::hgdc_display_pixels ) @@ -137,7 +138,7 @@ static ADDRESS_MAP_START( upd7220_map, 0, 16, mz6500_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( mz6500 ) +MACHINE_CONFIG_START(mz6500_state::mz6500) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, 8000000) //unk clock MCFG_CPU_PROGRAM_MAP(mz6500_map) diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp index 70781085a1e..87ac8144c1e 100644 --- a/src/mame/drivers/mz700.cpp +++ b/src/mame/drivers/mz700.cpp @@ -368,7 +368,7 @@ GFXDECODE_END MACHINE DRIVERS ***************************************************************************/ -static MACHINE_CONFIG_START( mz700 ) +MACHINE_CONFIG_START(mz_state::mz700) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_17_73447MHz/5) MCFG_CPU_PROGRAM_MAP(mz700_mem) @@ -432,7 +432,7 @@ static MACHINE_CONFIG_START( mz700 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mz800, mz700 ) +MACHINE_CONFIG_DERIVED(mz_state::mz800, mz700) MCFG_DEVICE_REMOVE("banke") /* basic machine hardware */ diff --git a/src/mame/drivers/mz80.cpp b/src/mame/drivers/mz80.cpp index bafb9d7a6c5..7ca064ef90e 100644 --- a/src/mame/drivers/mz80.cpp +++ b/src/mame/drivers/mz80.cpp @@ -274,7 +274,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mz80_state::ne555_tempo_callback) m_mz80k_tempo_strobe ^= 1; } -static MACHINE_CONFIG_START( mz80k ) +MACHINE_CONFIG_START(mz80_state::mz80k) /* basic machine hardware */ /* main CPU */ @@ -322,13 +322,13 @@ static MACHINE_CONFIG_START( mz80k ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mz80kj, mz80k ) +MACHINE_CONFIG_DERIVED(mz80_state::mz80kj, mz80k) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(mz80_state, screen_update_mz80kj) MCFG_GFXDECODE_MODIFY("gfxdecode", mz80kj) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mz80a, mz80k ) +MACHINE_CONFIG_DERIVED(mz80_state::mz80a, mz80k) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(mz80_state, screen_update_mz80a) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mzr8105.cpp b/src/mame/drivers/mzr8105.cpp index fc0ed60611f..da7e3e25ee1 100644 --- a/src/mame/drivers/mzr8105.cpp +++ b/src/mame/drivers/mzr8105.cpp @@ -178,6 +178,7 @@ mzr8105_state(const machine_config &mconfig, device_type type, const char *tag) { } + void mzr8105(machine_config &config); private: required_device m_maincpu; }; @@ -203,7 +204,7 @@ SLOT_INTERFACE_END /* * Machine configuration */ -MACHINE_CONFIG_START (mzr8105) +MACHINE_CONFIG_START(mzr8105_state::mzr8105) MCFG_CPU_ADD ("maincpu", M68000, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP (mzr8105_mem) MCFG_VME_DEVICE_ADD("vme") diff --git a/src/mame/drivers/n64.cpp b/src/mame/drivers/n64.cpp index d2786cbb92e..4f95800e6d7 100644 --- a/src/mame/drivers/n64.cpp +++ b/src/mame/drivers/n64.cpp @@ -38,6 +38,8 @@ public: void disk_unload(device_image_interface &image); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( n64dd ); DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( n64dd ); + void n64(machine_config &config); + void n64dd(machine_config &config); }; READ32_MEMBER(n64_mess_state::dd_null_r) @@ -418,7 +420,7 @@ INTERRUPT_GEN_MEMBER(n64_mess_state::n64_reset_poll) periphs->poll_reset_button((ioport("RESET")->read() & 1) ? true : false); } -static MACHINE_CONFIG_START( n64 ) +MACHINE_CONFIG_START(n64_mess_state::n64) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", VR4300BE, 93750000) @@ -473,7 +475,7 @@ static MACHINE_CONFIG_START( n64 ) MCFG_SOFTWARE_LIST_ADD("cart_list", "n64") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( n64dd, n64 ) +MACHINE_CONFIG_DERIVED(n64_mess_state::n64dd, n64) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(n64dd_map) diff --git a/src/mame/drivers/n8080.cpp b/src/mame/drivers/n8080.cpp index b1ec73a8c5c..6adbefebb1d 100644 --- a/src/mame/drivers/n8080.cpp +++ b/src/mame/drivers/n8080.cpp @@ -500,7 +500,7 @@ MACHINE_RESET_MEMBER(n8080_state,helifire) } -static MACHINE_CONFIG_START( spacefev ) +MACHINE_CONFIG_START(n8080_state::spacefev) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10) @@ -531,7 +531,7 @@ static MACHINE_CONFIG_START( spacefev ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sheriff ) +MACHINE_CONFIG_START(n8080_state::sheriff) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10) @@ -562,7 +562,7 @@ static MACHINE_CONFIG_START( sheriff ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( westgun2, sheriff ) +MACHINE_CONFIG_DERIVED(n8080_state::westgun2, sheriff) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", I8080, XTAL_19_968MHz / 10) @@ -574,7 +574,7 @@ static MACHINE_CONFIG_DERIVED( westgun2, sheriff ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( helifire ) +MACHINE_CONFIG_START(n8080_state::helifire) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10) diff --git a/src/mame/drivers/nakajies.cpp b/src/mame/drivers/nakajies.cpp index 5fe6874cfe6..5c263cfaa9b 100644 --- a/src/mame/drivers/nakajies.cpp +++ b/src/mame/drivers/nakajies.cpp @@ -341,6 +341,10 @@ public: DECLARE_PALETTE_INIT(nakajies); DECLARE_INPUT_CHANGED_MEMBER(trigger_irq); TIMER_DEVICE_CALLBACK_MEMBER(kb_timer); + void nakajies210(machine_config &config); + void nakajies220(machine_config &config); + void nakajies250(machine_config &config); + void dator3k(machine_config &config); }; @@ -737,7 +741,7 @@ static GFXDECODE_START( drwrt400 ) GFXDECODE_ENTRY( "bios", 0x580b6, nakajies_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( nakajies210 ) +MACHINE_CONFIG_START(nakajies_state::nakajies210) MCFG_CPU_ADD( "v20hl", V20, X301 / 2 ) MCFG_CPU_PROGRAM_MAP( nakajies_map) MCFG_CPU_IO_MAP( nakajies_io_map) @@ -765,15 +769,15 @@ static MACHINE_CONFIG_START( nakajies210 ) MCFG_TIMER_DRIVER_ADD_PERIODIC("kb_timer", nakajies_state, kb_timer, attotime::from_hz(250)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dator3k, nakajies210 ) +MACHINE_CONFIG_DERIVED(nakajies_state::dator3k, nakajies210) MCFG_GFXDECODE_MODIFY("gfxdecode", dator3k) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nakajies220, nakajies210 ) +MACHINE_CONFIG_DERIVED(nakajies_state::nakajies220, nakajies210) MCFG_GFXDECODE_MODIFY("gfxdecode", drwrt400) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nakajies250, nakajies210 ) +MACHINE_CONFIG_DERIVED(nakajies_state::nakajies250, nakajies210) MCFG_SCREEN_MODIFY( "screen" ) MCFG_SCREEN_SIZE( 80 * 6, 16 * 8 ) MCFG_SCREEN_VISIBLE_AREA( 0, 6 * 80 - 1, 0, 16 * 8 - 1 ) diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp index 50c4406811e..518947fe621 100644 --- a/src/mame/drivers/namcofl.cpp +++ b/src/mame/drivers/namcofl.cpp @@ -577,7 +577,7 @@ MACHINE_RESET_MEMBER(namcofl_state,namcofl) } -static MACHINE_CONFIG_START( namcofl ) +MACHINE_CONFIG_START(namcofl_state::namcofl) MCFG_CPU_ADD("maincpu", I960, 20000000) // i80960KA-20 == 20 MHz part MCFG_CPU_PROGRAM_MAP(namcofl_mem) diff --git a/src/mame/drivers/namcona1.cpp b/src/mame/drivers/namcona1.cpp index d7ae030b1c5..6ca638e0492 100644 --- a/src/mame/drivers/namcona1.cpp +++ b/src/mame/drivers/namcona1.cpp @@ -933,7 +933,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcona1_state::interrupt) } /* cropped at sides */ -static MACHINE_CONFIG_START( namcona1 ) +MACHINE_CONFIG_START(namcona1_state::namcona1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4) @@ -972,7 +972,7 @@ MACHINE_CONFIG_END /* full-width */ -static MACHINE_CONFIG_DERIVED( namcona1w, namcona1 ) +MACHINE_CONFIG_DERIVED(namcona1_state::namcona1w, namcona1) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -980,7 +980,7 @@ static MACHINE_CONFIG_DERIVED( namcona1w, namcona1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( namcona2, namcona1 ) +MACHINE_CONFIG_DERIVED(namcona1_state::namcona2, namcona1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -991,7 +991,7 @@ static MACHINE_CONFIG_DERIVED( namcona2, namcona1 ) MCFG_CPU_IO_MAP( namcona1_mcu_io_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( namcona2w, namcona2 ) +MACHINE_CONFIG_DERIVED(namcona1_state::namcona2w, namcona2) /* video hardware */ MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp index 7bd3139cabb..cdb11f6428e 100644 --- a/src/mame/drivers/namconb1.cpp +++ b/src/mame/drivers/namconb1.cpp @@ -1064,7 +1064,7 @@ MACHINE_RESET_MEMBER(namconb1_state, namconb) /***************************************************************/ -static MACHINE_CONFIG_START( namconb1 ) +MACHINE_CONFIG_START(namconb1_state::namconb1) MCFG_CPU_ADD("maincpu", M68EC020, MASTER_CLOCK/2) MCFG_CPU_PROGRAM_MAP(namconb1_am) @@ -1106,7 +1106,7 @@ static MACHINE_CONFIG_START( namconb1 ) //MCFG_SOUND_ROUTE(3, "rspeaker", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( namconb2 ) +MACHINE_CONFIG_START(namconb1_state::namconb2) MCFG_CPU_ADD("maincpu", M68EC020, MASTER_CLOCK/2) MCFG_CPU_PROGRAM_MAP(namconb2_am) diff --git a/src/mame/drivers/namcond1.cpp b/src/mame/drivers/namcond1.cpp index 4931866af33..d7152d6e0b9 100644 --- a/src/mame/drivers/namcond1.cpp +++ b/src/mame/drivers/namcond1.cpp @@ -343,7 +343,7 @@ WRITE_LINE_MEMBER( namcond1_state::raster_irq_w ) m_maincpu->set_input_line(2, state ? ASSERT_LINE : CLEAR_LINE); } -static MACHINE_CONFIG_START( namcond1 ) +MACHINE_CONFIG_START(namcond1_state::namcond1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_49_152MHz/4) @@ -389,7 +389,7 @@ static MACHINE_CONFIG_START( namcond1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( abcheck, namcond1 ) +MACHINE_CONFIG_DERIVED(namcond1_state::abcheck, namcond1) MCFG_CPU_REPLACE("maincpu", M68000, XTAL_49_152MHz/4) MCFG_CPU_PROGRAM_MAP(abcheck_map) // MCFG_CPU_VBLANK_INT_DRIVER("screen", namcond1_state, irq1_line_hold) diff --git a/src/mame/drivers/namcops2.cpp b/src/mame/drivers/namcops2.cpp index 2254dd4fc31..3d01fb9896a 100644 --- a/src/mame/drivers/namcops2.cpp +++ b/src/mame/drivers/namcops2.cpp @@ -886,6 +886,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void system246(machine_config &config); + void system256(machine_config &config); protected: // devices @@ -913,7 +915,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( system246 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( system246 ) +MACHINE_CONFIG_START(namcops2_state::system246) MCFG_CPU_ADD("maincpu", R5000LE, 294000000) // actually R5900 @ 294 MHz MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) @@ -929,7 +931,7 @@ static MACHINE_CONFIG_START( system246 ) MCFG_PALETTE_ADD("palette", 65536) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system256, system246 ) +MACHINE_CONFIG_DERIVED(namcops2_state::system256, system246) MACHINE_CONFIG_END #define SYSTEM246_BIOS \ diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp index 660b8b0afda..d530d7b71c6 100644 --- a/src/mame/drivers/namcos1.cpp +++ b/src/mame/drivers/namcos1.cpp @@ -1017,7 +1017,7 @@ GFXDECODE_END LPF info : Fco = 3.3KHz , g = -12dB/oct */ -static MACHINE_CONFIG_START( ns1 ) +MACHINE_CONFIG_START(namcos1_state::ns1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_49_152MHz/32) diff --git a/src/mame/drivers/namcos10.cpp b/src/mame/drivers/namcos10.cpp index 5d79a1bf907..7b091891614 100644 --- a/src/mame/drivers/namcos10.cpp +++ b/src/mame/drivers/namcos10.cpp @@ -434,6 +434,16 @@ public: uint8_t *nand_base; void nand_copy( uint32_t *dst, uint32_t address, int len ); + void ns10_konotako(machine_config &config); + void ns10_mrdrilr2(machine_config &config); + void ns10_knpuzzle(machine_config &config); + void ns10_chocovdr(machine_config &config); + void ns10_startrgn(machine_config &config); + void namcos10_memm(machine_config &config); + void namcos10_memn(machine_config &config); + void ns10_gjspace(machine_config &config); + void ns10_nflclsfb(machine_config &config); + void ns10_gamshara(machine_config &config); private: enum { I2CP_IDLE, @@ -898,7 +908,7 @@ MACHINE_RESET_MEMBER(namcos10_state,namcos10) i2c_bit = 0; } -static MACHINE_CONFIG_START( namcos10_memm ) +MACHINE_CONFIG_START(namcos10_state::namcos10_memm) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", CXD8606BQ, XTAL_101_4912MHz ) MCFG_CPU_PROGRAM_MAP( namcos10_memm_map ) @@ -922,7 +932,7 @@ static MACHINE_CONFIG_START( namcos10_memm ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( namcos10_memn ) +MACHINE_CONFIG_START(namcos10_state::namcos10_memn) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", CXD8606BQ, XTAL_101_4912MHz ) MCFG_CPU_PROGRAM_MAP( namcos10_memn_map ) @@ -946,42 +956,42 @@ static MACHINE_CONFIG_START( namcos10_memn ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(ns10_mrdrilr2, namcos10_memm) +MACHINE_CONFIG_DERIVED(namcos10_state::ns10_mrdrilr2, namcos10_memm) /* decrypter device (CPLD in hardware?) */ MCFG_DEVICE_ADD("decrypter", MRDRILR2_DECRYPTER, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(ns10_chocovdr, namcos10_memn) +MACHINE_CONFIG_DERIVED(namcos10_state::ns10_chocovdr, namcos10_memn) /* decrypter device (CPLD in hardware?) */ MCFG_DEVICE_ADD("decrypter", CHOCOVDR_DECRYPTER, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(ns10_gamshara, namcos10_memn) +MACHINE_CONFIG_DERIVED(namcos10_state::ns10_gamshara, namcos10_memn) /* decrypter device (CPLD in hardware?) */ MCFG_DEVICE_ADD("decrypter", GAMSHARA_DECRYPTER, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(ns10_gjspace, namcos10_memn) +MACHINE_CONFIG_DERIVED(namcos10_state::ns10_gjspace, namcos10_memn) /* decrypter device (CPLD in hardware?) */ MCFG_DEVICE_ADD("decrypter", GJSPACE_DECRYPTER, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(ns10_knpuzzle, namcos10_memn) +MACHINE_CONFIG_DERIVED(namcos10_state::ns10_knpuzzle, namcos10_memn) /* decrypter device (CPLD in hardware?) */ MCFG_DEVICE_ADD("decrypter", KNPUZZLE_DECRYPTER, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(ns10_konotako, namcos10_memn) +MACHINE_CONFIG_DERIVED(namcos10_state::ns10_konotako, namcos10_memn) /* decrypter device (CPLD in hardware?) */ MCFG_DEVICE_ADD("decrypter", KONOTAKO_DECRYPTER, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(ns10_nflclsfb, namcos10_memn) +MACHINE_CONFIG_DERIVED(namcos10_state::ns10_nflclsfb, namcos10_memn) /* decrypter device (CPLD in hardware?) */ MCFG_DEVICE_ADD("decrypter", NFLCLSFB_DECRYPTER, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(ns10_startrgn, namcos10_memn) +MACHINE_CONFIG_DERIVED(namcos10_state::ns10_startrgn, namcos10_memn) /* decrypter device (CPLD in hardware?) */ MCFG_DEVICE_ADD("decrypter", STARTRGN_DECRYPTER, 0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp index ee1c195bd5f..efa4eb1ff03 100644 --- a/src/mame/drivers/namcos11.cpp +++ b/src/mame/drivers/namcos11.cpp @@ -333,6 +333,20 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(mcu_irq2_cb); TIMER_DEVICE_CALLBACK_MEMBER(mcu_adc_cb); + void coh110(machine_config &config); + void coh100(machine_config &config); + void myangel3(machine_config &config); + void xevi3dg(machine_config &config); + void dunkmnia(machine_config &config); + void pocketrc(machine_config &config); + void ptblank2ua(machine_config &config); + void tekken2o(machine_config &config); + void danceyes(machine_config &config); + void starswep(machine_config &config); + void primglex(machine_config &config); + void souledge(machine_config &config); + void tekken(machine_config &config); + void tekken2(machine_config &config); protected: virtual void driver_start() override; @@ -578,7 +592,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos11_state::mcu_adc_cb) m_mcu->set_input_line(M37710_LINE_ADC, HOLD_LINE); } -static MACHINE_CONFIG_START( coh110 ) +MACHINE_CONFIG_START(namcos11_state::coh110) MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz ) MCFG_CPU_PROGRAM_MAP( namcos11_map ) @@ -607,7 +621,7 @@ static MACHINE_CONFIG_START( coh110 ) MCFG_AT28C16_ADD( "at28c16", nullptr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( coh100, coh110 ) +MACHINE_CONFIG_DERIVED(namcos11_state::coh100, coh110) MCFG_CPU_REPLACE( "maincpu", CXD8530AQ, XTAL_67_7376MHz ) MCFG_CPU_PROGRAM_MAP( namcos11_map ) @@ -617,7 +631,7 @@ static MACHINE_CONFIG_DERIVED( coh100, coh110 ) MCFG_PSXGPU_REPLACE( "maincpu", "gpu", CXD8538Q, 0x200000, XTAL_53_693175MHz ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tekken, coh100 ) +MACHINE_CONFIG_DERIVED(namcos11_state::tekken, coh100) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( rom8_map ) @@ -625,74 +639,74 @@ static MACHINE_CONFIG_DERIVED( tekken, coh100 ) MCFG_DEVICE_ADD( "keycus", KEYCUS_C406, 0 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tekken2o, coh100 ) +MACHINE_CONFIG_DERIVED(namcos11_state::tekken2o, coh100) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( rom8_map ) MCFG_DEVICE_ADD( "keycus", KEYCUS_C406, 0 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tekken2, coh110 ) +MACHINE_CONFIG_DERIVED(namcos11_state::tekken2, coh110) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( rom8_map ) MCFG_DEVICE_ADD( "keycus", KEYCUS_C406, 0 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( souledge, coh110 ) +MACHINE_CONFIG_DERIVED(namcos11_state::souledge, coh110) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( rom8_map ) MCFG_DEVICE_ADD( "keycus", KEYCUS_C409, 0 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dunkmnia, coh110 ) +MACHINE_CONFIG_DERIVED(namcos11_state::dunkmnia, coh110) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( rom8_map ) MCFG_DEVICE_ADD( "keycus", KEYCUS_C410, 0 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( primglex, coh110 ) +MACHINE_CONFIG_DERIVED(namcos11_state::primglex, coh110) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( rom8_map ) MCFG_DEVICE_ADD( "keycus", KEYCUS_C411, 0 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( xevi3dg, coh110 ) +MACHINE_CONFIG_DERIVED(namcos11_state::xevi3dg, coh110) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( rom8_map ) MCFG_DEVICE_ADD( "keycus", KEYCUS_C430, 0 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( danceyes, coh110 ) +MACHINE_CONFIG_DERIVED(namcos11_state::danceyes, coh110) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( rom8_map ) MCFG_DEVICE_ADD( "keycus", KEYCUS_C431, 0 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pocketrc, coh110 ) +MACHINE_CONFIG_DERIVED(namcos11_state::pocketrc, coh110) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( rom8_map ) MCFG_DEVICE_ADD( "keycus", KEYCUS_C432, 0 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( starswep, coh110 ) +MACHINE_CONFIG_DERIVED(namcos11_state::starswep, coh110) MCFG_DEVICE_ADD( "keycus", KEYCUS_C442, 0 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( myangel3, coh110 ) +MACHINE_CONFIG_DERIVED(namcos11_state::myangel3, coh110) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( rom8_64_map ) MCFG_DEVICE_ADD( "keycus", KEYCUS_C443, 0 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ptblank2ua, coh110 ) +MACHINE_CONFIG_DERIVED(namcos11_state::ptblank2ua, coh110) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( ptblank2ua_map ) diff --git a/src/mame/drivers/namcos12.cpp b/src/mame/drivers/namcos12.cpp index c152f7f27cd..b1ce95b716f 100644 --- a/src/mame/drivers/namcos12.cpp +++ b/src/mame/drivers/namcos12.cpp @@ -1168,6 +1168,7 @@ public: void namcos12_rom_read( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); void namcos12_sub_irq( screen_device &screen, bool vblank_state ); + void coh700(machine_config &config); protected: virtual void machine_reset() override; }; @@ -1178,6 +1179,12 @@ class namcos12_boothack_state : public namcos12_state public: using namcos12_state::namcos12_state; + void technodr(machine_config &config); + void golgo13(machine_config &config); + void aplarail(machine_config &config); + void truckk(machine_config &config); + void tektagt(machine_config &config); + void ptblank2(machine_config &config); protected: virtual void machine_reset() override; }; @@ -1664,7 +1671,7 @@ DRIVER_INIT_MEMBER(namcos12_state,technodr) *( (uint32_t *)( memregion( "sub" )->base() + 0x14b6 ) ) = 0; } -static MACHINE_CONFIG_START( coh700 ) +MACHINE_CONFIG_START(namcos12_state::coh700) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", CXD8661R, XTAL_100MHz) @@ -1673,7 +1680,7 @@ static MACHINE_CONFIG_START( coh700 ) MCFG_RAM_MODIFY("maincpu:ram") MCFG_RAM_DEFAULT_SIZE("4M") - MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&namcos12_state::namcos12_rom_read, (namcos12_state *) owner )) + MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&namcos12_state::namcos12_rom_read, this )) MCFG_CPU_ADD("sub", H83002, 16934400) // frequency based on research (superctr) MCFG_CPU_PROGRAM_MAP(s12h8rwmap) @@ -1693,7 +1700,7 @@ static MACHINE_CONFIG_START( coh700 ) /* video hardware */ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8654Q, 0x200000, XTAL_53_693175MHz ) - MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate(&namcos12_state::namcos12_sub_irq, (namcos12_state *) owner ) ) + MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate(&namcos12_state::namcos12_sub_irq, this ) ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1705,21 +1712,21 @@ static MACHINE_CONFIG_START( coh700 ) //MCFG_SOUND_ROUTE(3, "rspeaker", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ptblank2, coh700 ) +MACHINE_CONFIG_DERIVED(namcos12_boothack_state::ptblank2, coh700) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP( ptblank2_map ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tektagt, coh700 ) +MACHINE_CONFIG_DERIVED(namcos12_boothack_state::tektagt, coh700) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP( tektagt_map ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( golgo13, coh700 ) +MACHINE_CONFIG_DERIVED(namcos12_boothack_state::golgo13, coh700) /* basic machine hardware */ MCFG_CPU_MODIFY("sub") @@ -1736,7 +1743,7 @@ static ADDRESS_MAP_START( jvsiomap, AS_IO, 16, namcos12_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( truckk, coh700 ) +MACHINE_CONFIG_DERIVED(namcos12_boothack_state::truckk, coh700) // Timer at 115200*16 for the jvs serial clock MCFG_DEVICE_MODIFY(":sub:sci0") MCFG_H8_SCI_SET_EXTERNAL_CLOCK_PERIOD(attotime::from_hz(JVSCLOCK/8)) @@ -1805,7 +1812,7 @@ static ADDRESS_MAP_START( plarailjvsiomap, AS_IO, 16, namcos12_state ) AM_RANGE(h8_device::ADC_2, h8_device::ADC_2) AM_NOP ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( technodr, coh700 ) +MACHINE_CONFIG_DERIVED(namcos12_boothack_state::technodr, coh700) // Timer at 115200*16 for the jvs serial clock MCFG_DEVICE_MODIFY(":sub:sci0") MCFG_H8_SCI_SET_EXTERNAL_CLOCK_PERIOD(attotime::from_hz(JVSCLOCK/8)) @@ -1827,7 +1834,7 @@ static MACHINE_CONFIG_DERIVED( technodr, coh700 ) MCFG_QUANTUM_TIME(attotime::from_hz(2*115200)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aplarail, coh700 ) +MACHINE_CONFIG_DERIVED(namcos12_boothack_state::aplarail, coh700) // Timer at 115200*16 for the jvs serial clock MCFG_DEVICE_MODIFY(":sub:sci0") MCFG_H8_SCI_SET_EXTERNAL_CLOCK_PERIOD(attotime::from_hz(JVSCLOCK/8)) diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp index 310026ab9b5..d21851ac08e 100644 --- a/src/mame/drivers/namcos2.cpp +++ b/src/mame/drivers/namcos2.cpp @@ -917,7 +917,7 @@ ADDRESS_MAP_END /* */ /*************************************************************/ -static INPUT_PORTS_START( default ) +static INPUT_PORTS_START( base ) NAMCOS2_MCU_PORT_B_DEFAULT NAMCOS2_MCU_PORT_C_DEFAULT NAMCOS2_MCU_ANALOG_PORT_DEFAULT @@ -927,7 +927,7 @@ static INPUT_PORTS_START( default ) INPUT_PORTS_END static INPUT_PORTS_START( kyukaidk ) - PORT_INCLUDE( default ) + PORT_INCLUDE( base ) PORT_MODIFY("DSW") /* Must be 'L' for correct C140 output */ @@ -1681,7 +1681,7 @@ via software as INT1 /* */ /*************************************************************/ -static MACHINE_CONFIG_START( configure_c148_standard ) +MACHINE_CONFIG_START(namcos2_state::configure_c148_standard) MCFG_NAMCO_C148_ADD("master_intc","maincpu",true) namco_c148_device::link_c148_device(*device,"slave_intc"); MCFG_NAMCO_C148_EXT1_CB(WRITE8(namcos2_state, sound_reset_w)) @@ -1713,7 +1713,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos2_state::screen_scanline) } } -static MACHINE_CONFIG_START( default ) +MACHINE_CONFIG_START(namcos2_state::base) MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ MCFG_CPU_PROGRAM_MAP(master_default_am) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) @@ -1764,7 +1764,7 @@ static MACHINE_CONFIG_START( default ) MACHINE_CONFIG_END /* adjusted machine driver start */ -static MACHINE_CONFIG_DERIVED( default2, default ) +MACHINE_CONFIG_DERIVED(namcos2_state::base2, base) MCFG_C140_REPLACE("c140", C140_SOUND_CLOCK) /* 21.333kHz */ MCFG_C140_BANK_TYPE(SYSTEM2) @@ -1773,12 +1773,12 @@ static MACHINE_CONFIG_DERIVED( default2, default ) MACHINE_CONFIG_END /* end */ -static MACHINE_CONFIG_DERIVED( assaultp, default2 ) +MACHINE_CONFIG_DERIVED(namcos2_state::assaultp, base2) MCFG_QUANTUM_TIME(attotime::from_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 ) +MACHINE_CONFIG_DERIVED(namcos2_state::base3, base) MCFG_C140_REPLACE("c140", C140_SOUND_CLOCK) /* 21.333kHz */ MCFG_C140_BANK_TYPE(SYSTEM2) @@ -1790,7 +1790,7 @@ static MACHINE_CONFIG_DERIVED( default3, default ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gollygho ) +MACHINE_CONFIG_START(namcos2_state::gollygho) MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ MCFG_CPU_PROGRAM_MAP(master_default_am) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) @@ -1840,7 +1840,7 @@ static MACHINE_CONFIG_START( gollygho ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( finallap ) +MACHINE_CONFIG_START(namcos2_state::finallap) MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ MCFG_CPU_PROGRAM_MAP(master_finallap_am) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) @@ -1895,7 +1895,7 @@ static MACHINE_CONFIG_START( finallap ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sgunner ) +MACHINE_CONFIG_START(namcos2_state::sgunner) MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ MCFG_CPU_PROGRAM_MAP(master_sgunner_am) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) @@ -1947,7 +1947,7 @@ static MACHINE_CONFIG_START( sgunner ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sgunner2 ) +MACHINE_CONFIG_START(namcos2_state::sgunner2) MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ MCFG_CPU_PROGRAM_MAP(master_sgunner_am) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) @@ -2004,7 +2004,7 @@ static MACHINE_CONFIG_START( sgunner2 ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( luckywld ) +MACHINE_CONFIG_START(namcos2_state::luckywld) MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ MCFG_CPU_PROGRAM_MAP(master_luckywld_am) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) @@ -2059,7 +2059,7 @@ static MACHINE_CONFIG_START( luckywld ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( metlhawk ) +MACHINE_CONFIG_START(namcos2_state::metlhawk) MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */ MCFG_CPU_PROGRAM_MAP(master_metlhawk_am) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1) @@ -5871,51 +5871,51 @@ GAMEL(1987, finallapc, finallap, finallap, finallap, namcos2_state, finallap, R GAMEL(1987, finallapjc, finallap, finallap, finallap, namcos2_state, finallap, ROT0, "Namco", "Final Lap (Japan, Rev C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap ) GAMEL(1987, finallapjb, finallap, finallap, finallap, namcos2_state, finallap, ROT0, "Namco", "Final Lap (Japan, Rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap ) -GAME( 1988, assault, 0, default2, assault, namcos2_state, assault, ROT90, "Namco", "Assault (Rev B)", 0 ) -GAME( 1988, assaultj, assault, default2, assault, namcos2_state, assaultj, ROT90, "Namco", "Assault (Japan)", 0 ) +GAME( 1988, assault, 0, base2, assault, namcos2_state, assault, ROT90, "Namco", "Assault (Rev B)", 0 ) +GAME( 1988, assaultj, assault, base2, assault, namcos2_state, assaultj, ROT90, "Namco", "Assault (Japan)", 0 ) GAME( 1988, assaultp, assault, assaultp, assault, namcos2_state, assaultp_hack, ROT90, "Namco", "Assault Plus (Japan)", 0) GAME( 1988, metlhawk, 0, metlhawk, metlhawk, namcos2_state, metlhawk, ROT90, "Namco", "Metal Hawk (Rev C)", 0) GAME( 1988, metlhawkj, metlhawk, metlhawk, metlhawk, namcos2_state, metlhawk, ROT90, "Namco", "Metal Hawk (Japan, Rev F)", 0) -GAME( 1988, ordyne, 0, default, default, namcos2_state, ordyne, ROT180, "Namco", "Ordyne (World)", 0 ) -GAME( 1988, ordyneje, ordyne, default, default, namcos2_state, ordyne, ROT180, "Namco", "Ordyne (Japan, English Version)", 0 ) -GAME( 1988, ordynej, ordyne, default, default, namcos2_state, ordyne, ROT180, "Namco", "Ordyne (Japan)", 0 ) +GAME( 1988, ordyne, 0, base, base, namcos2_state, ordyne, ROT180, "Namco", "Ordyne (World)", 0 ) +GAME( 1988, ordyneje, ordyne, base, base, namcos2_state, ordyne, ROT180, "Namco", "Ordyne (Japan, English Version)", 0 ) +GAME( 1988, ordynej, ordyne, base, base, namcos2_state, ordyne, ROT180, "Namco", "Ordyne (Japan)", 0 ) -GAME( 1988, mirninja, 0, default, default, namcos2_state, mirninja, ROT0, "Namco", "Mirai Ninja (Japan)", 0 ) +GAME( 1988, mirninja, 0, base, base, namcos2_state, mirninja, ROT0, "Namco", "Mirai Ninja (Japan)", 0 ) -GAME( 1988, phelios, 0, default2, default, namcos2_state, phelios, ROT90, "Namco", "Phelios", 0) -GAME( 1988, pheliosj, phelios, default2, default, namcos2_state, phelios, ROT90, "Namco", "Phelios (Japan)", 0) +GAME( 1988, phelios, 0, base2, base, namcos2_state, phelios, ROT90, "Namco", "Phelios", 0) +GAME( 1988, pheliosj, phelios, base2, base, namcos2_state, phelios, ROT90, "Namco", "Phelios (Japan)", 0) -GAME( 1989, dirtfoxj, 0, default2, dirtfox, namcos2_state, dirtfoxj, ROT90, "Namco", "Dirt Fox (Japan)", MACHINE_NODEVICE_LAN ) +GAME( 1989, dirtfoxj, 0, base2, dirtfox, namcos2_state, dirtfoxj, ROT90, "Namco", "Dirt Fox (Japan)", MACHINE_NODEVICE_LAN ) GAMEL(1989, fourtrax, 0, finallap, fourtrax, namcos2_state, fourtrax, ROT0, "Namco", "Four Trax (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap ) GAMEL(1989, fourtraxa, fourtrax, finallap, fourtrax, namcos2_state, fourtrax, ROT0, "Namco", "Four Trax (Asia)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap ) // believed to be Asia due to the 4 appended to the changed ROMs. All other games with 2 are marked World and with 1 are marked Japan. -GAME( 1989, valkyrie, 0, default3, default, namcos2_state, valkyrie, ROT90, "Namco", "Valkyrie No Densetsu (Japan)", 0 ) +GAME( 1989, valkyrie, 0, base3, base, namcos2_state, valkyrie, ROT90, "Namco", "Valkyrie No Densetsu (Japan)", 0 ) -GAME( 1989, finehour, 0, default2, default, namcos2_state, finehour, ROT0, "Namco", "Finest Hour (Japan)", 0) +GAME( 1989, finehour, 0, base2, base, namcos2_state, finehour, ROT0, "Namco", "Finest Hour (Japan)", 0) -GAME( 1989, burnforc, 0, default3, default, namcos2_state, burnforc, ROT0, "Namco", "Burning Force (Japan, new version (Rev C))", 0 ) -GAME( 1989, burnforco, burnforc, default3, default, namcos2_state, burnforc, ROT0, "Namco", "Burning Force (Japan, old version)", 0 ) +GAME( 1989, burnforc, 0, base3, base, namcos2_state, burnforc, ROT0, "Namco", "Burning Force (Japan, new version (Rev C))", 0 ) +GAME( 1989, burnforco, burnforc, base3, base, namcos2_state, burnforc, ROT0, "Namco", "Burning Force (Japan, old version)", 0 ) -GAME( 1989, marvland, 0, default, default, namcos2_state, marvland, ROT0, "Namco", "Marvel Land (US)", MACHINE_IMPERFECT_SOUND ) -GAME( 1989, marvlandj, marvland, default, default, namcos2_state, marvlanj, ROT0, "Namco", "Marvel Land (Japan)", 0 ) +GAME( 1989, marvland, 0, base, base, namcos2_state, marvland, ROT0, "Namco", "Marvel Land (US)", MACHINE_IMPERFECT_SOUND ) +GAME( 1989, marvlandj, marvland, base, base, namcos2_state, marvlanj, ROT0, "Namco", "Marvel Land (Japan)", 0 ) -GAME( 1990, kyukaidk, 0, default, kyukaidk, namcos2_state, kyukaidk, ROT0, "Namco", "Kyuukai Douchuuki (Japan, new version (Rev B))", 0 ) -GAME( 1990, kyukaidko, kyukaidk, default, kyukaidk, namcos2_state, kyukaidk, ROT0, "Namco", "Kyuukai Douchuuki (Japan, old version)", 0 ) +GAME( 1990, kyukaidk, 0, base, kyukaidk, namcos2_state, kyukaidk, ROT0, "Namco", "Kyuukai Douchuuki (Japan, new version (Rev B))", 0 ) +GAME( 1990, kyukaidko, kyukaidk, base, kyukaidk, namcos2_state, kyukaidk, ROT0, "Namco", "Kyuukai Douchuuki (Japan, old version)", 0 ) -GAME( 1990, dsaber, 0, default3, default, namcos2_state, dsaber, ROT90, "Namco", "Dragon Saber (World, DO2)", 0 ) -GAME( 1990, dsabera, dsaber, default3, default, namcos2_state, dsaber, ROT90, "Namco", "Dragon Saber (World, older?)", 0 ) -GAME( 1990, dsaberj, dsaber, default3, default, namcos2_state, dsaberj, ROT90, "Namco", "Dragon Saber (Japan, Rev B)", 0 ) +GAME( 1990, dsaber, 0, base3, base, namcos2_state, dsaber, ROT90, "Namco", "Dragon Saber (World, DO2)", 0 ) +GAME( 1990, dsabera, dsaber, base3, base, namcos2_state, dsaber, ROT90, "Namco", "Dragon Saber (World, older?)", 0 ) +GAME( 1990, dsaberj, dsaber, base3, base, namcos2_state, dsaberj, ROT90, "Namco", "Dragon Saber (Japan, Rev B)", 0 ) GAMEL(1990, finalap2, 0, finallap, finallap, namcos2_state, finalap2, ROT0, "Namco", "Final Lap 2", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap ) GAMEL(1990, finalap2j, finalap2, finallap, finallap, namcos2_state, finalap2, ROT0, "Namco", "Final Lap 2 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap ) GAME( 1990, gollygho, 0, gollygho, gollygho, namcos2_state, gollygho, ROT180, "Namco", "Golly! Ghost!", MACHINE_REQUIRES_ARTWORK ) -GAME( 1990, rthun2, 0, default3, default, namcos2_state, rthun2, ROT0, "Namco", "Rolling Thunder 2", 0 ) -GAME( 1990, rthun2j, rthun2, default3, default, namcos2_state, rthun2j, ROT0, "Namco", "Rolling Thunder 2 (Japan)", 0 ) +GAME( 1990, rthun2, 0, base3, base, namcos2_state, rthun2, ROT0, "Namco", "Rolling Thunder 2", 0 ) +GAME( 1990, rthun2j, rthun2, base3, base, namcos2_state, rthun2j, ROT0, "Namco", "Rolling Thunder 2 (Japan)", 0 ) GAME( 1990, sgunner, 0, sgunner, sgunner, namcos2_state, sgunner2, ROT0, "Namco", "Steel Gunner (Rev B)", 0 ) GAME( 1990, sgunnerj, sgunner, sgunner, sgunner, namcos2_state, sgunner2, ROT0, "Namco", "Steel Gunner (Japan)", 0 ) @@ -5923,8 +5923,8 @@ GAME( 1990, sgunnerj, sgunner, sgunner, sgunner, namcos2_state, sgunner2, R GAME( 1991, sgunner2, 0, sgunner2, sgunner2, namcos2_state, sgunner2, ROT0, "Namco", "Steel Gunner 2 (US)", 0 ) GAME( 1991, sgunner2j, sgunner2, sgunner2, sgunner2, namcos2_state, sgunner2, ROT0, "Namco", "Steel Gunner 2 (Japan, Rev A)", 0 ) -GAME( 1991, cosmogng, 0, default, default, namcos2_state, cosmogng, ROT90, "Namco", "Cosmo Gang the Video (US)", 0 ) -GAME( 1991, cosmogngj, cosmogng, default, default, namcos2_state, cosmogng, ROT90, "Namco", "Cosmo Gang the Video (Japan)", 0 ) +GAME( 1991, cosmogng, 0, base, base, namcos2_state, cosmogng, ROT90, "Namco", "Cosmo Gang the Video (US)", 0 ) +GAME( 1991, cosmogngj, cosmogng, base, base, namcos2_state, cosmogng, ROT90, "Namco", "Cosmo Gang the Video (Japan)", 0 ) GAME( 1992, bubbletr, 0, gollygho, bubbletr, namcos2_state, bubbletr, ROT180, "Namco", "Bubble Trouble (World, Rev B)", MACHINE_REQUIRES_ARTWORK ) GAME( 1992, bubbletrj, bubbletr, gollygho, bubbletr, namcos2_state, bubbletr, ROT180, "Namco", "Bubble Trouble (Japan, Rev C)", MACHINE_REQUIRES_ARTWORK ) @@ -5941,12 +5941,12 @@ GAME( 1992, luckywldj, luckywld, luckywld, luckywld, namcos2_state, luckywld, R GAME( 1992, suzuka8h, 0, luckywld, suzuka, namcos2_state, suzuka8h, ROT0, "Namco", "Suzuka 8 Hours (World, Rev C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN ) GAME( 1992, suzuka8hj, suzuka8h, luckywld, suzuka, namcos2_state, suzuka8h, ROT0, "Namco", "Suzuka 8 Hours (Japan, Rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN ) -GAME( 1992, sws, 0, default, default, namcos2_state, sws, ROT0, "Namco", "Super World Stadium (Japan)", 0 ) +GAME( 1992, sws, 0, base, base, namcos2_state, sws, ROT0, "Namco", "Super World Stadium (Japan)", 0 ) -GAME( 1992, sws92, 0, default, default, namcos2_state, sws92, ROT0, "Namco", "Super World Stadium '92 (Japan)", 0 ) -GAME( 1992, sws92g, sws92, default, default, namcos2_state, sws92g, ROT0, "Namco", "Super World Stadium '92 Gekitouban (Japan)", 0 ) +GAME( 1992, sws92, 0, base, base, namcos2_state, sws92, ROT0, "Namco", "Super World Stadium '92 (Japan)", 0 ) +GAME( 1992, sws92g, sws92, base, base, namcos2_state, sws92g, ROT0, "Namco", "Super World Stadium '92 Gekitouban (Japan)", 0 ) GAME( 1993, suzuk8h2, 0, luckywld, suzuka, namcos2_state, suzuk8h2, ROT0, "Namco", "Suzuka 8 Hours 2 (World, Rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN ) GAME( 1993, suzuk8h2j, suzuk8h2, luckywld, suzuka, namcos2_state, suzuk8h2, ROT0, "Namco", "Suzuka 8 Hours 2 (Japan, Rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN ) -GAME( 1993, sws93, 0, default, default, namcos2_state, sws93, ROT0, "Namco", "Super World Stadium '93 (Japan)", 0 ) +GAME( 1993, sws93, 0, base, base, namcos2_state, sws93, ROT0, "Namco", "Super World Stadium '93 (Japan)", 0 ) diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp index d3ff19d8c80..ee86c776e2e 100644 --- a/src/mame/drivers/namcos21.cpp +++ b/src/mame/drivers/namcos21.cpp @@ -1871,7 +1871,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos21_state::screen_scanline) } } -static MACHINE_CONFIG_START( configure_c148_standard ) +MACHINE_CONFIG_START(namcos21_state::configure_c148_standard) MCFG_NAMCO_C148_ADD("master_intc","maincpu",true) namco_c148_device::link_c148_device(*device,"slave_intc"); MCFG_NAMCO_C148_EXT1_CB(WRITE8(namcos21_state, sound_reset_w)) @@ -1882,7 +1882,7 @@ static MACHINE_CONFIG_START( configure_c148_standard ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( namcos21 ) +MACHINE_CONFIG_START(namcos21_state::namcos21) MCFG_CPU_ADD("maincpu", M68000,12288000) /* Master */ MCFG_CPU_PROGRAM_MAP(master_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos21_state, screen_scanline, "screen", 0, 1) @@ -1949,7 +1949,7 @@ static MACHINE_CONFIG_START( namcos21 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( driveyes ) +MACHINE_CONFIG_START(namcos21_state::driveyes) MCFG_CPU_ADD("maincpu", M68000,12288000) /* Master */ MCFG_CPU_PROGRAM_MAP(driveyes_master_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos21_state, screen_scanline, "screen", 0, 1) @@ -2009,7 +2009,7 @@ static MACHINE_CONFIG_START( driveyes ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( winrun ) +MACHINE_CONFIG_START(namcos21_state::winrun) MCFG_CPU_ADD("maincpu", M68000,12288000) /* Master */ MCFG_CPU_PROGRAM_MAP(winrun_master_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos21_state, screen_scanline, "screen", 0, 1) diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp index 4e58f44110b..f113e0cca4d 100644 --- a/src/mame/drivers/namcos22.cpp +++ b/src/mame/drivers/namcos22.cpp @@ -3732,7 +3732,7 @@ void namcos22_state::machine_start() } // System 22 -static MACHINE_CONFIG_START( namcos22 ) +MACHINE_CONFIG_START(namcos22_state::namcos22) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68020,SS22_MASTER_CLOCK/2) /* 25 MHz? */ @@ -3788,7 +3788,7 @@ static MACHINE_CONFIG_START( namcos22 ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cybrcomm, namcos22 ) +MACHINE_CONFIG_DERIVED(namcos22_state::cybrcomm, namcos22) MCFG_SPEAKER_STANDARD_STEREO("rear_left","rear_right") @@ -3798,7 +3798,7 @@ static MACHINE_CONFIG_DERIVED( cybrcomm, namcos22 ) MACHINE_CONFIG_END // Super System 22 -static MACHINE_CONFIG_START( namcos22s ) +MACHINE_CONFIG_START(namcos22_state::namcos22s) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020,SS22_MASTER_CLOCK/2) @@ -3853,7 +3853,7 @@ static MACHINE_CONFIG_START( namcos22s ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( airco22b, namcos22s ) +MACHINE_CONFIG_DERIVED(namcos22_state::airco22b, namcos22s) MCFG_SPEAKER_STANDARD_MONO("bodysonic") @@ -3861,7 +3861,7 @@ static MACHINE_CONFIG_DERIVED( airco22b, namcos22s ) MCFG_SOUND_ROUTE(2, "bodysonic", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( alpine, namcos22s ) +MACHINE_CONFIG_DERIVED(namcos22_state::alpine, namcos22s) /* basic machine hardware */ MCFG_CPU_MODIFY("mcu") @@ -3870,14 +3870,14 @@ static MACHINE_CONFIG_DERIVED( alpine, namcos22s ) MCFG_TIMER_DRIVER_ADD("motor_timer", namcos22_state, alpine_steplock_callback) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( alpinesa, alpine ) +MACHINE_CONFIG_DERIVED(namcos22_state::alpinesa, alpine) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(alpinesa_am) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cybrcycc, namcos22s ) +MACHINE_CONFIG_DERIVED(namcos22_state::cybrcycc, namcos22s) MCFG_SPEAKER_STANDARD_MONO("tank") @@ -3885,7 +3885,7 @@ static MACHINE_CONFIG_DERIVED( cybrcycc, namcos22s ) MCFG_SOUND_ROUTE(2, "tank", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dirtdash, namcos22s ) +MACHINE_CONFIG_DERIVED(namcos22_state::dirtdash, namcos22s) MCFG_SPEAKER_STANDARD_MONO("road") MCFG_SPEAKER_STANDARD_MONO("under") @@ -3895,14 +3895,14 @@ static MACHINE_CONFIG_DERIVED( dirtdash, namcos22s ) MCFG_SOUND_ROUTE(3, "under", 0.50) // from sound test MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( timecris, namcos22s ) +MACHINE_CONFIG_DERIVED(namcos22_state::timecris, namcos22s) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(timecris_am) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tokyowar, namcos22s ) +MACHINE_CONFIG_DERIVED(namcos22_state::tokyowar, namcos22s) MCFG_SPEAKER_STANDARD_MONO("seat") MCFG_SPEAKER_STANDARD_MONO("vibration") @@ -3912,7 +3912,7 @@ static MACHINE_CONFIG_DERIVED( tokyowar, namcos22s ) MCFG_SOUND_ROUTE(2, "vibration", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( propcycl, namcos22s ) +MACHINE_CONFIG_DERIVED(namcos22_state::propcycl, namcos22s) /* basic machine hardware */ MCFG_CPU_MODIFY("mcu") @@ -3930,7 +3930,7 @@ MACHINE_START_MEMBER(namcos22_state,adillor) elem = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(namcos22_state::adillor_trackball_interrupt),this)); } -static MACHINE_CONFIG_DERIVED( adillor, namcos22s ) +MACHINE_CONFIG_DERIVED(namcos22_state::adillor, namcos22s) /* basic machine hardware */ MCFG_TIMER_DRIVER_ADD_PERIODIC("ar_tb_upd", namcos22_state, adillor_trackball_update, attotime::from_msec(20)) diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp index 66ebe564f04..85ab3a0bdf0 100644 --- a/src/mame/drivers/namcos23.cpp +++ b/src/mame/drivers/namcos23.cpp @@ -1597,6 +1597,13 @@ public: void render_project(poly_vertex &pv); void render_one_model(const namcos23_render_entry *re); void render_run(bitmap_rgb32 &bitmap); + void timecrs2v4a(machine_config &config); + void ss23e2(machine_config &config); + void gorgon(machine_config &config); + void ss23(machine_config &config); + void s23(machine_config &config); + void gmen(machine_config &config); + void timecrs2(machine_config &config); }; @@ -3536,7 +3543,7 @@ static GFXDECODE_START( namcos23 ) GFXDECODE_END -static MACHINE_CONFIG_START( gorgon ) +MACHINE_CONFIG_START(namcos23_state::gorgon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R4650BE, BUSCLOCK*4) @@ -3602,7 +3609,7 @@ static MACHINE_CONFIG_START( gorgon ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( s23 ) +MACHINE_CONFIG_START(namcos23_state::s23) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R4650BE, BUSCLOCK*4) @@ -3667,14 +3674,14 @@ static MACHINE_CONFIG_START( s23 ) MCFG_SOUND_ROUTE(3, "lspeaker", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( timecrs2, s23 ) +MACHINE_CONFIG_DERIVED(namcos23_state::timecrs2, s23) /* basic machine hardware */ MCFG_CPU_MODIFY("iocpu") MCFG_CPU_PROGRAM_MAP( timecrs2iobrdmap ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gmen, s23 ) +MACHINE_CONFIG_DERIVED(namcos23_state::gmen, s23) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3688,7 +3695,7 @@ static MACHINE_CONFIG_DERIVED( gmen, s23 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ss23 ) +MACHINE_CONFIG_START(namcos23_state::ss23) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R4650BE, BUSCLOCK*5) @@ -3744,7 +3751,7 @@ static MACHINE_CONFIG_START( ss23 ) MCFG_SOUND_ROUTE(3, "lspeaker", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( timecrs2v4a, ss23 ) +MACHINE_CONFIG_DERIVED(namcos23_state::timecrs2v4a, ss23) /* basic machine hardware */ MCFG_CPU_ADD("iocpu", H83334, JVSCLOCK ) MCFG_CPU_PROGRAM_MAP( timecrs2iobrdmap ) @@ -3756,7 +3763,7 @@ static MACHINE_CONFIG_DERIVED( timecrs2v4a, ss23 ) MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":iocpu:sci0", h8_sci_device, rx_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ss23e2, ss23 ) +MACHINE_CONFIG_DERIVED(namcos23_state::ss23e2, ss23) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp index c459f2af3bc..fb7c6d0d197 100644 --- a/src/mame/drivers/namcos86.cpp +++ b/src/mame/drivers/namcos86.cpp @@ -1047,7 +1047,7 @@ GFXDECODE_END /*******************************************************************/ -static MACHINE_CONFIG_START( hopmappy ) +MACHINE_CONFIG_START(namcos86_state::hopmappy) /* basic machine hardware */ MCFG_CPU_ADD("cpu1", MC6809E, XTAL_49_152MHz/32) @@ -1091,7 +1091,7 @@ static MACHINE_CONFIG_START( hopmappy ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( roishtar, hopmappy ) +MACHINE_CONFIG_DERIVED(namcos86_state::roishtar, hopmappy) /* basic machine hardware */ MCFG_CPU_MODIFY("cpu2") @@ -1102,7 +1102,7 @@ static MACHINE_CONFIG_DERIVED( roishtar, hopmappy ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( genpeitd, hopmappy ) +MACHINE_CONFIG_DERIVED(namcos86_state::genpeitd, hopmappy) /* basic machine hardware */ MCFG_CPU_MODIFY("cpu2") @@ -1117,7 +1117,7 @@ static MACHINE_CONFIG_DERIVED( genpeitd, hopmappy ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rthunder, hopmappy ) +MACHINE_CONFIG_DERIVED(namcos86_state::rthunder, hopmappy) /* basic machine hardware */ MCFG_CPU_MODIFY("cpu2") @@ -1132,7 +1132,7 @@ static MACHINE_CONFIG_DERIVED( rthunder, hopmappy ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wndrmomo, hopmappy ) +MACHINE_CONFIG_DERIVED(namcos86_state::wndrmomo, hopmappy) /* basic machine hardware */ MCFG_CPU_MODIFY("cpu2") diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp index 99e10a1c303..4b22669b3c6 100644 --- a/src/mame/drivers/nanos.cpp +++ b/src/mame/drivers/nanos.cpp @@ -61,6 +61,7 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void nanos(machine_config &config); private: uint8_t m_key_command; uint8_t m_last_code; @@ -454,7 +455,7 @@ static GFXDECODE_START( nanos ) GFXDECODE_ENTRY( "chargen", 0x0000, nanos_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( nanos ) +MACHINE_CONFIG_START(nanos_state::nanos) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(nanos_mem) diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp index 1a600c7492e..0393cc038cc 100644 --- a/src/mame/drivers/naomi.cpp +++ b/src/mame/drivers/naomi.cpp @@ -2685,7 +2685,7 @@ MACHINE_RESET_MEMBER(naomi_state,naomi) */ // TODO: merge with Dreamcast base machine - MACHINE_CONFIG_START( naomi_aw_base ) +MACHINE_CONFIG_START(dc_state::naomi_aw_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH4LE, CPU_CLOCK) // SH4!!! MCFG_SH4_MD0(1) @@ -2728,7 +2728,7 @@ MACHINE_RESET_MEMBER(naomi_state,naomi) MCFG_AICARTC_ADD("aicartc", XTAL_32_768kHz ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( naomi_base ) +MACHINE_CONFIG_START(naomi_state::naomi_base) MCFG_FRAGMENT_ADD( naomi_aw_base ) MCFG_EEPROM_SERIAL_93C46_ADD("main_eeprom") @@ -2753,7 +2753,7 @@ MACHINE_CONFIG_END * Naomi 1, unprotected ROM sub-board */ -static MACHINE_CONFIG_DERIVED( naomi, naomi_base ) +MACHINE_CONFIG_DERIVED(naomi_state::naomi, naomi_base) MCFG_NAOMI_ROM_BOARD_ADD("rom_board", "naomibd_eeprom", WRITE8(dc_state, g1_irq)) MACHINE_CONFIG_END @@ -2761,7 +2761,7 @@ MACHINE_CONFIG_END * Naomi 1 GD-Rom */ -static MACHINE_CONFIG_DERIVED( naomigd, naomi_base ) +MACHINE_CONFIG_DERIVED(naomi_state::naomigd, naomi_base) MCFG_NAOMI_GDROM_BOARD_ADD("rom_board", ":gdrom", ":pic", "naomibd_eeprom", WRITE8(dc_state, g1_irq)) MACHINE_CONFIG_END @@ -2769,7 +2769,7 @@ MACHINE_CONFIG_END * Naomi 1, M1 sub-board */ -static MACHINE_CONFIG_DERIVED( naomim1, naomi_base ) +MACHINE_CONFIG_DERIVED(naomi_state::naomim1, naomi_base) MCFG_NAOMI_M1_BOARD_ADD("rom_board", "naomibd_eeprom", WRITE8(dc_state, g1_irq)) MACHINE_CONFIG_END @@ -2777,7 +2777,7 @@ MACHINE_CONFIG_END * Naomi 1, M2/3 sub-board */ -static MACHINE_CONFIG_DERIVED( naomim2, naomi_base ) +MACHINE_CONFIG_DERIVED(naomi_state::naomim2, naomi_base) MCFG_NAOMI_M2_BOARD_ADD("rom_board", "naomibd_eeprom", WRITE8(dc_state, g1_irq)) MACHINE_CONFIG_END @@ -2785,7 +2785,7 @@ MACHINE_CONFIG_END * Naomi 1, M4 sub-board */ -static MACHINE_CONFIG_DERIVED( naomim4, naomi_base ) +MACHINE_CONFIG_DERIVED(naomi_state::naomim4, naomi_base) MCFG_NAOMI_M4_BOARD_ADD("rom_board", "pic_readout", "naomibd_eeprom", WRITE8(dc_state, g1_irq)) MACHINE_CONFIG_END @@ -2793,7 +2793,7 @@ MACHINE_CONFIG_END * Naomi 2 */ /* -static MACHINE_CONFIG_DERIVED( naomi2, naomi ) +MACHINE_CONFIG_DERIVED((naomi2_state::naomi2, naomi) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(naomi2_map) MACHINE_CONFIG_END @@ -2802,13 +2802,13 @@ MACHINE_CONFIG_END * Naomi 2 GD-Rom */ -static MACHINE_CONFIG_START( naomi2_base ) +MACHINE_CONFIG_START(naomi2_state::naomi2_base) MCFG_POWERVR2_ADD("powervr2_slave", WRITE8(dc_state, pvr_irq)) // TODO: ELAN device MACHINE_CONFIG_END -static MACHINE_CONFIG_START( naomi2gd ) +MACHINE_CONFIG_START(naomi2_state::naomi2gd) MCFG_FRAGMENT_ADD( naomigd ) MCFG_FRAGMENT_ADD( naomi2_base ) @@ -2820,7 +2820,7 @@ MACHINE_CONFIG_END * Naomi 2, M1 sub-board */ -static MACHINE_CONFIG_START( naomi2m1 ) +MACHINE_CONFIG_START(naomi2_state::naomi2m1) MCFG_FRAGMENT_ADD( naomim1 ) MCFG_FRAGMENT_ADD( naomi2_base ) @@ -2832,7 +2832,7 @@ MACHINE_CONFIG_END * Naomi 2, M2/3 sub-board */ -static MACHINE_CONFIG_START( naomi2m2 ) +MACHINE_CONFIG_START(naomi2_state::naomi2m2) MCFG_FRAGMENT_ADD( naomim2 ) MCFG_FRAGMENT_ADD( naomi2_base ) @@ -2844,7 +2844,7 @@ MACHINE_CONFIG_END * Atomiswave */ -static MACHINE_CONFIG_START( aw_base ) +MACHINE_CONFIG_START(atomiswave_state::aw_base) MCFG_FRAGMENT_ADD( naomi_aw_base ) MCFG_CPU_MODIFY("maincpu") @@ -2859,13 +2859,13 @@ static MACHINE_CONFIG_START( aw_base ) MCFG_MACHINE_RESET_OVERRIDE(dc_state,dc_console) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aw1c, aw_base ) +MACHINE_CONFIG_DERIVED(atomiswave_state::aw1c, aw_base) MCFG_DC_CONTROLLER_ADD("dcctrl0", "maple_dc", 0, ":P1.0", ":P1.1", ":P1.A0", ":P1.A1", ":P1.A2", ":P1.A3", ":P1.A4", ":P1.A5") // TODO: isn't it supposed to be just one controller? MCFG_DC_CONTROLLER_ADD("dcctrl1", "maple_dc", 1, ":P2.0", ":P2.1", ":P2.A0", ":P2.A1", ":P2.A2", ":P2.A3", ":P2.A4", ":P2.A5") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aw2c, aw_base ) +MACHINE_CONFIG_DERIVED(atomiswave_state::aw2c, aw_base) MCFG_DC_CONTROLLER_ADD("dcctrl0", "maple_dc", 0, ":P1.0", ":P1.1", ":P1.A0", ":P1.A1", ":P1.A2", ":P1.A3", ":P1.A4", ":P1.A5") MCFG_DC_CONTROLLER_ADD("dcctrl1", "maple_dc", 1, ":P2.0", ":P2.1", ":P2.A0", ":P2.A1", ":P2.A2", ":P2.A3", ":P2.A4", ":P2.A5") MACHINE_CONFIG_END diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp index ee39fce1512..2699e30dc91 100644 --- a/src/mame/drivers/nascom1.cpp +++ b/src/mame/drivers/nascom1.cpp @@ -85,6 +85,7 @@ public: DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( nascom1_cassette ); DECLARE_SNAPSHOT_LOAD_MEMBER( nascom1 ); + void nascom1(machine_config &config); protected: virtual void machine_reset() override; @@ -100,7 +101,6 @@ public: { } uint32_t screen_update_nascom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - private: }; @@ -125,6 +125,8 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(socket1_load) { return load_cart(image, m_socket1, 1); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(socket2_load) { return load_cart(image, m_socket2, 2); } + void nascom2(machine_config &config); + void nascom2c(machine_config &config); protected: virtual void machine_reset() override; @@ -644,7 +646,7 @@ INPUT_PORTS_END // MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( nascom1 ) +MACHINE_CONFIG_START(nascom_state::nascom1) // main cpu MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 8) MCFG_CPU_PROGRAM_MAP(nascom1_mem) @@ -684,7 +686,7 @@ static MACHINE_CONFIG_START( nascom1 ) MCFG_SNAPSHOT_ADD("snapshot", nascom_state, nascom1, "nas", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nascom2, nascom1 ) +MACHINE_CONFIG_DERIVED(nascom2_state::nascom2, nascom1) MCFG_CPU_REPLACE("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(nascom2_mem) MCFG_CPU_IO_MAP(nascom2_io) @@ -718,7 +720,7 @@ static MACHINE_CONFIG_DERIVED( nascom2, nascom1 ) MCFG_SOFTWARE_LIST_ADD("floppy_list", "nascom_flop") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nascom2c, nascom2 ) +MACHINE_CONFIG_DERIVED(nascom2_state::nascom2c, nascom2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(nascom2c_mem) diff --git a/src/mame/drivers/naughtyb.cpp b/src/mame/drivers/naughtyb.cpp index 72d9277a707..f7a6562eaa9 100644 --- a/src/mame/drivers/naughtyb.cpp +++ b/src/mame/drivers/naughtyb.cpp @@ -406,7 +406,7 @@ static GFXDECODE_START( naughtyb ) GFXDECODE_END -static MACHINE_CONFIG_START( naughtyb ) +MACHINE_CONFIG_START(naughtyb_state::naughtyb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */ @@ -443,7 +443,7 @@ MACHINE_CONFIG_END /* Exactly the same but for certain address writes */ -static MACHINE_CONFIG_START( popflame ) +MACHINE_CONFIG_START(naughtyb_state::popflame) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */ diff --git a/src/mame/drivers/nbmj8688.cpp b/src/mame/drivers/nbmj8688.cpp index 16cd0b48db3..43f844555e1 100644 --- a/src/mame/drivers/nbmj8688.cpp +++ b/src/mame/drivers/nbmj8688.cpp @@ -2442,7 +2442,7 @@ READ8_MEMBER(nbmj8688_state::dipsw2_r) return m_nb1413m3->dipsw2_r(space,offset); } -static MACHINE_CONFIG_START( NBMJDRV_4096 ) +MACHINE_CONFIG_START(nbmj8688_state::NBMJDRV_4096) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz */ @@ -2478,7 +2478,7 @@ static MACHINE_CONFIG_START( NBMJDRV_4096 ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( NBMJDRV_256, NBMJDRV_4096 ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::NBMJDRV_256, NBMJDRV_4096) /* basic machine hardware */ @@ -2490,7 +2490,7 @@ static MACHINE_CONFIG_DERIVED( NBMJDRV_256, NBMJDRV_4096 ) MCFG_VIDEO_START_OVERRIDE(nbmj8688_state,mbmj8688_8bit) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( NBMJDRV_65536, NBMJDRV_4096 ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::NBMJDRV_65536, NBMJDRV_4096) /* basic machine hardware */ @@ -2505,7 +2505,7 @@ MACHINE_CONFIG_END // -------------------------------------------------------------------------------- -static MACHINE_CONFIG_DERIVED( crystalg, NBMJDRV_256 ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::crystalg, NBMJDRV_256) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2516,19 +2516,19 @@ static MACHINE_CONFIG_DERIVED( crystalg, NBMJDRV_256 ) MCFG_NB1413M3_TYPE( NB1413M3_CRYSTALG ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( crystal2, crystalg ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::crystal2, crystalg) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_CRYSTAL2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nightlov, crystalg ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::nightlov, crystalg) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_NIGHTLOV ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apparel, NBMJDRV_256 ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::apparel, NBMJDRV_256) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2539,7 +2539,7 @@ static MACHINE_CONFIG_DERIVED( apparel, NBMJDRV_256 ) MCFG_NB1413M3_TYPE( NB1413M3_APPAREL ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mbmj_h12bit, NBMJDRV_4096 ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::mbmj_h12bit, NBMJDRV_4096) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2550,26 +2550,26 @@ static MACHINE_CONFIG_DERIVED( mbmj_h12bit, NBMJDRV_4096 ) MCFG_VIDEO_START_OVERRIDE(nbmj8688_state,mbmj8688_hybrid_12bit) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( citylove, mbmj_h12bit ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::citylove, mbmj_h12bit) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_CITYLOVE ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mcitylov, mbmj_h12bit ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::mcitylov, mbmj_h12bit) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_MCITYLOV ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( secolove, mbmj_h12bit ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::secolove, mbmj_h12bit) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_SECOLOVE ) MACHINE_CONFIG_END /*Same as h12bit HW with different sound HW + NMI enable bit*/ -static MACHINE_CONFIG_DERIVED( barline, mbmj_h12bit ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::barline, mbmj_h12bit) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2585,7 +2585,7 @@ static MACHINE_CONFIG_DERIVED( barline, mbmj_h12bit ) MCFG_DEVICE_REMOVE("vref") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mbmj_p16bit, NBMJDRV_65536 ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::mbmj_p16bit, NBMJDRV_65536) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2596,7 +2596,7 @@ static MACHINE_CONFIG_DERIVED( mbmj_p16bit, NBMJDRV_65536 ) MCFG_VIDEO_START_OVERRIDE(nbmj8688_state,mbmj8688_pure_16bit) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mbmj_p16bit_LCD ) +MACHINE_CONFIG_START(nbmj8688_state::mbmj_p16bit_LCD) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz */ @@ -2659,55 +2659,55 @@ static MACHINE_CONFIG_START( mbmj_p16bit_LCD ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bijokkoy, mbmj_p16bit_LCD ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::bijokkoy, mbmj_p16bit_LCD) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_BIJOKKOY ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bijokkog, mbmj_p16bit_LCD ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::bijokkog, mbmj_p16bit_LCD) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_BIJOKKOG ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( housemnq, mbmj_p16bit_LCD ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::housemnq, mbmj_p16bit_LCD) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_HOUSEMNQ ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( housemn2, mbmj_p16bit_LCD ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::housemn2, mbmj_p16bit_LCD) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_HOUSEMN2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( livegal, mbmj_p16bit_LCD ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::livegal, mbmj_p16bit_LCD) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_LIVEGAL ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( orangec, mbmj_p16bit ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::orangec, mbmj_p16bit) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_ORANGEC ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( orangeci, mbmj_p16bit ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::orangeci, mbmj_p16bit) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_ORANGECI ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vipclub, mbmj_p16bit ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::vipclub, mbmj_p16bit) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_VIPCLUB ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( seiha, NBMJDRV_65536 ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::seiha, NBMJDRV_65536) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2718,13 +2718,13 @@ static MACHINE_CONFIG_DERIVED( seiha, NBMJDRV_65536 ) MCFG_NB1413M3_TYPE( NB1413M3_SEIHA ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( seiham, seiha ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::seiham, seiha) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_SEIHAM ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjgaiden, NBMJDRV_4096 ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::mjgaiden, NBMJDRV_4096) /* basic machine hardware */ @@ -2736,7 +2736,7 @@ static MACHINE_CONFIG_DERIVED( mjgaiden, NBMJDRV_4096 ) MCFG_NB1413M3_TYPE( NB1413M3_OJOUSAN ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( iemoto, NBMJDRV_65536 ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::iemoto, NBMJDRV_65536) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2747,7 +2747,7 @@ static MACHINE_CONFIG_DERIVED( iemoto, NBMJDRV_65536 ) MCFG_NB1413M3_TYPE( NB1413M3_IEMOTO ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ojousan, NBMJDRV_65536 ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::ojousan, NBMJDRV_65536) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2758,44 +2758,44 @@ static MACHINE_CONFIG_DERIVED( ojousan, NBMJDRV_65536 ) MCFG_NB1413M3_TYPE( NB1413M3_OJOUSAN ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ojousanm, ojousan ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::ojousanm, ojousan) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_OJOUSANM ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( swinggal, ojousan ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::swinggal, ojousan) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(secolove_map) MCFG_CPU_IO_MAP(iemoto_io_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( iemotom, ojousan ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::iemotom, ojousan) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_IEMOTOM ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ryuuha, ojousan ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::ryuuha, ojousan) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_RYUUHA ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( korinai, ojousan ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::korinai, ojousan) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_KORINAI ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( korinaim, ojousan ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::korinaim, ojousan) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_KORINAIM ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mbmj_p12bit, NBMJDRV_4096 ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::mbmj_p12bit, NBMJDRV_4096) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2803,37 +2803,37 @@ static MACHINE_CONFIG_DERIVED( mbmj_p12bit, NBMJDRV_4096 ) MCFG_CPU_IO_MAP(kaguya_io_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kaguya, mbmj_p12bit ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::kaguya, mbmj_p12bit) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_KAGUYA ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kaguya2, mbmj_p12bit ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::kaguya2, mbmj_p12bit) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_KAGUYA2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kanatuen, mbmj_p12bit ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::kanatuen, mbmj_p12bit) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_KANATUEN ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kyuhito, mbmj_p12bit ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::kyuhito, mbmj_p12bit) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_KYUHITO ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( idhimitu, mbmj_p12bit ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::idhimitu, mbmj_p12bit) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_IDHIMITU ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjsikaku, NBMJDRV_4096 ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::mjsikaku, NBMJDRV_4096) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2848,7 +2848,7 @@ static MACHINE_CONFIG_DERIVED( mjsikaku, NBMJDRV_4096 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mmsikaku, NBMJDRV_4096 ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::mmsikaku, NBMJDRV_4096) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2859,7 +2859,7 @@ static MACHINE_CONFIG_DERIVED( mmsikaku, NBMJDRV_4096 ) MCFG_NB1413M3_TYPE( NB1413M3_MMSIKAKU ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( otonano, mjsikaku ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::otonano, mjsikaku) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2869,7 +2869,7 @@ static MACHINE_CONFIG_DERIVED( otonano, mjsikaku ) MCFG_NB1413M3_TYPE( NB1413M3_OTONANO ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjcamera, otonano ) +MACHINE_CONFIG_DERIVED(nbmj8688_state::mjcamera, otonano) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_MJCAMERA ) diff --git a/src/mame/drivers/nbmj8891.cpp b/src/mame/drivers/nbmj8891.cpp index 6b7ddd3bdec..ba1af9917e8 100644 --- a/src/mame/drivers/nbmj8891.cpp +++ b/src/mame/drivers/nbmj8891.cpp @@ -2176,7 +2176,7 @@ static INPUT_PORTS_START( taiwanmb ) INPUT_PORTS_END -static MACHINE_CONFIG_START( gionbana ) +MACHINE_CONFIG_START(nbmj8891_state::gionbana) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */ @@ -2210,7 +2210,7 @@ static MACHINE_CONFIG_START( gionbana ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mgion, gionbana ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::mgion, gionbana) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2223,7 +2223,7 @@ static MACHINE_CONFIG_DERIVED( mgion, gionbana ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( omotesnd, gionbana ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::omotesnd, gionbana) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2242,14 +2242,14 @@ static MACHINE_CONFIG_DERIVED( omotesnd, gionbana ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( abunai, gionbana ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::abunai, gionbana) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_ABUNAI ) MACHINE_CONFIG_END /* NBMJDRV2 */ -static MACHINE_CONFIG_DERIVED( mjcamerb, gionbana ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::mjcamerb, gionbana) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2266,7 +2266,7 @@ static MACHINE_CONFIG_DERIVED( mjcamerb, gionbana ) MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mmcamera, gionbana ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::mmcamera, gionbana) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2283,7 +2283,7 @@ static MACHINE_CONFIG_DERIVED( mmcamera, gionbana ) MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hanamomo, gionbana ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::hanamomo, gionbana) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2299,7 +2299,7 @@ static MACHINE_CONFIG_DERIVED( hanamomo, gionbana ) MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( msjiken, hanamomo ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::msjiken, hanamomo) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2311,7 +2311,7 @@ static MACHINE_CONFIG_DERIVED( msjiken, hanamomo ) MACHINE_CONFIG_END /* NBMJDRV3 */ -static MACHINE_CONFIG_DERIVED( telmahjn, gionbana ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::telmahjn, gionbana) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_TELMAHJN ) @@ -2320,7 +2320,7 @@ static MACHINE_CONFIG_DERIVED( telmahjn, gionbana ) MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mgmen89, telmahjn ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::mgmen89, telmahjn) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_MGMEN89 ) @@ -2328,7 +2328,7 @@ static MACHINE_CONFIG_DERIVED( mgmen89, telmahjn ) MACHINE_CONFIG_END /* NBMJDRV4 */ -static MACHINE_CONFIG_DERIVED( mjfocus, gionbana ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::mjfocus, gionbana) /* basic machine hardware */ @@ -2339,20 +2339,20 @@ static MACHINE_CONFIG_DERIVED( mjfocus, gionbana ) MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pairsnb, gionbana ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::pairsnb, gionbana) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_PAIRSNB ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pairsten, gionbana ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::pairsten, gionbana) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_PAIRSTEN ) MACHINE_CONFIG_END /* NBMJDRV5 */ -static MACHINE_CONFIG_DERIVED( mjnanpas, gionbana ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::mjnanpas, gionbana) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2362,7 +2362,7 @@ static MACHINE_CONFIG_DERIVED( mjnanpas, gionbana ) MCFG_NB1413M3_TYPE( NB1413M3_MJNANPAS ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maiko, mjnanpas ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::maiko, mjnanpas) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2373,7 +2373,7 @@ static MACHINE_CONFIG_DERIVED( maiko, mjnanpas ) MCFG_NB1413M3_TYPE( NB1413M3_MAIKO ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mmaiko, maiko ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::mmaiko, maiko) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2385,7 +2385,7 @@ static MACHINE_CONFIG_DERIVED( mmaiko, maiko ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lovehous, mjnanpas ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::lovehous, mjnanpas) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2398,7 +2398,7 @@ static MACHINE_CONFIG_DERIVED( lovehous, mjnanpas ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hanaoji, maiko ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::hanaoji, maiko) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2410,7 +2410,7 @@ static MACHINE_CONFIG_DERIVED( hanaoji, maiko ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hnxmasev, maiko ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::hnxmasev, maiko) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2418,7 +2418,7 @@ static MACHINE_CONFIG_DERIVED( hnxmasev, maiko ) MCFG_CPU_IO_MAP(maiko_io_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hnageman, maiko ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::hnageman, maiko) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2426,7 +2426,7 @@ static MACHINE_CONFIG_DERIVED( hnageman, maiko ) MCFG_CPU_IO_MAP(maiko_io_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( scandal, hanamomo ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::scandal, hanamomo) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2437,7 +2437,7 @@ static MACHINE_CONFIG_DERIVED( scandal, hanamomo ) MCFG_NB1413M3_TYPE( NB1413M3_SCANDAL ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bananadr, mjnanpas ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::bananadr, mjnanpas) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2450,26 +2450,26 @@ static MACHINE_CONFIG_DERIVED( bananadr, mjnanpas ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( club90s, mjnanpas ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::club90s, mjnanpas) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_CLUB90S ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mladyhtr, mjnanpas ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::mladyhtr, mjnanpas) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_MLADYHTR ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( chinmoku, mjnanpas ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::chinmoku, mjnanpas) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_CHINMOKU ) MACHINE_CONFIG_END /* NBMJDRV6 */ -static MACHINE_CONFIG_DERIVED( mjfocusm, gionbana ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::mjfocusm, gionbana) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2493,13 +2493,13 @@ static MACHINE_CONFIG_DERIVED( mjfocusm, gionbana ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( scandalm, mjfocusm ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::scandalm, mjfocusm) MCFG_DEVICE_MODIFY("nb1413m3") MCFG_NB1413M3_TYPE( NB1413M3_SCANDALM ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( taiwanmb, gionbana ) +MACHINE_CONFIG_DERIVED(nbmj8891_state::taiwanmb, gionbana) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/nbmj8900.cpp b/src/mame/drivers/nbmj8900.cpp index 47604a51cb3..7570ff8c7c2 100644 --- a/src/mame/drivers/nbmj8900.cpp +++ b/src/mame/drivers/nbmj8900.cpp @@ -301,7 +301,7 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( ohpaipee ) +MACHINE_CONFIG_START(nbmj8900_state::ohpaipee) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */ @@ -335,7 +335,7 @@ static MACHINE_CONFIG_START( ohpaipee ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( togenkyo, ohpaipee ) +MACHINE_CONFIG_DERIVED(nbmj8900_state::togenkyo, ohpaipee) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/nbmj8991.cpp b/src/mame/drivers/nbmj8991.cpp index 7126341d3bf..c9e1833e018 100644 --- a/src/mame/drivers/nbmj8991.cpp +++ b/src/mame/drivers/nbmj8991.cpp @@ -1314,7 +1314,7 @@ static INPUT_PORTS_START( av2mj2rg ) INPUT_PORTS_END -static MACHINE_CONFIG_START( nbmjdrv1 ) // galkoku +MACHINE_CONFIG_START(nbmj8991_state::nbmjdrv1) // galkoku /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 25000000/5) /* 5.00 MHz ? */ @@ -1346,7 +1346,7 @@ static MACHINE_CONFIG_START( nbmjdrv1 ) // galkoku MACHINE_CONFIG_END -static MACHINE_CONFIG_START( nbmjdrv2 ) // pstadium +MACHINE_CONFIG_START(nbmj8991_state::nbmjdrv2) // pstadium /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 6000000/2) /* 3.00 MHz */ @@ -1388,7 +1388,7 @@ static MACHINE_CONFIG_START( nbmjdrv2 ) // pstadium MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nbmjdrv3, nbmjdrv1 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::nbmjdrv3, nbmjdrv1) /* basic machine hardware */ @@ -1402,7 +1402,7 @@ MACHINE_CONFIG_END // --------------------------------------------------------------------- -static MACHINE_CONFIG_DERIVED( galkoku, nbmjdrv1 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::galkoku, nbmjdrv1) /* basic machine hardware */ MCFG_DEVICE_MODIFY("nb1413m3") @@ -1410,7 +1410,7 @@ static MACHINE_CONFIG_DERIVED( galkoku, nbmjdrv1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( galkaika, nbmjdrv1 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::galkaika, nbmjdrv1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1421,7 +1421,7 @@ static MACHINE_CONFIG_DERIVED( galkaika, nbmjdrv1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tokyogal, nbmjdrv1 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::tokyogal, nbmjdrv1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1432,7 +1432,7 @@ static MACHINE_CONFIG_DERIVED( tokyogal, nbmjdrv1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tokimbsj, nbmjdrv1 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::tokimbsj, nbmjdrv1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1445,7 +1445,7 @@ static MACHINE_CONFIG_DERIVED( tokimbsj, nbmjdrv1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mcontest, nbmjdrv1 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::mcontest, nbmjdrv1) /* basic machine hardware */ MCFG_DEVICE_MODIFY("nb1413m3") @@ -1453,7 +1453,7 @@ static MACHINE_CONFIG_DERIVED( mcontest, nbmjdrv1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( uchuuai, nbmjdrv1 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::uchuuai, nbmjdrv1) /* basic machine hardware */ MCFG_DEVICE_MODIFY("nb1413m3") @@ -1461,7 +1461,7 @@ static MACHINE_CONFIG_DERIVED( uchuuai, nbmjdrv1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hyouban, nbmjdrv3 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::hyouban, nbmjdrv3) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1474,7 +1474,7 @@ static MACHINE_CONFIG_DERIVED( hyouban, nbmjdrv3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pstadium, nbmjdrv2 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::pstadium, nbmjdrv2) /* basic machine hardware */ MCFG_DEVICE_MODIFY("nb1413m3") @@ -1482,7 +1482,7 @@ static MACHINE_CONFIG_DERIVED( pstadium, nbmjdrv2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( triplew1, nbmjdrv2 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::triplew1, nbmjdrv2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1493,7 +1493,7 @@ static MACHINE_CONFIG_DERIVED( triplew1, nbmjdrv2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( triplew2, nbmjdrv2 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::triplew2, nbmjdrv2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1504,7 +1504,7 @@ static MACHINE_CONFIG_DERIVED( triplew2, nbmjdrv2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ntopstar, nbmjdrv2 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::ntopstar, nbmjdrv2) /* basic machine hardware */ MCFG_DEVICE_MODIFY("nb1413m3") @@ -1512,7 +1512,7 @@ static MACHINE_CONFIG_DERIVED( ntopstar, nbmjdrv2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjlstory, nbmjdrv2 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::mjlstory, nbmjdrv2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1523,7 +1523,7 @@ static MACHINE_CONFIG_DERIVED( mjlstory, nbmjdrv2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vanilla, nbmjdrv2 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::vanilla, nbmjdrv2) /* basic machine hardware */ MCFG_DEVICE_MODIFY("nb1413m3") @@ -1531,7 +1531,7 @@ static MACHINE_CONFIG_DERIVED( vanilla, nbmjdrv2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( finalbny, nbmjdrv2 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::finalbny, nbmjdrv2) /* basic machine hardware */ MCFG_DEVICE_MODIFY("nb1413m3") @@ -1541,7 +1541,7 @@ static MACHINE_CONFIG_DERIVED( finalbny, nbmjdrv2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( qmhayaku, nbmjdrv2 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::qmhayaku, nbmjdrv2) /* basic machine hardware */ MCFG_DEVICE_MODIFY("nb1413m3") @@ -1549,7 +1549,7 @@ static MACHINE_CONFIG_DERIVED( qmhayaku, nbmjdrv2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjgottub, nbmjdrv2 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::mjgottub, nbmjdrv2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1562,7 +1562,7 @@ static MACHINE_CONFIG_DERIVED( mjgottub, nbmjdrv2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( av2mj1bb, nbmjdrv2 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::av2mj1bb, nbmjdrv2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1574,7 +1574,7 @@ static MACHINE_CONFIG_DERIVED( av2mj1bb, nbmjdrv2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( av2mj2rg, nbmjdrv2 ) +MACHINE_CONFIG_DERIVED(nbmj8991_state::av2mj2rg, nbmjdrv2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/nbmj9195.cpp b/src/mame/drivers/nbmj9195.cpp index d446b6f9194..2741ef336bb 100644 --- a/src/mame/drivers/nbmj9195.cpp +++ b/src/mame/drivers/nbmj9195.cpp @@ -2503,7 +2503,7 @@ static const z80_daisy_config daisy_chain_sound[] = MCFG_TMPZ84C011_PORTD_WRITE_CB(WRITE8(nbmj9195_state, clutsel_w)) \ MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(nbmj9195_state, outcoin_flag_w)) -static MACHINE_CONFIG_START( NBMJDRV1_base ) +MACHINE_CONFIG_START(nbmj9195_state::NBMJDRV1_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMPZ84C011, 12000000/2) /* TMPZ84C011, 6.00 MHz */ @@ -2549,7 +2549,7 @@ static MACHINE_CONFIG_START( NBMJDRV1_base ) MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( NBMJDRV1, NBMJDRV1_base ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::NBMJDRV1, NBMJDRV1_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2557,7 +2557,7 @@ static MACHINE_CONFIG_DERIVED( NBMJDRV1, NBMJDRV1_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( NBMJDRV2, NBMJDRV1_base ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::NBMJDRV2, NBMJDRV1_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2568,7 +2568,7 @@ static MACHINE_CONFIG_DERIVED( NBMJDRV2, NBMJDRV1_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( NBMJDRV3, NBMJDRV1_base ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::NBMJDRV3, NBMJDRV1_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2584,7 +2584,7 @@ MACHINE_CONFIG_END //------------------------------------------------------------------------- -static MACHINE_CONFIG_DERIVED( mjuraden, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::mjuraden, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2593,7 +2593,7 @@ static MACHINE_CONFIG_DERIVED( mjuraden, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( koinomp, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::koinomp, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2602,7 +2602,7 @@ static MACHINE_CONFIG_DERIVED( koinomp, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( patimono, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::patimono, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2610,7 +2610,7 @@ static MACHINE_CONFIG_DERIVED( patimono, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( janbari, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::janbari, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2620,7 +2620,7 @@ static MACHINE_CONFIG_DERIVED( janbari, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mmehyou, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::mmehyou, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2631,7 +2631,7 @@ static MACHINE_CONFIG_DERIVED( mmehyou, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ultramhm, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::ultramhm, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2642,7 +2642,7 @@ static MACHINE_CONFIG_DERIVED( ultramhm, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gal10ren, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::gal10ren, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2650,7 +2650,7 @@ static MACHINE_CONFIG_DERIVED( gal10ren, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( renaiclb, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::renaiclb, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2658,7 +2658,7 @@ static MACHINE_CONFIG_DERIVED( renaiclb, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjlaman, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::mjlaman, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2666,7 +2666,7 @@ static MACHINE_CONFIG_DERIVED( mjlaman, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mkeibaou, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::mkeibaou, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2674,7 +2674,7 @@ static MACHINE_CONFIG_DERIVED( mkeibaou, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pachiten, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::pachiten, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2684,13 +2684,13 @@ static MACHINE_CONFIG_DERIVED( pachiten, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sailorws, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::sailorws, NBMJDRV1) /* basic machine hardware */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sailorwr, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::sailorwr, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2700,7 +2700,7 @@ static MACHINE_CONFIG_DERIVED( sailorwr, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psailor1, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::psailor1, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2708,7 +2708,7 @@ static MACHINE_CONFIG_DERIVED( psailor1, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psailor2, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::psailor2, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2716,7 +2716,7 @@ static MACHINE_CONFIG_DERIVED( psailor2, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( otatidai, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::otatidai, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2724,7 +2724,7 @@ static MACHINE_CONFIG_DERIVED( otatidai, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( yosimoto, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::yosimoto, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2732,7 +2732,7 @@ static MACHINE_CONFIG_DERIVED( yosimoto, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( yosimotm, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::yosimotm, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2742,7 +2742,7 @@ static MACHINE_CONFIG_DERIVED( yosimotm, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jituroku, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::jituroku, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2750,7 +2750,7 @@ static MACHINE_CONFIG_DERIVED( jituroku, NBMJDRV1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ngpgal, NBMJDRV2 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::ngpgal, NBMJDRV2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2759,7 +2759,7 @@ static MACHINE_CONFIG_DERIVED( ngpgal, NBMJDRV2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjgottsu, NBMJDRV2 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::mjgottsu, NBMJDRV2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2768,7 +2768,7 @@ static MACHINE_CONFIG_DERIVED( mjgottsu, NBMJDRV2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bakuhatu, NBMJDRV2 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::bakuhatu, NBMJDRV2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2777,7 +2777,7 @@ static MACHINE_CONFIG_DERIVED( bakuhatu, NBMJDRV2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cmehyou, NBMJDRV2 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::cmehyou, NBMJDRV2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2786,7 +2786,7 @@ static MACHINE_CONFIG_DERIVED( cmehyou, NBMJDRV2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjkoiura, NBMJDRV2 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::mjkoiura, NBMJDRV2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2795,7 +2795,7 @@ static MACHINE_CONFIG_DERIVED( mjkoiura, NBMJDRV2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mkoiuraa, NBMJDRV2 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::mkoiuraa, NBMJDRV2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2804,7 +2804,7 @@ static MACHINE_CONFIG_DERIVED( mkoiuraa, NBMJDRV2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mscoutm, NBMJDRV3 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::mscoutm, NBMJDRV3) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2813,7 +2813,7 @@ static MACHINE_CONFIG_DERIVED( mscoutm, NBMJDRV3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( imekura, NBMJDRV3 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::imekura, NBMJDRV3) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2822,7 +2822,7 @@ static MACHINE_CONFIG_DERIVED( imekura, NBMJDRV3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjegolf, NBMJDRV3 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::mjegolf, NBMJDRV3) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2831,7 +2831,7 @@ static MACHINE_CONFIG_DERIVED( mjegolf, NBMJDRV3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shabdama, NBMJDRV1 ) +MACHINE_CONFIG_DERIVED(nbmj9195_state::shabdama, NBMJDRV1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/nc.cpp b/src/mame/drivers/nc.cpp index 2d68d2414a9..a897e14c92b 100644 --- a/src/mame/drivers/nc.cpp +++ b/src/mame/drivers/nc.cpp @@ -1396,7 +1396,7 @@ INPUT_PORTS_END /**********************************************************************************************************/ -static MACHINE_CONFIG_START( nc100 ) +MACHINE_CONFIG_START(nc_state::nc100) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, /*6000000*/ 4606000) /* Russell Marks says this is more accurate */ MCFG_CPU_PROGRAM_MAP(nc_map) @@ -1467,7 +1467,7 @@ static SLOT_INTERFACE_START( ibmpc_floppies ) SLOT_INTERFACE( "525dd", FLOPPY_525_DD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_DERIVED( nc200, nc100 ) +MACHINE_CONFIG_DERIVED(nc_state::nc200, nc100) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_IO_MAP(nc200_io) diff --git a/src/mame/drivers/nds.cpp b/src/mame/drivers/nds.cpp index 324dcc841ad..54309aba8a7 100644 --- a/src/mame/drivers/nds.cpp +++ b/src/mame/drivers/nds.cpp @@ -966,7 +966,7 @@ TIMER_CALLBACK_MEMBER(nds_state::timer_expire) } } -static MACHINE_CONFIG_START( nds ) +MACHINE_CONFIG_START(nds_state::nds) MCFG_CPU_ADD("arm7", ARM7, MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(nds_arm7_map) diff --git a/src/mame/drivers/nemesis.cpp b/src/mame/drivers/nemesis.cpp index 26d317ffaef..3be80b97d50 100644 --- a/src/mame/drivers/nemesis.cpp +++ b/src/mame/drivers/nemesis.cpp @@ -1446,7 +1446,7 @@ void nemesis_state::machine_reset() m_irq_port_last = 0; } -static MACHINE_CONFIG_START( nemesis ) +MACHINE_CONFIG_START(nemesis_state::nemesis) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */ @@ -1513,7 +1513,7 @@ static MACHINE_CONFIG_START( nemesis ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gx400 ) +MACHINE_CONFIG_START(nemesis_state::gx400) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */ @@ -1586,7 +1586,7 @@ static MACHINE_CONFIG_START( gx400 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( konamigt ) +MACHINE_CONFIG_START(nemesis_state::konamigt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */ @@ -1653,7 +1653,7 @@ static MACHINE_CONFIG_START( konamigt ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rf2_gx400 ) +MACHINE_CONFIG_START(nemesis_state::rf2_gx400) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */ @@ -1726,7 +1726,7 @@ static MACHINE_CONFIG_START( rf2_gx400 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( salamand ) +MACHINE_CONFIG_START(nemesis_state::salamand) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */ @@ -1777,7 +1777,7 @@ static MACHINE_CONFIG_START( salamand ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( blkpnthr ) +MACHINE_CONFIG_START(nemesis_state::blkpnthr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */ @@ -1823,7 +1823,7 @@ static MACHINE_CONFIG_START( blkpnthr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( citybomb ) +MACHINE_CONFIG_START(nemesis_state::citybomb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */ @@ -1873,7 +1873,7 @@ static MACHINE_CONFIG_START( citybomb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( nyanpani ) +MACHINE_CONFIG_START(nemesis_state::nyanpani) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */ @@ -1923,7 +1923,7 @@ static MACHINE_CONFIG_START( nyanpani ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hcrash ) +MACHINE_CONFIG_START(nemesis_state::hcrash) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,18432000/3) /* 6.144MHz */ @@ -2676,7 +2676,7 @@ Manual says SW4, 5, 6, 7 & 8 not used, leave off */ -static MACHINE_CONFIG_START( bubsys ) +MACHINE_CONFIG_START(nemesis_state::bubsys) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */ diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp index fd00212fe24..4bbe6cfeac8 100644 --- a/src/mame/drivers/neogeo.cpp +++ b/src/mame/drivers/neogeo.cpp @@ -1604,7 +1604,7 @@ INPUT_CHANGED_MEMBER(aes_state::aes_jp1) * *************************************/ -MACHINE_CONFIG_START( neogeo_base ) +MACHINE_CONFIG_START(neogeo_state::neogeo_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, NEOGEO_MAIN_CPU_CLOCK) @@ -1652,7 +1652,7 @@ MACHINE_CONFIG_START( neogeo_base ) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( neogeo_arcade, neogeo_base ) +MACHINE_CONFIG_DERIVED(neogeo_state::neogeo_arcade, neogeo_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(main_map_slot) @@ -1711,7 +1711,7 @@ MACHINE_CONFIG_END MCFG_NEOGEO_CARTRIDGE_ADD("cslot1", neogeo_cart, _default) \ MCFG_SET_IMAGE_LOADABLE(false) -static MACHINE_CONFIG_DERIVED( mvs, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::mvs, neogeo_arcade) MCFG_DEVICE_REMOVE("edge") MCFG_NEOGEO_CONTROL_EDGE_CONNECTOR_ADD("edge", neogeo_arc_edge, "joy", false) @@ -1750,7 +1750,7 @@ MACHINE_START_MEMBER(aes_state, aes) } -static MACHINE_CONFIG_DERIVED( aes, neogeo_base ) +MACHINE_CONFIG_DERIVED(aes_state::aes, neogeo_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(aes_main_map) @@ -2030,206 +2030,206 @@ CONS( 1990, aes, 0, 0, aes, aes, aes_state, 0, // machine config for one-game fixed config, loaded without using softlists -static MACHINE_CONFIG_DERIVED( neobase, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::neobase, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("rom") MACHINE_CONFIG_END // used by fatfury2 & ssideki -static MACHINE_CONFIG_DERIVED( fatfur2, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::fatfur2, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("rom_fatfur2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kizuna4p, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kizuna4p, neogeo_arcade) MCFG_DEVICE_REMOVE("edge") MCFG_NEOGEO_CONTROL_EDGE_CONNECTOR_ADD("edge", neogeo_arc_edge_fixed, "kiz4p", true) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("rom") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kof97oro, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kof97oro, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_kof97oro") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kog, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kog, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_kog") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( irrmaze, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::irrmaze, neogeo_arcade) MCFG_DEVICE_REMOVE("edge") MCFG_NEOGEO_CONTROL_EDGE_CONNECTOR_ADD("edge", neogeo_arc_edge_fixed, "irrmaze", true) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("rom") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kof98, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kof98, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("rom_kof98") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mslugx, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::mslugx, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("rom_mslugx") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kof99, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kof99, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("sma_kof99") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kof99k, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kof99k, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("cmc42_kof99k") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( garou, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::garou, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("sma_garou") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( garouh, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::garouh, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("sma_garouh") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( garoubl, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::garoubl, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_garoubl") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mslug3, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::mslug3, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("sma_mslug3") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mslug3h, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::mslug3h, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("cmc42_mslug3h") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mslug3b6, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::mslug3b6, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_mslug3b6") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kof2000, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kof2000, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("sma_kof2k") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kof2000n, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kof2000n, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("cmc50_kof2000n") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zupapa, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::zupapa, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("cmc42_zupapa") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sengoku3, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::sengoku3, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("cmc42_sengoku3") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kof2001, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kof2001, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("cmc50_kof2001") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cthd2k3, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::cthd2k3, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_cthd2k3") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ct2k3sp, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::ct2k3sp, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_ct2k3sp") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ct2k3sa, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::ct2k3sa, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_ct2k3sa") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kof2002, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kof2002, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("k2k2_kof2k2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kof2002b, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kof2002b, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_kf2k2b") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kf2k2pls, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kf2k2pls, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("k2k2_kf2k2p") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kf2k2mp, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kf2k2mp, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_kf2k2mp") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kf2k2mp2, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kf2k2mp2, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_kf2k2mp2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kof10th, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kof10th, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_kf10th") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kf10thep, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kf10thep, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_kf10thep") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kf2k5uni, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kf2k5uni, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_kf2k5uni") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kof2k4se, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kof2k4se, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_kf2k4se") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mslug5, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::mslug5, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("pvc_mslug5") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ms5plus, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::ms5plus, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_ms5plus") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( svc, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::svc, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("pvc_svc") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( svcboot, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::svcboot, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_svcboot") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( svcplus, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::svcplus, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_svcplus") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( svcplusa, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::svcplusa, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_svcplusa") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( svcsplus, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::svcsplus, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_svcsplus") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( samsho5, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::samsho5, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("k2k2_samsh5") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( samsho5b, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::samsho5b, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_samsho5b") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kof2003, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kof2003, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("pvc_kf2k3") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kof2003h, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kof2003h, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("pvc_kf2k3h") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kf2k3bl, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kf2k3bl, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_kf2k3bl") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kf2k3pl, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kf2k3pl, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_kf2k3pl") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kf2k3upl, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::kf2k3upl, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_kf2k3upl") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( samsh5sp, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::samsh5sp, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("k2k2_sams5s") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( neogeo_mj, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::neogeo_mj, neogeo_arcade) //no joystick panel MCFG_DEVICE_REMOVE("edge") MCFG_NEOGEO_CONTROL_EDGE_CONNECTOR_ADD("edge", neogeo_arc_edge_fixed, "", true) @@ -2243,66 +2243,66 @@ static MACHINE_CONFIG_DERIVED( neogeo_mj, neogeo_arcade ) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("rom") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( preisle2, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::preisle2, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("cmc42_preisle2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nitd, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::nitd, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("cmc42_nitd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( s1945p, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::s1945p, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("cmc42_s1945p") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lans2004, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::lans2004, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_lans2004") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pnyaa, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::pnyaa, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("pcm2_pnyaa") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( popbounc, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::popbounc, neogeo_arcade) MCFG_DEVICE_REMOVE("edge") MCFG_NEOGEO_CONTROL_EDGE_CONNECTOR_ADD("edge", neogeo_arc_edge_fixed, "dial", true) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("rom") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ganryu, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::ganryu, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("cmc42_ganryu") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bangbead, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::bangbead, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("cmc42_bangbead") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mslug4, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::mslug4, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("pcm2_mslug4") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ms4plus, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::ms4plus, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("pcm2_ms4p") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rotd, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::rotd, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("pcm2_rotd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( matrim, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::matrim, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("k2k2_matrim") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( matrimbl, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::matrimbl, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_matrimbl") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jockeygp, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::jockeygp, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("cmc50_jockeygp") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vliner, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::vliner, neogeo_arcade) // input handlers are installed at DRIVER_INIT... MCFG_DEVICE_REMOVE("edge") MCFG_DEVICE_REMOVE("ctrl1") @@ -2311,7 +2311,7 @@ static MACHINE_CONFIG_DERIVED( vliner, neogeo_arcade ) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("rom_vliner") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sbp, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neogeo_state::sbp, neogeo_arcade) NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("boot_sbp") MACHINE_CONFIG_END diff --git a/src/mame/drivers/neogeocd.cpp b/src/mame/drivers/neogeocd.cpp index ad036ce7699..36cc594d826 100644 --- a/src/mame/drivers/neogeocd.cpp +++ b/src/mame/drivers/neogeocd.cpp @@ -133,6 +133,7 @@ public: IRQ_CALLBACK_MEMBER(neocd_int_callback); std::unique_ptr m_meminternal_data; + void neocd(machine_config &config); protected: int32_t SekIdle(int32_t nCycles); @@ -1037,7 +1038,7 @@ uint32_t ngcd_state::screen_update_neocd(screen_device &screen, bitmap_rgb32 &bi } -static MACHINE_CONFIG_DERIVED( neocd, neogeo_base ) +MACHINE_CONFIG_DERIVED(ngcd_state::neocd, neogeo_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(neocd_main_map) diff --git a/src/mame/drivers/neopcb.cpp b/src/mame/drivers/neopcb.cpp index ca7c8a084b2..c2717e76a84 100644 --- a/src/mame/drivers/neopcb.cpp +++ b/src/mame/drivers/neopcb.cpp @@ -29,7 +29,7 @@ void neopcb_state::neopcb_postload() set_outputs(); } -static MACHINE_CONFIG_DERIVED( neopcb, neogeo_arcade ) +MACHINE_CONFIG_DERIVED(neopcb_state::neopcb, neogeo_arcade) MCFG_CMC_PROT_ADD("cmc50") MCFG_PCM2_PROT_ADD("pcm2") MCFG_PVC_PROT_ADD("pvc") diff --git a/src/mame/drivers/neoprint.cpp b/src/mame/drivers/neoprint.cpp index 73993577fcb..f82a1352b8f 100644 --- a/src/mame/drivers/neoprint.cpp +++ b/src/mame/drivers/neoprint.cpp @@ -69,6 +69,8 @@ public: uint32_t screen_update_neoprint(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_nprsp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void neoprint(machine_config &config); + void nprsp(machine_config &config); protected: virtual void machine_start() override; virtual void video_start() override; @@ -484,7 +486,7 @@ void neoprint_state::machine_start() m_upd4990a->c2_w(1); } -static MACHINE_CONFIG_START( neoprint ) +MACHINE_CONFIG_START(neoprint_state::neoprint) MCFG_CPU_ADD("maincpu", M68000, 12000000) MCFG_CPU_PROGRAM_MAP(neoprint_map) MCFG_CPU_PERIODIC_INT_DRIVER(neoprint_state, irq3_line_hold, 45) /* camera / printer irq, unknown timing */ @@ -527,7 +529,7 @@ MACHINE_RESET_MEMBER(neoprint_state,nprsp) m_bank_val = 0; } -static MACHINE_CONFIG_START( nprsp ) +MACHINE_CONFIG_START(neoprint_state::nprsp) MCFG_CPU_ADD("maincpu", M68000, 12000000) MCFG_CPU_PROGRAM_MAP(nprsp_map) MCFG_CPU_PERIODIC_INT_DRIVER(neoprint_state, irq3_line_hold, 45) /* camera / printer irq, unknown timing */ diff --git a/src/mame/drivers/neptunp2.cpp b/src/mame/drivers/neptunp2.cpp index 31d1195f6bf..cbe79e63a35 100644 --- a/src/mame/drivers/neptunp2.cpp +++ b/src/mame/drivers/neptunp2.cpp @@ -27,6 +27,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void neptunp2(machine_config &config); protected: // devices @@ -92,7 +93,7 @@ static GFXDECODE_START( neptunp2 ) // GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) GFXDECODE_END -static MACHINE_CONFIG_START( neptunp2 ) +MACHINE_CONFIG_START(neptunp2_state::neptunp2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I80188,20000000) // N80C188-20 AMD diff --git a/src/mame/drivers/nes.cpp b/src/mame/drivers/nes.cpp index a99de368293..d780f9c822c 100644 --- a/src/mame/drivers/nes.cpp +++ b/src/mame/drivers/nes.cpp @@ -54,7 +54,7 @@ void nes_state::ppu_nmi(int *ppu_regs) } -static MACHINE_CONFIG_START( nes ) +MACHINE_CONFIG_START(nes_state::nes) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK) MCFG_CPU_PROGRAM_MAP(nes_map) @@ -96,7 +96,7 @@ static MACHINE_CONFIG_START( nes ) MCFG_SOFTWARE_LIST_ADD("datach_list", "nes_datach") // Bandai Datach Joint ROM System mini-carts MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nespal, nes ) +MACHINE_CONFIG_DERIVED(nes_state::nespal, nes) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(PAL_APU_CLOCK) @@ -115,7 +115,7 @@ static MACHINE_CONFIG_DERIVED( nespal, nes ) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( famicom, nes ) +MACHINE_CONFIG_DERIVED(nes_state::famicom, nes) MCFG_DEVICE_REMOVE("ctrl1") MCFG_DEVICE_REMOVE("ctrl2") MCFG_NES_CONTROL_PORT_ADD("ctrl1", fc_control_port1_devices, "joypad") @@ -127,7 +127,7 @@ static MACHINE_CONFIG_DERIVED( famicom, nes ) MCFG_SOFTWARE_LIST_ADD("cass_list", "famicom_cass") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nespalc, nespal ) +MACHINE_CONFIG_DERIVED(nes_state::nespalc, nespal) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_CLOCK(PALC_APU_CLOCK) MCFG_CPU_PROGRAM_MAP(nes_map) @@ -144,7 +144,7 @@ static MACHINE_CONFIG_DERIVED( nespalc, nespal ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((113.66/(PALC_APU_CLOCK/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_PAL-ppu2c0x_device::VBLANK_FIRST_SCANLINE_PALC+1+2))) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( famipalc, nespalc ) +MACHINE_CONFIG_DERIVED(nes_state::famipalc, nespalc) MCFG_DEVICE_REMOVE("ctrl1") MCFG_DEVICE_REMOVE("ctrl2") MCFG_NES_CONTROL_PORT_ADD("ctrl1", fc_control_port1_devices, "joypad") @@ -155,7 +155,7 @@ static MACHINE_CONFIG_DERIVED( famipalc, nespalc ) MCFG_SOFTWARE_LIST_ADD("cass_list", "famicom_cass") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( suborkbd, famipalc ) +MACHINE_CONFIG_DERIVED(nes_state::suborkbd, famipalc) /* TODO: emulate the parallel port bus! */ MCFG_DEVICE_MODIFY("exp") MCFG_SLOT_DEFAULT_OPTION("subor_keyboard") @@ -211,7 +211,7 @@ MACHINE_RESET_MEMBER( nes_state, fds ) m_maincpu->reset(); } -static MACHINE_CONFIG_DERIVED( fds, famicom ) +MACHINE_CONFIG_DERIVED(nes_state::fds, famicom) MCFG_MACHINE_START_OVERRIDE( nes_state, fds ) MCFG_MACHINE_RESET_OVERRIDE( nes_state, fds ) @@ -255,7 +255,7 @@ MACHINE_RESET_MEMBER( nes_state, famitwin ) m_maincpu->reset(); } -static MACHINE_CONFIG_DERIVED( famitwin, famicom ) +MACHINE_CONFIG_DERIVED(nes_state::famitwin, famicom) MCFG_MACHINE_START_OVERRIDE( nes_state, famitwin ) MCFG_MACHINE_RESET_OVERRIDE( nes_state, famitwin ) diff --git a/src/mame/drivers/nes_vt.cpp b/src/mame/drivers/nes_vt.cpp index 53adb56bfec..9f208ad3806 100644 --- a/src/mame/drivers/nes_vt.cpp +++ b/src/mame/drivers/nes_vt.cpp @@ -111,6 +111,9 @@ public: DECLARE_READ8_MEMBER(spr_r); DECLARE_READ8_MEMBER(chr_r); + void nes_vt(machine_config &config); + void nes_vt_xx(machine_config &config); + void nes_vt_hh(machine_config &config); private: /* expansion nametable - todo, see if we can refactor NES code to be reusable without having to add full NES bus etc. */ @@ -880,7 +883,7 @@ static GFXDECODE_START( vt03_helper ) GFXDECODE_END -static MACHINE_CONFIG_START( nes_vt ) +MACHINE_CONFIG_START(nes_vt_state::nes_vt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, NTSC_APU_CLOCK) // selectable speed? MCFG_CPU_PROGRAM_MAP(nes_vt_map) @@ -930,13 +933,13 @@ static MACHINE_CONFIG_START( nes_vt ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nes_vt_xx, nes_vt ) +MACHINE_CONFIG_DERIVED(nes_vt_state::nes_vt_xx, nes_vt) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(nes_vt_xx_map) MACHINE_CONFIG_END // New mystery handheld architecture, VTxx derived -static MACHINE_CONFIG_DERIVED( nes_vt_hh, nes_vt_xx ) +MACHINE_CONFIG_DERIVED(nes_vt_state::nes_vt_hh, nes_vt_xx) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(nes_vt_hh_map) MCFG_PPU_VT03_MODIFY("ppu") diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp index b70ad8c064b..1d98f76f49c 100644 --- a/src/mame/drivers/newbrain.cpp +++ b/src/mame/drivers/newbrain.cpp @@ -805,7 +805,7 @@ void newbrain_state::device_timer(emu_timer &timer, device_timer_id id, int para // MACHINE_CONFIG( newbrain ) //------------------------------------------------- -static MACHINE_CONFIG_START( newbrain ) +MACHINE_CONFIG_START(newbrain_state::newbrain) // basic system hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) MCFG_CPU_PROGRAM_MAP(newbrain_mreq) @@ -846,7 +846,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( newbrain_ad ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( newbrain_ad, newbrain ) +MACHINE_CONFIG_DERIVED(newbrain_state::newbrain_ad, newbrain) MCFG_DEFAULT_LAYOUT(layout_newbrain) MACHINE_CONFIG_END @@ -855,7 +855,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( newbrain_a ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( newbrain_a, newbrain ) +MACHINE_CONFIG_DERIVED(newbrain_state::newbrain_a, newbrain) MCFG_DEFAULT_LAYOUT(layout_newbraina) MACHINE_CONFIG_END @@ -864,7 +864,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( newbrain_md ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( newbrain_md, newbrain ) +MACHINE_CONFIG_DERIVED(newbrain_state::newbrain_md, newbrain) MCFG_DEFAULT_LAYOUT(layout_newbrain) MACHINE_CONFIG_END diff --git a/src/mame/drivers/news.cpp b/src/mame/drivers/news.cpp index 464393eeec6..755c8fd1d26 100644 --- a/src/mame/drivers/news.cpp +++ b/src/mame/drivers/news.cpp @@ -128,7 +128,7 @@ void news_state::machine_reset() m_bgpic = 0; } -static MACHINE_CONFIG_START( news ) +MACHINE_CONFIG_START(news_state::news) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */ diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp index f9c0e7c5b89..ed98789378e 100644 --- a/src/mame/drivers/next.cpp +++ b/src/mame/drivers/next.cpp @@ -990,13 +990,16 @@ static SLOT_INTERFACE_START( next_scsi_devices ) SLOT_INTERFACE_INTERNAL("ncr5390", NCR5390) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( ncr5390 ) +void next_state::ncr5390(device_t *device) +{ + devcb_base *devcb; + (void)devcb; MCFG_DEVICE_CLOCK(10000000) MCFG_NCR5390_IRQ_HANDLER(DEVWRITELINE(":", next_state, scsi_irq)) MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":", next_state, scsi_drq)) -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_START( next_base ) +MACHINE_CONFIG_START(next_state::next_base) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1037,12 +1040,12 @@ static MACHINE_CONFIG_START( next_base ) MCFG_NEXTMO_DRQ_CALLBACK(WRITELINE(next_state, mo_drq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( next, next_base ) +MACHINE_CONFIG_DERIVED(next_state::next, next_base) MCFG_CPU_ADD("maincpu", M68030, XTAL_25MHz) MCFG_CPU_PROGRAM_MAP(next_0b_m_nofdc_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( next_fdc_base, next_base ) +MACHINE_CONFIG_DERIVED(next_state::next_fdc_base, next_base) MCFG_N82077AA_ADD("fdc", n82077aa_device::MODE_PS2) MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(next_state, fdc_irq)) MCFG_UPD765_DRQ_CALLBACK(WRITELINE(next_state, fdc_drq)) @@ -1052,39 +1055,39 @@ static MACHINE_CONFIG_DERIVED( next_fdc_base, next_base ) MCFG_SOFTWARE_LIST_ADD("flop_list", "next") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nexts, next_fdc_base ) +MACHINE_CONFIG_DERIVED(next_state::nexts, next_fdc_base) MCFG_CPU_ADD("maincpu", M68040, XTAL_25MHz) MCFG_CPU_PROGRAM_MAP(next_0b_m_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nexts2, next_fdc_base ) +MACHINE_CONFIG_DERIVED(next_state::nexts2, next_fdc_base) MCFG_CPU_ADD("maincpu", M68040, XTAL_25MHz) MCFG_CPU_PROGRAM_MAP(next_0b_m_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nextsc, next_fdc_base ) +MACHINE_CONFIG_DERIVED(next_state::nextsc, next_fdc_base) MCFG_CPU_ADD("maincpu", M68040, XTAL_25MHz) MCFG_CPU_PROGRAM_MAP(next_2c_c_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nextst, next_fdc_base ) +MACHINE_CONFIG_DERIVED(next_state::nextst, next_fdc_base) MCFG_CPU_ADD("maincpu", M68040, XTAL_33MHz) MCFG_CPU_PROGRAM_MAP(next_0b_m_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nextstc, next_fdc_base ) +MACHINE_CONFIG_DERIVED(next_state::nextstc, next_fdc_base) MCFG_CPU_ADD("maincpu", M68040, XTAL_33MHz) MCFG_CPU_PROGRAM_MAP(next_0c_c_mem) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 832-1, 0, 624-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nextct, next_fdc_base ) +MACHINE_CONFIG_DERIVED(next_state::nextct, next_fdc_base) MCFG_CPU_ADD("maincpu", M68040, XTAL_33MHz) MCFG_CPU_PROGRAM_MAP(next_0c_m_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nextctc, next_fdc_base ) +MACHINE_CONFIG_DERIVED(next_state::nextctc, next_fdc_base) MCFG_CPU_ADD("maincpu", M68040, XTAL_33MHz) MCFG_CPU_PROGRAM_MAP(next_0c_c_mem) MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/nexus3d.cpp b/src/mame/drivers/nexus3d.cpp index ae8afc957f9..4134ad4e965 100644 --- a/src/mame/drivers/nexus3d.cpp +++ b/src/mame/drivers/nexus3d.cpp @@ -47,6 +47,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_nexus3d(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void nexus3d(machine_config &config); }; @@ -115,7 +116,7 @@ void nexus3d_state::machine_reset() { } -static MACHINE_CONFIG_START( nexus3d ) +MACHINE_CONFIG_START(nexus3d_state::nexus3d) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM920T, 200000000) diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp index 30b769a08a6..b7cfa10f961 100644 --- a/src/mame/drivers/ngen.cpp +++ b/src/mame/drivers/ngen.cpp @@ -145,6 +145,7 @@ public: DECLARE_WRITE16_MEMBER(b38_keyboard_w); DECLARE_READ16_MEMBER(b38_crtc_r); DECLARE_WRITE16_MEMBER(b38_crtc_w); + void ngen(machine_config &config); protected: virtual void machine_reset() override; virtual void machine_start() override; @@ -191,6 +192,8 @@ public: ngen386_state(const machine_config &mconfig, device_type type, const char *tag) : ngen_state(mconfig, type, tag) {} + void ngen386(machine_config &config); + void _386i(machine_config &config); private: }; @@ -911,7 +914,7 @@ static SLOT_INTERFACE_START( ngen_floppies ) SLOT_INTERFACE( "525qd", FLOPPY_525_QD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( ngen ) +MACHINE_CONFIG_START(ngen_state::ngen) // basic machine hardware MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz / 2) MCFG_CPU_PROGRAM_MAP(ngen_mem) @@ -1025,7 +1028,7 @@ static MACHINE_CONFIG_START( ngen ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ngen386 ) +MACHINE_CONFIG_START(ngen386_state::ngen386) MCFG_CPU_ADD("i386cpu", I386, XTAL_50MHz / 2) MCFG_CPU_PROGRAM_MAP(ngen386_mem) MCFG_CPU_IO_MAP(ngen386_io) @@ -1135,7 +1138,7 @@ static MACHINE_CONFIG_START( ngen386 ) MCFG_HARDDISK_ADD("hard0") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( 386i, ngen386 ) +MACHINE_CONFIG_DERIVED(ngen386_state::_386i, ngen386) MCFG_CPU_MODIFY("i386cpu") MCFG_CPU_PROGRAM_MAP(ngen386i_mem) MACHINE_CONFIG_END @@ -1180,4 +1183,4 @@ ROM_END COMP( 1983, ngen, 0, 0, ngen, ngen, ngen_state, 0, "Convergent Technologies", "NGEN CP-001", MACHINE_IS_SKELETON ) COMP( 1991, ngenb38, ngen, 0, ngen386, ngen, ngen386_state, 0, "Financial Products Corp.", "B28/38", MACHINE_IS_SKELETON ) -COMP( 1990, 386i, ngen, 0, 386i, ngen, ngen386_state, 0, "Convergent Technologies", "386i", MACHINE_IS_SKELETON ) +COMP( 1990, 386i, ngen, 0, _386i, ngen, ngen386_state, 0, "Convergent Technologies", "386i", MACHINE_IS_SKELETON ) diff --git a/src/mame/drivers/ngp.cpp b/src/mame/drivers/ngp.cpp index d74884ad2a2..e1036bdd25b 100644 --- a/src/mame/drivers/ngp.cpp +++ b/src/mame/drivers/ngp.cpp @@ -203,6 +203,9 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER( ngp_cart); DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( ngp_cart ); + void ngp_common(machine_config &config); + void ngp(machine_config &config); + void ngpc(machine_config &config); protected: bool m_nvram_loaded; required_ioport m_io_controls; @@ -816,7 +819,7 @@ void ngp_state::nvram_write(emu_file &file) } -static MACHINE_CONFIG_START( ngp_common ) +MACHINE_CONFIG_START(ngp_state::ngp_common) MCFG_CPU_ADD( "maincpu", TMP95C061, XTAL_6_144MHz ) MCFG_TLCS900H_AM8_16(1) @@ -848,7 +851,7 @@ static MACHINE_CONFIG_START( ngp_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ngp, ngp_common ) +MACHINE_CONFIG_DERIVED(ngp_state::ngp, ngp_common) MCFG_K1GE_ADD( "k1ge", XTAL_6_144MHz, "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) ) @@ -866,7 +869,7 @@ static MACHINE_CONFIG_DERIVED( ngp, ngp_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ngpc, ngp_common ) +MACHINE_CONFIG_DERIVED(ngp_state::ngpc, ngp_common) MCFG_K2GE_ADD( "k1ge", XTAL_6_144MHz, "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) ) MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/nibble.cpp b/src/mame/drivers/nibble.cpp index 41e00f71e88..37d0fd958df 100644 --- a/src/mame/drivers/nibble.cpp +++ b/src/mame/drivers/nibble.cpp @@ -79,6 +79,7 @@ public: INTERRUPT_GEN_MEMBER(nibble_interrupt); required_device m_maincpu; required_device m_gfxdecode; + void nibble(machine_config &config); }; @@ -301,7 +302,7 @@ GFXDECODE_END * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( nibble ) +MACHINE_CONFIG_START(nibble_state::nibble) MCFG_TMS99xx_ADD("maincpu", TMS9900, MASTER_CLOCK/4, nibble_map, nibble_cru_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", nibble_state, nibble_interrupt) diff --git a/src/mame/drivers/nightgal.cpp b/src/mame/drivers/nightgal.cpp index 14c63d7cae2..db470669781 100644 --- a/src/mame/drivers/nightgal.cpp +++ b/src/mame/drivers/nightgal.cpp @@ -102,6 +102,11 @@ public: DECLARE_PALETTE_INIT(nightgal); uint32_t screen_update_nightgal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void ngalsumr(machine_config &config); + void sexygal(machine_config &config); + void sweetgal(machine_config &config); + void sgaltrop(machine_config &config); + void royalqn(machine_config &config); protected: required_ioport m_io_cr_clear; required_ioport m_io_coins; @@ -735,7 +740,7 @@ void nightgal_state::machine_reset() memset(m_blit_raw_data, 0, ARRAY_LENGTH(m_blit_raw_data)); } -static MACHINE_CONFIG_START( royalqn ) +MACHINE_CONFIG_START(nightgal_state::royalqn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK / 8) /* ? MHz */ @@ -768,7 +773,7 @@ static MACHINE_CONFIG_START( royalqn ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sexygal, royalqn ) +MACHINE_CONFIG_DERIVED(nightgal_state::sexygal, royalqn) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -791,7 +796,7 @@ static MACHINE_CONFIG_DERIVED( sexygal, royalqn ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sweetgal, sexygal ) +MACHINE_CONFIG_DERIVED(nightgal_state::sweetgal, sexygal) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sweetgal_map) @@ -799,14 +804,14 @@ static MACHINE_CONFIG_DERIVED( sweetgal, sexygal ) MCFG_DEVICE_REMOVE("audiocpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ngalsumr, royalqn ) +MACHINE_CONFIG_DERIVED(nightgal_state::ngalsumr, royalqn) MCFG_CPU_MODIFY("maincpu") // TODO: happens from protection device MCFG_CPU_PERIODIC_INT_DRIVER(nightgal_state, nmi_line_pulse, 60) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sgaltrop, sexygal ) +MACHINE_CONFIG_DERIVED(nightgal_state::sgaltrop, sexygal) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(sgaltrop_io) diff --git a/src/mame/drivers/ninjakd2.cpp b/src/mame/drivers/ninjakd2.cpp index 7c65e1ea141..00ab367fb18 100644 --- a/src/mame/drivers/ninjakd2.cpp +++ b/src/mame/drivers/ninjakd2.cpp @@ -927,7 +927,7 @@ MACHINE_RESET_MEMBER(ninjakd2_state,omegaf) /*****************************************************************************/ -static MACHINE_CONFIG_START( ninjakd2_core ) +MACHINE_CONFIG_START(ninjakd2_state::ninjakd2_core) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK_12/2) /* verified */ @@ -976,20 +976,20 @@ static MACHINE_CONFIG_START( ninjakd2_core ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ninjakd2, ninjakd2_core ) +MACHINE_CONFIG_DERIVED(ninjakd2_state::ninjakd2, ninjakd2_core) MCFG_CPU_REPLACE("soundcpu", MC8123, MAIN_CLOCK_5) /* verified */ MCFG_CPU_PROGRAM_MAP(ninjakd2_sound_cpu) MCFG_CPU_IO_MAP(ninjakd2_sound_io) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ninjakd2b, ninjakd2_core ) +MACHINE_CONFIG_DERIVED(ninjakd2_state::ninjakd2b, ninjakd2_core) MCFG_CPU_MODIFY("soundcpu") MCFG_CPU_PROGRAM_MAP(ninjakd2_sound_cpu) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mnight, ninjakd2_core ) +MACHINE_CONFIG_DERIVED(ninjakd2_state::mnight, ninjakd2_core) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1005,7 +1005,7 @@ static MACHINE_CONFIG_DERIVED( mnight, ninjakd2_core ) MCFG_DEVICE_REMOVE("pcm") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( arkarea, ninjakd2_core ) +MACHINE_CONFIG_DERIVED(ninjakd2_state::arkarea, ninjakd2_core) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mnight_main_cpu) @@ -1020,7 +1020,7 @@ static MACHINE_CONFIG_DERIVED( arkarea, ninjakd2_core ) MCFG_DEVICE_REMOVE("pcm") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( robokid, mnight ) +MACHINE_CONFIG_DERIVED(ninjakd2_state::robokid, mnight) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1041,7 +1041,7 @@ static MACHINE_CONFIG_DERIVED( robokid, mnight ) MCFG_SCREEN_UPDATE_DRIVER(ninjakd2_state, screen_update_robokid) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( omegaf, robokid ) +MACHINE_CONFIG_DERIVED(ninjakd2_state::omegaf, robokid) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/ninjaw.cpp b/src/mame/drivers/ninjaw.cpp index f837b8f5b36..d042b9c1c6b 100644 --- a/src/mame/drivers/ninjaw.cpp +++ b/src/mame/drivers/ninjaw.cpp @@ -728,7 +728,7 @@ void ninjaw_state::machine_reset() machine().sound().system_enable(true); /* mixer enabled */ } -static MACHINE_CONFIG_START( ninjaw ) +MACHINE_CONFIG_START(ninjaw_state::ninjaw) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */ @@ -853,7 +853,7 @@ static MACHINE_CONFIG_START( ninjaw ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( darius2 ) +MACHINE_CONFIG_START(ninjaw_state::darius2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */ diff --git a/src/mame/drivers/nitedrvr.cpp b/src/mame/drivers/nitedrvr.cpp index 3b67962236d..0398d135456 100644 --- a/src/mame/drivers/nitedrvr.cpp +++ b/src/mame/drivers/nitedrvr.cpp @@ -139,7 +139,7 @@ GFXDECODE_END /* Machine Driver */ -static MACHINE_CONFIG_START( nitedrvr ) +MACHINE_CONFIG_START(nitedrvr_state::nitedrvr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz/12) // 1 MHz diff --git a/src/mame/drivers/niyanpai.cpp b/src/mame/drivers/niyanpai.cpp index 3a796b9e95d..6e2f38eb4b3 100644 --- a/src/mame/drivers/niyanpai.cpp +++ b/src/mame/drivers/niyanpai.cpp @@ -687,7 +687,7 @@ INTERRUPT_GEN_MEMBER(niyanpai_state::interrupt) } -static MACHINE_CONFIG_START( niyanpai ) +MACHINE_CONFIG_START(niyanpai_state::niyanpai) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12288000/2) /* TMP68301, 6.144 MHz */ @@ -717,7 +717,7 @@ static MACHINE_CONFIG_START( niyanpai ) MCFG_NICHISND_ADD("nichisnd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( musobana, niyanpai ) +MACHINE_CONFIG_DERIVED(niyanpai_state::musobana, niyanpai) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -726,14 +726,14 @@ static MACHINE_CONFIG_DERIVED( musobana, niyanpai ) MCFG_MACHINE_START_OVERRIDE(niyanpai_state, musobana) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mhhonban, musobana ) +MACHINE_CONFIG_DERIVED(niyanpai_state::mhhonban, musobana) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mhhonban_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zokumahj, musobana ) +MACHINE_CONFIG_DERIVED(niyanpai_state::zokumahj, musobana) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/nmg5.cpp b/src/mame/drivers/nmg5.cpp index 4cb894c99d4..bc9b1c9a272 100644 --- a/src/mame/drivers/nmg5.cpp +++ b/src/mame/drivers/nmg5.cpp @@ -294,6 +294,11 @@ public: virtual void video_start() override; uint32_t screen_update_nmg5(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_bitmap( bitmap_ind16 &bitmap ); + void nmg5(machine_config &config); + void pclubys(machine_config &config); + void garogun(machine_config &config); + void searchp2(machine_config &config); + void _7ordi(machine_config &config); }; @@ -974,7 +979,7 @@ void nmg5_state::machine_reset() m_input_data = 0; } -static MACHINE_CONFIG_START( nmg5 ) +MACHINE_CONFIG_START(nmg5_state::nmg5) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -1020,7 +1025,7 @@ static MACHINE_CONFIG_START( nmg5 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( garogun, nmg5 ) +MACHINE_CONFIG_DERIVED(nmg5_state::garogun, nmg5) /* basic machine hardware */ @@ -1032,7 +1037,7 @@ static MACHINE_CONFIG_DERIVED( garogun, nmg5 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pclubys, nmg5 ) +MACHINE_CONFIG_DERIVED(nmg5_state::pclubys, nmg5) /* basic machine hardware */ @@ -1045,7 +1050,7 @@ static MACHINE_CONFIG_DERIVED( pclubys, nmg5 ) MCFG_GFXDECODE_MODIFY("gfxdecode", pclubys) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( searchp2, nmg5 ) +MACHINE_CONFIG_DERIVED(nmg5_state::searchp2, nmg5) /* basic machine hardware */ @@ -1055,7 +1060,7 @@ static MACHINE_CONFIG_DERIVED( searchp2, nmg5 ) MCFG_GFXDECODE_MODIFY("gfxdecode", pclubys) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( 7ordi, nmg5 ) +MACHINE_CONFIG_DERIVED(nmg5_state::_7ordi, nmg5) /* basic machine hardware */ @@ -1590,6 +1595,6 @@ GAME( 1999, searchp2, 0, searchp2, searchp2, nmg5_state, prot_val_10, R GAME( 2000, pclubys, 0, pclubys, pclubys, nmg5_state, prot_val_10, ROT0, "Yun Sung", "Puzzle Club (Yun Sung, set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 2000, pclubysa, pclubys, pclubys, pclubys, nmg5_state, prot_val_10, ROT0, "Yun Sung", "Puzzle Club (Yun Sung, set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 2000, garogun, 0, garogun, garogun, nmg5_state, prot_val_40, ROT0, "Yun Sung", "Garogun Seroyang (Korea)", MACHINE_SUPPORTS_SAVE ) -GAME( 2002, 7ordi, 0, 7ordi, 7ordi, nmg5_state, prot_val_20, ROT0, "Yun Sung", "7 Ordi (Korea)", MACHINE_SUPPORTS_SAVE ) +GAME( 2002, 7ordi, 0, _7ordi, 7ordi, nmg5_state, prot_val_20, ROT0, "Yun Sung", "7 Ordi (Korea)", MACHINE_SUPPORTS_SAVE ) GAME( ????, wondstck, 0, nmg5, wondstck, nmg5_state, prot_val_00, ROT0, "Yun Sung", "Wonder Stick (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( ????, wondstcka, wondstck, nmg5, wondstck, nmg5_state, prot_val_00, ROT0, "Yun Sung", "Wonder Stick (set 2, censored)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp index ca71b835214..58cfd33ea26 100644 --- a/src/mame/drivers/nmk16.cpp +++ b/src/mame/drivers/nmk16.cpp @@ -3878,7 +3878,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(nmk16_state::nmk16_scanline) -static MACHINE_CONFIG_START( tharrier ) +MACHINE_CONFIG_START(nmk16_state::tharrier) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */ @@ -3921,7 +3921,7 @@ static MACHINE_CONFIG_START( tharrier ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mustang ) +MACHINE_CONFIG_START(nmk16_state::mustang) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */ @@ -3961,7 +3961,7 @@ static MACHINE_CONFIG_START( mustang ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mustangb ) +MACHINE_CONFIG_START(nmk16_state::mustangb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */ @@ -4002,7 +4002,7 @@ MACHINE_CONFIG_END #define BIOSHIP_CRYSTAL1 10000000 #define BIOSHIP_CRYSTAL2 12000000 -static MACHINE_CONFIG_START( bioship ) +MACHINE_CONFIG_START(nmk16_state::bioship) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, BIOSHIP_CRYSTAL1 ) /* 10.0 MHz (verified) */ @@ -4042,7 +4042,7 @@ static MACHINE_CONFIG_START( bioship ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vandyke ) +MACHINE_CONFIG_START(nmk16_state::vandyke) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 68000p12 running at 10Mhz, verified on pcb */ @@ -4082,7 +4082,7 @@ static MACHINE_CONFIG_START( vandyke ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vandykeb ) +MACHINE_CONFIG_START(nmk16_state::vandykeb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */ @@ -4110,7 +4110,7 @@ static MACHINE_CONFIG_START( vandykeb ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( acrobatm ) +MACHINE_CONFIG_START(nmk16_state::acrobatm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz (verified on pcb) */ @@ -4151,7 +4151,7 @@ static MACHINE_CONFIG_START( acrobatm ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tdragonb ) /* bootleg using Raiden sound hardware */ +MACHINE_CONFIG_START(nmk16_state::tdragonb) /* bootleg using Raiden sound hardware */ /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) @@ -4189,7 +4189,7 @@ static MACHINE_CONFIG_START( tdragonb ) /* bootleg using Raiden sound hardwar MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tdragon ) +MACHINE_CONFIG_START(nmk16_state::tdragon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* verified on pcb */ @@ -4228,11 +4228,11 @@ static MACHINE_CONFIG_START( tdragon ) MCFG_DEVICE_ADDRESS_MAP(0, oki2_map) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tdragon_prot, tdragon ) +MACHINE_CONFIG_DERIVED(nmk16_state::tdragon_prot, tdragon) MCFG_TIMER_DRIVER_ADD_PERIODIC("coinsim", nmk16_state, tdragon_mcu_sim, attotime::from_hz(10000)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ssmissin ) +MACHINE_CONFIG_START(nmk16_state::ssmissin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 Mhz */ @@ -4264,7 +4264,7 @@ static MACHINE_CONFIG_START( ssmissin ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( strahl ) +MACHINE_CONFIG_START(nmk16_state::strahl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ? */ @@ -4303,7 +4303,7 @@ static MACHINE_CONFIG_START( strahl ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hachamf ) +MACHINE_CONFIG_START(nmk16_state::hachamf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */ @@ -4342,12 +4342,12 @@ static MACHINE_CONFIG_START( hachamf ) MCFG_DEVICE_ADDRESS_MAP(0, oki2_map) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hachamf_prot, hachamf ) +MACHINE_CONFIG_DERIVED(nmk16_state::hachamf_prot, hachamf) MCFG_TIMER_DRIVER_ADD_PERIODIC("coinsim", nmk16_state, hachamf_mcu_sim, attotime::from_hz(10000)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( macross ) +MACHINE_CONFIG_START(nmk16_state::macross) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */ @@ -4387,7 +4387,7 @@ static MACHINE_CONFIG_START( macross ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( blkheart ) +MACHINE_CONFIG_START(nmk16_state::blkheart) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* verified on pcb */ @@ -4427,7 +4427,7 @@ static MACHINE_CONFIG_START( blkheart ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gunnail ) +MACHINE_CONFIG_START(nmk16_state::gunnail) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */ @@ -4466,7 +4466,7 @@ static MACHINE_CONFIG_START( gunnail ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( macross2 ) +MACHINE_CONFIG_START(nmk16_state::macross2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */ @@ -4512,7 +4512,7 @@ static MACHINE_CONFIG_START( macross2 ) MCFG_NMK112_ROM1("oki2") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tdragon2 ) +MACHINE_CONFIG_START(nmk16_state::tdragon2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */ @@ -4558,13 +4558,13 @@ static MACHINE_CONFIG_START( tdragon2 ) MCFG_NMK112_ROM1("oki2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tdragon3h, tdragon2 ) +MACHINE_CONFIG_DERIVED(nmk16_state::tdragon3h, tdragon2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tdragon3h_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( raphero ) +MACHINE_CONFIG_START(nmk16_state::raphero) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14000000) /* 14 MHz measured */ @@ -4609,7 +4609,7 @@ static MACHINE_CONFIG_START( raphero ) MCFG_NMK112_ROM1("oki2") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bjtwin ) +MACHINE_CONFIG_START(nmk16_state::bjtwin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* verified on pcb */ @@ -4643,7 +4643,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( atombjt ) +MACHINE_CONFIG_START(nmk16_state::atombjt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* there is a 28mhz crystal and a 10mhz crystal near the 12 rated CPU */ @@ -4690,7 +4690,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(nmk16_state::manybloc_scanline) } // non-nmk board, different to the others, very timing sensitive -static MACHINE_CONFIG_START( manybloc ) +MACHINE_CONFIG_START(nmk16_state::manybloc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10? MHz - check */ @@ -5208,7 +5208,7 @@ GFXDECODE_END ***************************************************************************/ -static MACHINE_CONFIG_START( stagger1 ) +MACHINE_CONFIG_START(nmk16_state::stagger1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,XTAL_12MHz) /* 68000p10 running at 12mhz, verified on pcb */ @@ -5244,7 +5244,7 @@ static MACHINE_CONFIG_START( stagger1 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.70) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( redhawki, stagger1 ) +MACHINE_CONFIG_DERIVED(nmk16_state::redhawki, stagger1) /* basic machine hardware */ /* video hardware */ @@ -5252,7 +5252,7 @@ static MACHINE_CONFIG_DERIVED( redhawki, stagger1 ) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_redhawki) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( redhawkb, stagger1 ) +MACHINE_CONFIG_DERIVED(nmk16_state::redhawkb, stagger1) /* basic machine hardware */ /* video hardware */ @@ -5261,7 +5261,7 @@ static MACHINE_CONFIG_DERIVED( redhawkb, stagger1 ) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_redhawkb) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( grdnstrm, stagger1 ) +MACHINE_CONFIG_DERIVED(nmk16_state::grdnstrm, stagger1) /* basic machine hardware */ @@ -5272,7 +5272,7 @@ static MACHINE_CONFIG_DERIVED( grdnstrm, stagger1 ) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_firehawk) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( grdnstrmk, stagger1 ) /* Side by side with PCB, the music seems too fast as well */ +MACHINE_CONFIG_DERIVED(nmk16_state::grdnstrmk, stagger1) /* Side by side with PCB, the music seems too fast as well */ /* basic machine hardware */ @@ -5283,7 +5283,7 @@ static MACHINE_CONFIG_DERIVED( grdnstrmk, stagger1 ) /* Side by side with PCB, t MCFG_VIDEO_START_OVERRIDE(nmk16_state,grdnstrm) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( popspops, grdnstrm ) +MACHINE_CONFIG_DERIVED(nmk16_state::popspops, grdnstrm) /* basic machine hardware */ @@ -5292,7 +5292,7 @@ static MACHINE_CONFIG_DERIVED( popspops, grdnstrm ) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_bubl2000) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( firehawk ) +MACHINE_CONFIG_START(nmk16_state::firehawk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,12000000) @@ -5325,13 +5325,13 @@ static MACHINE_CONFIG_START( firehawk ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spec2k, firehawk ) +MACHINE_CONFIG_DERIVED(nmk16_state::spec2k, firehawk) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(afega) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( twinactn ) +MACHINE_CONFIG_START(nmk16_state::twinactn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,12000000) diff --git a/src/mame/drivers/nmkmedal.cpp b/src/mame/drivers/nmkmedal.cpp index 580fd856358..9e2eb2c6ca6 100644 --- a/src/mame/drivers/nmkmedal.cpp +++ b/src/mame/drivers/nmkmedal.cpp @@ -40,6 +40,7 @@ public: m_maincpu(*this, "maincpu") { } + void trocana(machine_config &config); private: required_device m_maincpu; }; @@ -52,7 +53,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( trocana ) INPUT_PORTS_END -static MACHINE_CONFIG_START( trocana ) +MACHINE_CONFIG_START(nmkmedal_state::trocana) MCFG_CPU_ADD("maincpu", TMP90841, 16500000 / 2) // actually TMP90C041AN MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/nokia_3310.cpp b/src/mame/drivers/nokia_3310.cpp index c8000246790..76754d53485 100644 --- a/src/mame/drivers/nokia_3310.cpp +++ b/src/mame/drivers/nokia_3310.cpp @@ -65,6 +65,11 @@ public: DECLARE_WRITE16_MEMBER(dsp_ram_w); DECLARE_INPUT_CHANGED_MEMBER(key_irq); + void noki3330(machine_config &config); + void noki3410(machine_config &config); + void noki7110(machine_config &config); + void noki6210(machine_config &config); + void noki3310(machine_config &config); private: void assert_fiq(int num); void assert_irq(int num); @@ -688,7 +693,7 @@ static INPUT_PORTS_START( noki3310 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( noki3310 ) +MACHINE_CONFIG_START(noki3310_state::noki3310) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM7_BE, 26000000 / 2) // MAD2WD1 13 MHz, clock internally supplied to ARM core can be divided by 2, in sleep mode a 32768 Hz clock is used @@ -712,28 +717,28 @@ static MACHINE_CONFIG_START( noki3310 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( noki3330, noki3310 ) +MACHINE_CONFIG_DERIVED(noki3310_state::noki3330, noki3310) MCFG_DEVICE_REMOVE("flash") MCFG_INTEL_TE28F320_ADD("flash") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( noki3410, noki3330 ) +MACHINE_CONFIG_DERIVED(noki3310_state::noki3410, noki3330) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(96, 65) // Philips OM6206 MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( noki7110, noki3330 ) +MACHINE_CONFIG_DERIVED(noki3310_state::noki7110, noki3330) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(96, 65) // Epson SED1565 MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( noki6210, noki3330 ) +MACHINE_CONFIG_DERIVED(noki3310_state::noki6210, noki3330) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(96, 60) diff --git a/src/mame/drivers/norautp.cpp b/src/mame/drivers/norautp.cpp index 034581a036d..5db5a847408 100644 --- a/src/mame/drivers/norautp.cpp +++ b/src/mame/drivers/norautp.cpp @@ -1225,7 +1225,7 @@ GFXDECODE_END * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( noraut_base ) +MACHINE_CONFIG_START(norautp_state::noraut_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, NORAUT_CPU_CLOCK) @@ -1277,7 +1277,7 @@ static MACHINE_CONFIG_START( noraut_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( norautp, noraut_base ) +MACHINE_CONFIG_DERIVED(norautp_state::norautp, noraut_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1285,7 +1285,7 @@ static MACHINE_CONFIG_DERIVED( norautp, noraut_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( norautpl, noraut_base ) +MACHINE_CONFIG_DERIVED(norautp_state::norautpl, noraut_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1297,7 +1297,7 @@ static MACHINE_CONFIG_DERIVED( norautpl, noraut_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( norautxp, noraut_base ) +MACHINE_CONFIG_DERIVED(norautp_state::norautxp, noraut_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1306,7 +1306,7 @@ static MACHINE_CONFIG_DERIVED( norautxp, noraut_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nortest1, noraut_base ) +MACHINE_CONFIG_DERIVED(norautp_state::nortest1, noraut_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1315,7 +1315,7 @@ static MACHINE_CONFIG_DERIVED( nortest1, noraut_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( norautx4, noraut_base ) +MACHINE_CONFIG_DERIVED(norautp_state::norautx4, noraut_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1335,7 +1335,7 @@ MACHINE_CONFIG_END #endif -static MACHINE_CONFIG_DERIVED( kimble, noraut_base ) +MACHINE_CONFIG_DERIVED(norautp_state::kimble, noraut_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1347,7 +1347,7 @@ static MACHINE_CONFIG_DERIVED( kimble, noraut_base ) MCFG_DISCRETE_INTF(kimble) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( newhilop, noraut_base ) +MACHINE_CONFIG_DERIVED(norautp_state::newhilop, noraut_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1359,7 +1359,7 @@ MACHINE_CONFIG_END /********** 8080 based **********/ -static MACHINE_CONFIG_DERIVED( dphl, noraut_base ) +MACHINE_CONFIG_DERIVED(norautp_state::dphl, noraut_base) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK) @@ -1372,7 +1372,7 @@ static MACHINE_CONFIG_DERIVED( dphl, noraut_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dphla, noraut_base ) +MACHINE_CONFIG_DERIVED(norautp_state::dphla, noraut_base) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK) @@ -1385,7 +1385,7 @@ static MACHINE_CONFIG_DERIVED( dphla, noraut_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kimbldhl, noraut_base ) +MACHINE_CONFIG_DERIVED(norautp_state::kimbldhl, noraut_base) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK) @@ -1398,7 +1398,7 @@ static MACHINE_CONFIG_DERIVED( kimbldhl, noraut_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dphltest, noraut_base ) +MACHINE_CONFIG_DERIVED(norautp_state::dphltest, noraut_base) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK) @@ -1411,7 +1411,7 @@ static MACHINE_CONFIG_DERIVED( dphltest, noraut_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( drhl, noraut_base ) +MACHINE_CONFIG_DERIVED(norautp_state::drhl, noraut_base) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK) @@ -1424,7 +1424,7 @@ static MACHINE_CONFIG_DERIVED( drhl, noraut_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ssjkrpkr, noraut_base ) +MACHINE_CONFIG_DERIVED(norautp_state::ssjkrpkr, noraut_base) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK) diff --git a/src/mame/drivers/notechan.cpp b/src/mame/drivers/notechan.cpp index 9107030a2e5..77bea9ef612 100644 --- a/src/mame/drivers/notechan.cpp +++ b/src/mame/drivers/notechan.cpp @@ -314,6 +314,7 @@ public: DECLARE_WRITE8_MEMBER(out_f9_w); DECLARE_WRITE8_MEMBER(out_fa_w); DECLARE_WRITE8_MEMBER(out_ff_w); + void notechan(machine_config &config); }; @@ -493,7 +494,7 @@ INPUT_PORTS_END * Machine Config * *********************************************/ -static MACHINE_CONFIG_START( notechan ) +MACHINE_CONFIG_START(notechan_state::notechan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) // unknown... MCFG_CPU_PROGRAM_MAP(notechan_map) diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp index 1a27b24b70e..5a0e8897ddf 100644 --- a/src/mame/drivers/notetaker.cpp +++ b/src/mame/drivers/notetaker.cpp @@ -223,6 +223,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void notetakr(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -843,7 +844,7 @@ void notetaker_state::ep_reset() static INPUT_PORTS_START( notetakr ) INPUT_PORTS_END -static MACHINE_CONFIG_START( notetakr ) +MACHINE_CONFIG_START(notetaker_state::notetakr) /* basic machine hardware */ /* IO CPU: 8086@8MHz */ MCFG_CPU_ADD("iocpu", I8086, XTAL_24MHz/3) /* iD8086-2 @ E4A; 24Mhz crystal divided down to 8Mhz by i8284 clock generator */ diff --git a/src/mame/drivers/nova2001.cpp b/src/mame/drivers/nova2001.cpp index d46e8c59337..54f12498eca 100644 --- a/src/mame/drivers/nova2001.cpp +++ b/src/mame/drivers/nova2001.cpp @@ -638,7 +638,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( nova2001 ) +MACHINE_CONFIG_START(nova2001_state::nova2001) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz verified on schematics @@ -676,7 +676,7 @@ static MACHINE_CONFIG_START( nova2001 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ninjakun ) +MACHINE_CONFIG_START(nova2001_state::ninjakun) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz @@ -720,7 +720,7 @@ static MACHINE_CONFIG_START( ninjakun ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pkunwar ) +MACHINE_CONFIG_START(nova2001_state::pkunwar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz @@ -757,7 +757,7 @@ static MACHINE_CONFIG_START( pkunwar ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( raiders5 ) +MACHINE_CONFIG_START(nova2001_state::raiders5) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp index 0364546ac6a..e7563925a9c 100644 --- a/src/mame/drivers/novag6502.cpp +++ b/src/mame/drivers/novag6502.cpp @@ -114,6 +114,10 @@ public: // Super Forte DECLARE_WRITE8_MEMBER(sforte_lcd_control_w); DECLARE_WRITE8_MEMBER(sforte_lcd_data_w); + void cforte(machine_config &config); + void sexpert(machine_config &config); + void supercon(machine_config &config); + void sforte(machine_config &config); }; @@ -850,7 +854,7 @@ INPUT_PORTS_END Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( supercon ) +MACHINE_CONFIG_START(novag6502_state::supercon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_8MHz/2) @@ -868,7 +872,7 @@ static MACHINE_CONFIG_START( supercon ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cforte ) +MACHINE_CONFIG_START(novag6502_state::cforte) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R65C02, XTAL_10MHz/2) @@ -892,7 +896,7 @@ static MACHINE_CONFIG_START( cforte ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sexpert ) +MACHINE_CONFIG_START(novag6502_state::sexpert) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65C02, XTAL_10MHz/2) // or XTAL_12MHz/2 @@ -939,7 +943,7 @@ static MACHINE_CONFIG_START( sexpert ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sforte, sexpert ) +MACHINE_CONFIG_DERIVED(novag6502_state::sforte, sexpert) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/novag68k.cpp b/src/mame/drivers/novag68k.cpp index b04edf9d873..f04ee1e9e24 100644 --- a/src/mame/drivers/novag68k.cpp +++ b/src/mame/drivers/novag68k.cpp @@ -50,6 +50,7 @@ public: DECLARE_WRITE8_MEMBER(diablo68k_leds_w); DECLARE_READ8_MEMBER(diablo68k_input1_r); DECLARE_READ8_MEMBER(diablo68k_input2_r); + void diablo68k(machine_config &config); }; @@ -178,7 +179,7 @@ INPUT_PORTS_END Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( diablo68k ) +MACHINE_CONFIG_START(novag68k_state::diablo68k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) diff --git a/src/mame/drivers/novagf8.cpp b/src/mame/drivers/novagf8.cpp index c8474d2c3c9..8381b5dbf2b 100644 --- a/src/mame/drivers/novagf8.cpp +++ b/src/mame/drivers/novagf8.cpp @@ -46,6 +46,7 @@ public: DECLARE_READ8_MEMBER(delta1_io0_r); DECLARE_READ8_MEMBER(delta1_io1_r); + void delta1(machine_config &config); protected: virtual void machine_start() override; }; @@ -185,7 +186,7 @@ F3853_INTERRUPT_REQ_CB(novagf8_state::f3853_interrupt) m_maincpu->set_input_line(F8_INPUT_LINE_INT_REQ, level ? ASSERT_LINE : CLEAR_LINE); } -static MACHINE_CONFIG_START( delta1 ) +MACHINE_CONFIG_START(novagf8_state::delta1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", F8, 2000000) // LC circuit, measured 2MHz diff --git a/src/mame/drivers/novagmcs48.cpp b/src/mame/drivers/novagmcs48.cpp index d36a2d9e408..ca61cebb8b3 100644 --- a/src/mame/drivers/novagmcs48.cpp +++ b/src/mame/drivers/novagmcs48.cpp @@ -52,6 +52,8 @@ public: DECLARE_MACHINE_RESET(octo); DECLARE_INPUT_CHANGED_MEMBER(octo_cpu_freq); void octo_set_cpu_freq(); + void presto(machine_config &config); + void octo(machine_config &config); }; @@ -142,7 +144,7 @@ INPUT_CHANGED_MEMBER(novagmcs48_state::octo_cpu_freq) Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( presto ) +MACHINE_CONFIG_START(novagmcs48_state::presto) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8049, 6000000) // LC circuit, measured 6MHz @@ -160,7 +162,7 @@ static MACHINE_CONFIG_START( presto ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( octo, presto ) +MACHINE_CONFIG_DERIVED(novagmcs48_state::octo, presto) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/nsg6809.cpp b/src/mame/drivers/nsg6809.cpp index 722e3c9e902..3c449d793df 100644 --- a/src/mame/drivers/nsg6809.cpp +++ b/src/mame/drivers/nsg6809.cpp @@ -49,6 +49,7 @@ public: m_maincpu(*this, "maincpu") {} required_device m_maincpu; + void pitchhit(machine_config &config); }; @@ -63,7 +64,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( pitchhit ) INPUT_PORTS_END -static MACHINE_CONFIG_START( pitchhit ) +MACHINE_CONFIG_START(nsg6809_state::pitchhit) MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz) // clock buffered through 74HC4060 MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/nsm.cpp b/src/mame/drivers/nsm.cpp index ba143b28f91..66cb4101043 100644 --- a/src/mame/drivers/nsm.cpp +++ b/src/mame/drivers/nsm.cpp @@ -38,6 +38,7 @@ public: DECLARE_READ8_MEMBER(ff_r); DECLARE_WRITE8_MEMBER(cru_w); DECLARE_WRITE8_MEMBER(oe_w); + void nsm(machine_config &config); protected: // devices @@ -121,7 +122,7 @@ void nsm_state::machine_reset() cpu->reset_line(ASSERT_LINE); } -static MACHINE_CONFIG_START( nsm ) +MACHINE_CONFIG_START(nsm_state::nsm) // CPU TMS9995, standard variant; no line connection MCFG_TMS99xx_ADD("maincpu", TMS9995, 11052000, nsm_map, nsm_io_map) diff --git a/src/mame/drivers/nsmpoker.cpp b/src/mame/drivers/nsmpoker.cpp index f0a2c874d8c..be4c12822e2 100644 --- a/src/mame/drivers/nsmpoker.cpp +++ b/src/mame/drivers/nsmpoker.cpp @@ -91,6 +91,7 @@ public: INTERRUPT_GEN_MEMBER(nsmpoker_interrupt); required_device m_maincpu; required_device m_gfxdecode; + void nsmpoker(machine_config &config); }; @@ -409,7 +410,7 @@ void nsmpoker_state::machine_reset() * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( nsmpoker ) +MACHINE_CONFIG_START(nsmpoker_state::nsmpoker) // CPU TMS9995, standard variant; no line connections MCFG_TMS99xx_ADD("maincpu", TMS9995, MASTER_CLOCK/2, nsmpoker_map, nsmpoker_portmap) diff --git a/src/mame/drivers/nss.cpp b/src/mame/drivers/nss.cpp index 67b7bc3a70c..c0a7d061421 100644 --- a/src/mame/drivers/nss.cpp +++ b/src/mame/drivers/nss.cpp @@ -350,6 +350,7 @@ public: INTERRUPT_GEN_MEMBER(nss_vblank_irq); DECLARE_READ8_MEMBER(spc_ram_100_r); DECLARE_WRITE8_MEMBER(spc_ram_100_w); + void nss(machine_config &config); }; @@ -817,7 +818,7 @@ void nss_state::machine_reset() m_joy_flag = 1; } -static MACHINE_CONFIG_START( nss ) +MACHINE_CONFIG_START(nss_state::nss) /* base snes hardware */ MCFG_CPU_ADD("maincpu", _5A22, MCLK_NTSC) /* 2.68Mhz, also 3.58Mhz */ diff --git a/src/mame/drivers/nwk-tr.cpp b/src/mame/drivers/nwk-tr.cpp index 1b3f1cadcff..e8b91121774 100644 --- a/src/mame/drivers/nwk-tr.cpp +++ b/src/mame/drivers/nwk-tr.cpp @@ -338,6 +338,8 @@ public: uint32_t screen_update_nwktr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void lanc2_init(); + void thrilld(machine_config &config); + void nwktr(machine_config &config); }; @@ -812,7 +814,7 @@ void nwktr_state::machine_reset() m_dsp2->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } -static MACHINE_CONFIG_START( nwktr ) +MACHINE_CONFIG_START(nwktr_state::nwktr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */ @@ -892,7 +894,7 @@ static MACHINE_CONFIG_START( nwktr ) MCFG_KONPPC_CGBOARD_TYPE(NWKTR) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( thrilld, nwktr ) +MACHINE_CONFIG_DERIVED(nwktr_state::thrilld, nwktr) MCFG_DEVICE_REMOVE("k001604") MCFG_DEVICE_ADD("k001604", K001604, 0) diff --git a/src/mame/drivers/nycaptor.cpp b/src/mame/drivers/nycaptor.cpp index e285499589b..db2e673509a 100644 --- a/src/mame/drivers/nycaptor.cpp +++ b/src/mame/drivers/nycaptor.cpp @@ -724,7 +724,7 @@ void nycaptor_state::machine_reset() m_gfxctrl = 0; } -static MACHINE_CONFIG_START( nycaptor ) +MACHINE_CONFIG_START(nycaptor_state::nycaptor) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* ??? */ @@ -800,7 +800,7 @@ static MACHINE_CONFIG_START( nycaptor ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cyclshtg ) +MACHINE_CONFIG_START(nycaptor_state::cyclshtg) MCFG_CPU_ADD("maincpu", Z80,8000000/2) MCFG_CPU_PROGRAM_MAP(cyclshtg_master_map) @@ -873,7 +873,7 @@ static MACHINE_CONFIG_START( cyclshtg ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bronx ) +MACHINE_CONFIG_START(nycaptor_state::bronx) MCFG_CPU_ADD("maincpu", Z80,8000000/2) MCFG_CPU_PROGRAM_MAP(bronx_master_map) diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp index 01da50d9a4f..c509ec68e38 100644 --- a/src/mame/drivers/nyny.cpp +++ b/src/mame/drivers/nyny.cpp @@ -157,6 +157,7 @@ public: MC6845_UPDATE_ROW(crtc_update_row); MC6845_END_UPDATE(crtc_end_update); + void nyny(machine_config &config); }; @@ -585,7 +586,7 @@ void nyny_state::machine_reset() * *************************************/ -static MACHINE_CONFIG_START( nyny ) +MACHINE_CONFIG_START(nyny_state::nyny) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, 5600000) /* 1.40 MHz? The clock signal is generated by analog chips */ diff --git a/src/mame/drivers/ob68k1a.cpp b/src/mame/drivers/ob68k1a.cpp index e8cb1a9ccbd..535c8469db3 100644 --- a/src/mame/drivers/ob68k1a.cpp +++ b/src/mame/drivers/ob68k1a.cpp @@ -192,7 +192,7 @@ void ob68k1a_state::machine_reset() // MACHINE_CONFIG( ob68k1a ) //------------------------------------------------- -static MACHINE_CONFIG_START( ob68k1a ) +MACHINE_CONFIG_START(ob68k1a_state::ob68k1a) // basic machine hardware MCFG_CPU_ADD(MC68000L10_TAG, M68000, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP(ob68k1a_mem) diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp index 23340b81a80..9118e742969 100644 --- a/src/mame/drivers/octopus.cpp +++ b/src/mame/drivers/octopus.cpp @@ -224,6 +224,7 @@ public: BEEP_TIMER = 100 }; + void octopus(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -865,7 +866,7 @@ SLOT_INTERFACE_START(octopus_centronics_devices) SLOT_INTERFACE("printer", CENTRONICS_PRINTER) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( octopus ) +MACHINE_CONFIG_START(octopus_state::octopus) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8088, XTAL_24MHz / 3) // 8MHz MCFG_CPU_PROGRAM_MAP(octopus_mem) diff --git a/src/mame/drivers/odyssey.cpp b/src/mame/drivers/odyssey.cpp index 50e323905fa..24446bbd811 100644 --- a/src/mame/drivers/odyssey.cpp +++ b/src/mame/drivers/odyssey.cpp @@ -83,6 +83,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void odyssey(machine_config &config); }; void odyssey_state::video_start() @@ -128,7 +129,7 @@ void odyssey_state::machine_reset() * Machine Config * **************************************/ -static MACHINE_CONFIG_START( odyssey ) +MACHINE_CONFIG_START(odyssey_state::odyssey) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM, 133000000) // a Celeron at 1.70 GHz on the MB I checked. diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp index a72de3c60e1..a3bfe14f621 100644 --- a/src/mame/drivers/odyssey2.cpp +++ b/src/mame/drivers/odyssey2.cpp @@ -61,6 +61,9 @@ public: DECLARE_WRITE16_MEMBER(scanline_postprocess); + void odyssey2_cartslot(machine_config &config); + void videopac(machine_config &config); + void odyssey2(machine_config &config); protected: /* constants */ static const uint8_t P1_BANK_LO_BIT = 0x01; @@ -97,6 +100,8 @@ public: DECLARE_WRITE8_MEMBER(i8243_port_w); DECLARE_WRITE16_MEMBER(scanline_postprocess); + void g7400(machine_config &config); + void odyssey3(machine_config &config); protected: uint8_t m_ic674_decode[8]; uint8_t m_ic678_decode[8]; @@ -650,14 +655,14 @@ GFXDECODE_END -static MACHINE_CONFIG_START( odyssey2_cartslot ) +MACHINE_CONFIG_START(odyssey2_state::odyssey2_cartslot) MCFG_O2_CARTRIDGE_ADD("cartslot", o2_cart, nullptr) MCFG_SOFTWARE_LIST_ADD("cart_list","odyssey2") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( odyssey2 ) +MACHINE_CONFIG_START(odyssey2_state::odyssey2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8048, ( ( XTAL_7_15909MHz * 3 ) / 4 ) ) MCFG_CPU_PROGRAM_MAP(odyssey2_mem) @@ -691,7 +696,7 @@ static MACHINE_CONFIG_START( odyssey2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( videopac ) +MACHINE_CONFIG_START(odyssey2_state::videopac) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8048, ( XTAL_17_73447MHz / 3 ) ) MCFG_CPU_PROGRAM_MAP(odyssey2_mem) @@ -717,7 +722,7 @@ static MACHINE_CONFIG_START( videopac ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( g7400 ) +MACHINE_CONFIG_START(g7400_state::g7400) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8048, XTAL_5_911MHz ) MCFG_CPU_PROGRAM_MAP(odyssey2_mem) @@ -758,7 +763,7 @@ static MACHINE_CONFIG_START( g7400 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( odyssey3 ) +MACHINE_CONFIG_START(g7400_state::odyssey3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8048, XTAL_5_911MHz ) MCFG_CPU_PROGRAM_MAP(odyssey2_mem) diff --git a/src/mame/drivers/offtwall.cpp b/src/mame/drivers/offtwall.cpp index 463034b3090..24d861b78e9 100644 --- a/src/mame/drivers/offtwall.cpp +++ b/src/mame/drivers/offtwall.cpp @@ -361,7 +361,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( offtwall ) +MACHINE_CONFIG_START(offtwall_state::offtwall) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) diff --git a/src/mame/drivers/ohmygod.cpp b/src/mame/drivers/ohmygod.cpp index 4f94eef6147..91747a7454a 100644 --- a/src/mame/drivers/ohmygod.cpp +++ b/src/mame/drivers/ohmygod.cpp @@ -318,7 +318,7 @@ void ohmygod_state::machine_reset() m_scrolly = 0; } -static MACHINE_CONFIG_START( ohmygod ) +MACHINE_CONFIG_START(ohmygod_state::ohmygod) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) diff --git a/src/mame/drivers/ojankohs.cpp b/src/mame/drivers/ojankohs.cpp index c3b5be359e3..2d226cdb45d 100644 --- a/src/mame/drivers/ojankohs.cpp +++ b/src/mame/drivers/ojankohs.cpp @@ -706,7 +706,7 @@ void ojankohs_state::machine_reset() m_screen_refresh = 0; } -static MACHINE_CONFIG_START( ojankohs ) +MACHINE_CONFIG_START(ojankohs_state::ojankohs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */ @@ -747,7 +747,7 @@ static MACHINE_CONFIG_START( ojankohs ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ojankoy ) +MACHINE_CONFIG_START(ojankohs_state::ojankoy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */ @@ -787,7 +787,7 @@ static MACHINE_CONFIG_START( ojankoy ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ccasino ) +MACHINE_CONFIG_START(ojankohs_state::ccasino) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */ @@ -828,7 +828,7 @@ static MACHINE_CONFIG_START( ccasino ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ojankoc ) +MACHINE_CONFIG_START(ojankohs_state::ojankoc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.00 MHz */ diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp index 939ac446d50..df393160759 100644 --- a/src/mame/drivers/okean240.cpp +++ b/src/mame/drivers/okean240.cpp @@ -94,6 +94,9 @@ public: DECLARE_DRIVER_INIT(okean240); uint32_t screen_update_okean240(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void okean240a(machine_config &config); + void okean240t(machine_config &config); + void okean240(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -492,7 +495,7 @@ static GFXDECODE_START( okean240a ) GFXDECODE_END -static MACHINE_CONFIG_START( okean240t ) +MACHINE_CONFIG_START(okean240_state::okean240t) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, XTAL_12MHz / 6) MCFG_CPU_PROGRAM_MAP(okean240_mem) @@ -537,7 +540,7 @@ static MACHINE_CONFIG_START( okean240t ) MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( okean240a, okean240t ) +MACHINE_CONFIG_DERIVED(okean240_state::okean240a, okean240t) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(okean240a_io) MCFG_GFXDECODE_ADD("gfxdecode", "palette", okean240a) @@ -556,7 +559,7 @@ static MACHINE_CONFIG_DERIVED( okean240a, okean240t ) MCFG_PIT8253_CLK1(1536000) // artificial rate MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( okean240, okean240t ) +MACHINE_CONFIG_DERIVED(okean240_state::okean240, okean240t) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(okean240_io) MCFG_GFXDECODE_ADD("gfxdecode", "palette", okean240) diff --git a/src/mame/drivers/olibochu.cpp b/src/mame/drivers/olibochu.cpp index 159a93a9ddc..91795412a1f 100644 --- a/src/mame/drivers/olibochu.cpp +++ b/src/mame/drivers/olibochu.cpp @@ -104,6 +104,7 @@ public: uint32_t screen_update_olibochu(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(olibochu_scanline); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void olibochu(machine_config &config); }; @@ -457,7 +458,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(olibochu_state::olibochu_scanline) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xcf); /* RST 08h */ } -static MACHINE_CONFIG_START( olibochu ) +MACHINE_CONFIG_START(olibochu_state::olibochu) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ?? */ diff --git a/src/mame/drivers/omegrace.cpp b/src/mame/drivers/omegrace.cpp index 5236b4059d5..837fa616bfc 100644 --- a/src/mame/drivers/omegrace.cpp +++ b/src/mame/drivers/omegrace.cpp @@ -250,6 +250,7 @@ public: DECLARE_WRITE8_MEMBER(omegrace_soundlatch_w); DECLARE_DRIVER_INIT(omegrace); virtual void machine_reset() override; + void omegrace(machine_config &config); }; @@ -496,7 +497,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( omegrace ) +MACHINE_CONFIG_START(omegrace_state::omegrace) /* basic machine hardware */ diff --git a/src/mame/drivers/ondra.cpp b/src/mame/drivers/ondra.cpp index bd020405372..e68c922df41 100644 --- a/src/mame/drivers/ondra.cpp +++ b/src/mame/drivers/ondra.cpp @@ -118,7 +118,7 @@ INTERRUPT_GEN_MEMBER(ondra_state::ondra_interrupt) } /* Machine driver */ -static MACHINE_CONFIG_START( ondra ) +MACHINE_CONFIG_START(ondra_state::ondra) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2000000) MCFG_CPU_PROGRAM_MAP(ondra_mem) diff --git a/src/mame/drivers/oneshot.cpp b/src/mame/drivers/oneshot.cpp index b2a6d832b90..c693712a9dc 100644 --- a/src/mame/drivers/oneshot.cpp +++ b/src/mame/drivers/oneshot.cpp @@ -360,7 +360,7 @@ void oneshot_state::machine_reset() m_p2_wobble = 0; } -static MACHINE_CONFIG_START( oneshot ) +MACHINE_CONFIG_START(oneshot_state::oneshot) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) @@ -396,7 +396,7 @@ static MACHINE_CONFIG_START( oneshot ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maddonna, oneshot ) +MACHINE_CONFIG_DERIVED(oneshot_state::maddonna, oneshot) /* basic machine hardware */ diff --git a/src/mame/drivers/onetwo.cpp b/src/mame/drivers/onetwo.cpp index 708c12d4f60..5bb39ae35df 100644 --- a/src/mame/drivers/onetwo.cpp +++ b/src/mame/drivers/onetwo.cpp @@ -93,6 +93,7 @@ public: virtual void video_start() override; uint32_t screen_update_onetwo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void set_color(int offset); + void onetwo(machine_config &config); }; @@ -348,7 +349,7 @@ void onetwo_state::machine_start() } -static MACHINE_CONFIG_START( onetwo ) +MACHINE_CONFIG_START(onetwo_state::onetwo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK) /* 4 MHz */ diff --git a/src/mame/drivers/onyx.cpp b/src/mame/drivers/onyx.cpp index 3faabd8603a..8e301042ae5 100644 --- a/src/mame/drivers/onyx.cpp +++ b/src/mame/drivers/onyx.cpp @@ -55,6 +55,8 @@ public: DECLARE_MACHINE_RESET(c8002); + void c8002(machine_config &config); + void c5000(machine_config &config); private: required_device m_maincpu; }; @@ -112,7 +114,7 @@ ADDRESS_MAP_END ****************************************************************************/ -static MACHINE_CONFIG_START( c8002 ) +MACHINE_CONFIG_START(onyx_state::c8002) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z8002, XTAL_4MHz ) //MCFG_Z80_DAISY_CHAIN(main_daisy_chain) @@ -222,7 +224,7 @@ static ADDRESS_MAP_START(c5000_io, AS_IO, 8, onyx_state) AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("sio1", z80sio_device, cd_ba_r, cd_ba_w ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( c5000 ) +MACHINE_CONFIG_START(onyx_state::c5000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4 ) //MCFG_Z80_DAISY_CHAIN(sub_daisy_chain) diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp index 92d278ed90b..6ccb098169e 100644 --- a/src/mame/drivers/opwolf.cpp +++ b/src/mame/drivers/opwolf.cpp @@ -774,7 +774,7 @@ GFXDECODE_END MACHINE DRIVERS ***********************************************************/ -static MACHINE_CONFIG_START( opwolf ) +MACHINE_CONFIG_START(opwolf_state::opwolf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz */ @@ -838,7 +838,7 @@ static MACHINE_CONFIG_START( opwolf ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( opwolfp, opwolf ) +MACHINE_CONFIG_DERIVED(opwolf_state::opwolfp, opwolf) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") /* 8 MHz */ @@ -849,7 +849,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( opwolfb ) /* OSC clocks unknown for the bootleg, but changed to match original sets */ +MACHINE_CONFIG_START(opwolf_state::opwolfb) /* OSC clocks unknown for the bootleg, but changed to match original sets */ /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz ??? */ diff --git a/src/mame/drivers/orao.cpp b/src/mame/drivers/orao.cpp index 346c7017db2..1b37ddfa7b5 100644 --- a/src/mame/drivers/orao.cpp +++ b/src/mame/drivers/orao.cpp @@ -169,7 +169,7 @@ static INPUT_PORTS_START( orao ) INPUT_PORTS_END /* Machine driver */ -static MACHINE_CONFIG_START( orao ) +MACHINE_CONFIG_START(orao_state::orao) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1000000) MCFG_CPU_PROGRAM_MAP(orao_mem) diff --git a/src/mame/drivers/orbit.cpp b/src/mame/drivers/orbit.cpp index 6006cf2ed83..49872439242 100644 --- a/src/mame/drivers/orbit.cpp +++ b/src/mame/drivers/orbit.cpp @@ -275,7 +275,7 @@ void orbit_state::machine_reset() * *************************************/ -static MACHINE_CONFIG_START( orbit ) +MACHINE_CONFIG_START(orbit_state::orbit) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, MASTER_CLOCK / 16) diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp index dd259e2c075..2c7a53dfe83 100644 --- a/src/mame/drivers/oric.cpp +++ b/src/mame/drivers/oric.cpp @@ -87,6 +87,8 @@ public: uint32_t screen_update_oric(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(vblank_w); + void oric(machine_config &config); + void prav8d(machine_config &config); protected: required_device m_maincpu; required_device m_palette; @@ -153,6 +155,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void telstrat(machine_config &config); protected: enum { P_IRQEN = 0x01, @@ -767,7 +770,7 @@ static INPUT_PORTS_START(telstrat) INPUT_PORTS_END -static MACHINE_CONFIG_START( oric ) +MACHINE_CONFIG_START(oric_state::oric) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/12) MCFG_CPU_PROGRAM_MAP(oric_mem) @@ -815,7 +818,7 @@ static MACHINE_CONFIG_START( oric ) MCFG_ORICEXT_ADD( "ext", oricext_intf, nullptr, "maincpu", WRITELINE(oric_state, ext_irq_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( prav8d, oric ) +MACHINE_CONFIG_DERIVED(oric_state::prav8d, oric) MACHINE_CONFIG_END FLOPPY_FORMATS_MEMBER( telestrat_state::floppy_formats ) @@ -826,7 +829,7 @@ static SLOT_INTERFACE_START( telestrat_floppies ) SLOT_INTERFACE( "3dsdd", FLOPPY_3_DSDD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_DERIVED( telstrat, oric ) +MACHINE_CONFIG_DERIVED(telestrat_state::telstrat, oric) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(telestrat_mem) diff --git a/src/mame/drivers/orion.cpp b/src/mame/drivers/orion.cpp index 1655b9a63e3..76b19764966 100644 --- a/src/mame/drivers/orion.cpp +++ b/src/mame/drivers/orion.cpp @@ -85,7 +85,7 @@ static SLOT_INTERFACE_START( orion_floppies ) SLOT_INTERFACE_END /* Machine driver */ -static MACHINE_CONFIG_START( orion128 ) +MACHINE_CONFIG_START(orion_state::orion128) MCFG_CPU_ADD("maincpu", I8080, 2000000) MCFG_CPU_PROGRAM_MAP(orion128_mem) MCFG_CPU_IO_MAP(orion128_io) @@ -147,7 +147,7 @@ static MACHINE_CONFIG_START( orion128 ) MCFG_RAM_DEFAULT_VALUE(0x00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( orion128ms, orion128 ) +MACHINE_CONFIG_DERIVED(orion_state::orion128ms, orion128) MCFG_DEVICE_REMOVE("ppi8255_2") MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(radio86_state, radio86_8255_porta_w2)) @@ -157,7 +157,7 @@ static MACHINE_CONFIG_DERIVED( orion128ms, orion128 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( orionz80 ) +MACHINE_CONFIG_START(orion_state::orionz80) MCFG_CPU_ADD("maincpu", Z80, 2500000) MCFG_CPU_PROGRAM_MAP(orionz80_mem) MCFG_CPU_IO_MAP(orionz80_io) @@ -226,7 +226,7 @@ static MACHINE_CONFIG_START( orionz80 ) MCFG_RAM_DEFAULT_VALUE(0x00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( orionz80ms, orionz80 ) +MACHINE_CONFIG_DERIVED(orion_state::orionz80ms, orionz80) MCFG_DEVICE_REMOVE("ppi8255_2") MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0) @@ -236,7 +236,7 @@ static MACHINE_CONFIG_DERIVED( orionz80ms, orionz80 ) MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( orionpro ) +MACHINE_CONFIG_START(orion_state::orionpro) MCFG_CPU_ADD("maincpu", Z80, 5000000) MCFG_CPU_PROGRAM_MAP(orionpro_mem) MCFG_CPU_IO_MAP(orionpro_io) diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp index d48da4ba9a9..7a4f358450b 100644 --- a/src/mame/drivers/osbexec.cpp +++ b/src/mame/drivers/osbexec.cpp @@ -126,6 +126,7 @@ public: DECLARE_WRITE_LINE_MEMBER(modem_dsr_w); DECLARE_WRITE_LINE_MEMBER(modem_ri_w); DECLARE_WRITE_LINE_MEMBER(comm_clk_a_w); + void osbexec(machine_config &config); }; @@ -557,7 +558,7 @@ static const z80_daisy_config osbexec_daisy_config[] = }; -static MACHINE_CONFIG_START( osbexec ) +MACHINE_CONFIG_START(osbexec_state::osbexec) MCFG_CPU_ADD( "maincpu", Z80, MAIN_CLOCK/6 ) MCFG_CPU_PROGRAM_MAP( osbexec_mem) MCFG_CPU_IO_MAP( osbexec_io) diff --git a/src/mame/drivers/osborne1.cpp b/src/mame/drivers/osborne1.cpp index 97e19a985b3..8b4e6321b19 100644 --- a/src/mame/drivers/osborne1.cpp +++ b/src/mame/drivers/osborne1.cpp @@ -279,7 +279,7 @@ static GFXDECODE_START( osborne1 ) GFXDECODE_END -static MACHINE_CONFIG_START( osborne1 ) +MACHINE_CONFIG_START(osborne1_state::osborne1) MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) MCFG_CPU_PROGRAM_MAP(osborne1_mem) MCFG_CPU_DECRYPTED_OPCODES_MAP(osborne1_op) @@ -338,7 +338,7 @@ static MACHINE_CONFIG_START( osborne1 ) MCFG_SOFTWARE_LIST_ADD("flop_list","osborne1") MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( osborne1nv, osborne1 ) +MACHINE_CONFIG_DERIVED(osborne1nv_state::osborne1nv, osborne1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(osborne1nv_io) diff --git a/src/mame/drivers/osi.cpp b/src/mame/drivers/osi.cpp index c05dddff594..649a4366c08 100644 --- a/src/mame/drivers/osi.cpp +++ b/src/mame/drivers/osi.cpp @@ -706,7 +706,7 @@ GFXDECODE_END /* Machine Drivers */ -static MACHINE_CONFIG_START( osi600 ) +MACHINE_CONFIG_START(sb2m600_state::osi600) /* basic machine hardware */ MCFG_CPU_ADD(M6502_TAG, M6502, X1/4) // .98304 MHz MCFG_CPU_PROGRAM_MAP(osi600_mem) @@ -737,7 +737,7 @@ static MACHINE_CONFIG_START( osi600 ) MCFG_RAM_EXTRA_OPTIONS("8K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( uk101 ) +MACHINE_CONFIG_START(uk101_state::uk101) /* basic machine hardware */ MCFG_CPU_ADD(M6502_TAG, M6502, UK101_X1/8) // 1 MHz MCFG_CPU_PROGRAM_MAP(uk101_mem) @@ -762,7 +762,7 @@ static MACHINE_CONFIG_START( uk101 ) MCFG_RAM_EXTRA_OPTIONS("8K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( c1p ) +MACHINE_CONFIG_START(c1p_state::c1p) /* basic machine hardware */ MCFG_CPU_ADD(M6502_TAG, M6502, X1/4) // .98304 MHz MCFG_CPU_PROGRAM_MAP(c1p_mem) @@ -799,7 +799,7 @@ static MACHINE_CONFIG_START( c1p ) MCFG_RAM_EXTRA_OPTIONS("20K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( c1pmf, c1p ) +MACHINE_CONFIG_DERIVED(c1pmf_state::c1pmf, c1p) MCFG_CPU_MODIFY(M6502_TAG) MCFG_CPU_PROGRAM_MAP(c1pmf_mem) diff --git a/src/mame/drivers/othello.cpp b/src/mame/drivers/othello.cpp index fa289e6b08d..371fb70ad09 100644 --- a/src/mame/drivers/othello.cpp +++ b/src/mame/drivers/othello.cpp @@ -112,6 +112,7 @@ public: virtual void machine_reset() override; DECLARE_PALETTE_INIT(othello); MC6845_UPDATE_ROW(crtc_update_row); + void othello(machine_config &config); }; @@ -389,7 +390,7 @@ void othello_state::machine_reset() m_n7751_busy = 0; } -static MACHINE_CONFIG_START( othello ) +MACHINE_CONFIG_START(othello_state::othello) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz/2) diff --git a/src/mame/drivers/othunder.cpp b/src/mame/drivers/othunder.cpp index 079a9210c15..5b690007152 100644 --- a/src/mame/drivers/othunder.cpp +++ b/src/mame/drivers/othunder.cpp @@ -662,7 +662,7 @@ void othunder_state::machine_reset() m_ad_irq = 0; } -static MACHINE_CONFIG_START( othunder ) +MACHINE_CONFIG_START(othunder_state::othunder) /* basic machine hardware */ // MCFG_CPU_ADD("maincpu", M68000, 24000000/2 ) /* 12 MHz */ diff --git a/src/mame/drivers/otomedius.cpp b/src/mame/drivers/otomedius.cpp index f922f73f660..a15eb72b412 100644 --- a/src/mame/drivers/otomedius.cpp +++ b/src/mame/drivers/otomedius.cpp @@ -33,6 +33,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_konami_pc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void konami_pc(machine_config &config); }; void konami_pc_state::video_start() @@ -62,7 +63,7 @@ void konami_pc_state::machine_reset() { } -static MACHINE_CONFIG_START( konami_pc ) +MACHINE_CONFIG_START(konami_pc_state::konami_pc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM3, 100000000) // not correct, but why bother? diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp index 5c54dfb3778..e8f8a8a0014 100644 --- a/src/mame/drivers/overdriv.cpp +++ b/src/mame/drivers/overdriv.cpp @@ -319,7 +319,7 @@ void overdriv_state::machine_reset() } -static MACHINE_CONFIG_START( overdriv ) +MACHINE_CONFIG_START(overdriv_state::overdriv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ diff --git a/src/mame/drivers/p112.cpp b/src/mame/drivers/p112.cpp index 12d94156f32..909cb01a007 100644 --- a/src/mame/drivers/p112.cpp +++ b/src/mame/drivers/p112.cpp @@ -49,6 +49,7 @@ public: virtual void video_start() override; uint32_t screen_update_p112(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void p112(machine_config &config); }; @@ -81,7 +82,7 @@ uint32_t p112_state::screen_update_p112(screen_device &screen, bitmap_ind16 &bit return 0; } -static MACHINE_CONFIG_START( p112 ) +MACHINE_CONFIG_START(p112_state::p112) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z180, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(p112_mem) diff --git a/src/mame/drivers/p2000t.cpp b/src/mame/drivers/p2000t.cpp index b63afc3ba0c..a8bfccdcd0f 100644 --- a/src/mame/drivers/p2000t.cpp +++ b/src/mame/drivers/p2000t.cpp @@ -219,7 +219,7 @@ READ8_MEMBER( p2000t_state::videoram_r ) } /* Machine definition */ -static MACHINE_CONFIG_START( p2000t ) +MACHINE_CONFIG_START(p2000t_state::p2000t) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2500000) MCFG_CPU_PROGRAM_MAP(p2000t_mem) @@ -246,7 +246,7 @@ MACHINE_CONFIG_END /* Machine definition */ -static MACHINE_CONFIG_START( p2000m ) +MACHINE_CONFIG_START(p2000t_state::p2000m) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2500000) MCFG_CPU_PROGRAM_MAP(p2000m_mem) diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp index e17148291ce..d7611c16236 100644 --- a/src/mame/drivers/p8k.cpp +++ b/src/mame/drivers/p8k.cpp @@ -105,6 +105,8 @@ public: DECLARE_READ8_MEMBER(io_read_byte); DECLARE_WRITE8_MEMBER(io_write_byte); + void p8k(machine_config &config); + void p8k_16(machine_config &config); private: required_device m_maincpu; optional_device m_daisy; @@ -399,7 +401,7 @@ GFXDECODE_END ****************************************************************************/ -static MACHINE_CONFIG_START( p8k ) +MACHINE_CONFIG_START(p8k_state::p8k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz ) MCFG_Z80_DAISY_CHAIN(p8k_daisy_chain) @@ -467,7 +469,7 @@ static MACHINE_CONFIG_START( p8k ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( p8k_16 ) +MACHINE_CONFIG_START(p8k_state::p8k_16) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z8001, XTAL_4MHz ) MCFG_CPU_PROGRAM_MAP(p8k_16_memmap) diff --git a/src/mame/drivers/pachifev.cpp b/src/mame/drivers/pachifev.cpp index 3184fe55996..f9f719358d5 100644 --- a/src/mame/drivers/pachifev.cpp +++ b/src/mame/drivers/pachifev.cpp @@ -113,6 +113,7 @@ public: virtual void machine_reset() override; INTERRUPT_GEN_MEMBER(pachifev_vblank_irq); required_device m_maincpu; + void pachifev(machine_config &config); }; WRITE8_MEMBER(pachifev_state::controls_w) @@ -341,7 +342,7 @@ void pachifev_state::machine_start() save_item(NAME(m_cnt)); } -static MACHINE_CONFIG_START( pachifev ) +MACHINE_CONFIG_START(pachifev_state::pachifev) // CPU TMS9995, standard variant; no line connections MCFG_TMS99xx_ADD("maincpu", TMS9995, XTAL_12MHz, pachifev_map, pachifev_cru) diff --git a/src/mame/drivers/pacland.cpp b/src/mame/drivers/pacland.cpp index 92d77f5738e..b94b545d170 100644 --- a/src/mame/drivers/pacland.cpp +++ b/src/mame/drivers/pacland.cpp @@ -426,7 +426,7 @@ INTERRUPT_GEN_MEMBER(pacland_state::mcu_vblank_irq) m_mcu->set_input_line(0, ASSERT_LINE); } -static MACHINE_CONFIG_START( pacland ) +MACHINE_CONFIG_START(pacland_state::pacland) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_49_152MHz/32) /* 1.536 MHz */ diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp index 5bd1c3c0ce0..d0c1a61af2c 100644 --- a/src/mame/drivers/pacman.cpp +++ b/src/mame/drivers/pacman.cpp @@ -3494,7 +3494,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( pacman ) +MACHINE_CONFIG_START(pacman_state::pacman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) @@ -3537,22 +3537,22 @@ static MACHINE_CONFIG_START( pacman ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( maketrax, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::maketrax, pacman) MCFG_MACHINE_RESET_OVERRIDE(pacman_state,maketrax) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( korosuke, maketrax ) +MACHINE_CONFIG_DERIVED(pacman_state::korosuke, maketrax) MCFG_DEVICE_MODIFY("mainlatch") // 8K on original boards MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // outputs 4-7 go to protection chip at 6P MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pengojpm, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::pengojpm, pacman) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pengojpm_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( birdiy, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::birdiy, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3574,7 +3574,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( piranha, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::piranha, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3582,7 +3582,7 @@ static MACHINE_CONFIG_DERIVED( piranha, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nmouse, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::nmouse, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3590,7 +3590,7 @@ static MACHINE_CONFIG_DERIVED( nmouse, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mspacman, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::mspacman, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3601,14 +3601,14 @@ static MACHINE_CONFIG_DERIVED( mspacman, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( woodpek, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::woodpek, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(woodpek_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( numcrash, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::numcrash, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3619,7 +3619,7 @@ static MACHINE_CONFIG_DERIVED( numcrash, pacman ) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // ??? MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( alibaba, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::alibaba, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3638,7 +3638,7 @@ static MACHINE_CONFIG_DERIVED( alibaba, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dremshpr, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::dremshpr, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3656,7 +3656,7 @@ static MACHINE_CONFIG_DERIVED( dremshpr, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( theglobp, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::theglobp, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3668,7 +3668,7 @@ static MACHINE_CONFIG_DERIVED( theglobp, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( acitya, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::acitya, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3680,7 +3680,7 @@ static MACHINE_CONFIG_DERIVED( acitya, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( eeekk, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::eeekk, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3692,7 +3692,7 @@ static MACHINE_CONFIG_DERIVED( eeekk, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vanvan, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::vanvan, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3718,7 +3718,7 @@ static MACHINE_CONFIG_DERIVED( vanvan, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bigbucks, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::bigbucks, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3734,7 +3734,7 @@ static MACHINE_CONFIG_DERIVED( bigbucks, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( s2650games, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::s2650games, pacman) /* basic machine hardware */ MCFG_DEVICE_REMOVE("maincpu") @@ -3771,7 +3771,7 @@ static MACHINE_CONFIG_DERIVED( s2650games, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( drivfrcp, s2650games ) +MACHINE_CONFIG_DERIVED(pacman_state::drivfrcp, s2650games) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3779,7 +3779,7 @@ static MACHINE_CONFIG_DERIVED( drivfrcp, s2650games ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( 8bpm, s2650games ) +MACHINE_CONFIG_DERIVED(pacman_state::_8bpm, s2650games ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3787,7 +3787,7 @@ static MACHINE_CONFIG_DERIVED( 8bpm, s2650games ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( porky, s2650games ) +MACHINE_CONFIG_DERIVED(pacman_state::porky, s2650games) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3795,7 +3795,7 @@ static MACHINE_CONFIG_DERIVED( porky, s2650games ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rocktrv2, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::rocktrv2, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3807,7 +3807,7 @@ static MACHINE_CONFIG_DERIVED( rocktrv2, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mschamp, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::mschamp, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3819,7 +3819,7 @@ static MACHINE_CONFIG_DERIVED( mschamp, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( superabc, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::superabc, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3834,13 +3834,13 @@ static MACHINE_CONFIG_DERIVED( superabc, pacman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( crush4, mschamp ) +MACHINE_CONFIG_DERIVED(pacman_state::crush4, mschamp) /* basic machine hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", crush4) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( crushs, pacman ) +MACHINE_CONFIG_DERIVED(pacman_state::crushs, pacman) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -7364,7 +7364,7 @@ GAME( 1984, eeekk, 0, eeekk, eeekk, pacman_state, 0, ROT GAME( 1984, drivfrcp, 0, drivfrcp, drivfrcp, pacman_state, drivfrcp, ROT90, "Shinkai Inc. (Magic Electronics Inc. license)", "Driving Force (Pac-Man conversion)", MACHINE_SUPPORTS_SAVE ) -GAME( 1985, 8bpm, 8ballact, 8bpm, 8bpm, pacman_state, 8bpm, ROT90, "Seatongrove Ltd (Magic Electronics USA license)", "Eight Ball Action (Pac-Man conversion)", MACHINE_SUPPORTS_SAVE ) +GAME( 1985, 8bpm, 8ballact, _8bpm, 8bpm, pacman_state, 8bpm, ROT90, "Seatongrove Ltd (Magic Electronics USA license)", "Eight Ball Action (Pac-Man conversion)", MACHINE_SUPPORTS_SAVE ) GAME( 1985, porky, 0, porky, porky, pacman_state, porky, ROT90, "Shinkai Inc. (Magic Electronics Inc. license)", "Porky", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/palm.cpp b/src/mame/drivers/palm.cpp index f37ac1c9d37..bacb5b67cd4 100644 --- a/src/mame/drivers/palm.cpp +++ b/src/mame/drivers/palm.cpp @@ -59,6 +59,13 @@ public: required_ioport m_io_portd; offs_t palm_dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms); + void palmiii(machine_config &config); + void pilot1k(machine_config &config); + void palmvx(machine_config &config); + void palmv(machine_config &config); + void palm(machine_config &config); + void palmpro(machine_config &config); + void pilot5k(machine_config &config); }; @@ -167,7 +174,7 @@ ADDRESS_MAP_END MACHINE DRIVERS ***************************************************************************/ -static MACHINE_CONFIG_START( palm ) +MACHINE_CONFIG_START(palm_state::palm) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", M68000, 32768*506 ) /* 16.580608 MHz */ MCFG_CPU_PROGRAM_MAP( palm_map) @@ -418,7 +425,7 @@ ROM_START( spt1740 ) ROM_RELOAD(0x000000, 0x004000) ROM_END -static MACHINE_CONFIG_DERIVED( pilot1k, palm ) +MACHINE_CONFIG_DERIVED(palm_state::pilot1k, palm) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -426,7 +433,7 @@ static MACHINE_CONFIG_DERIVED( pilot1k, palm ) MCFG_RAM_EXTRA_OPTIONS("512K,1M,2M,4M,8M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pilot5k, palm ) +MACHINE_CONFIG_DERIVED(palm_state::pilot5k, palm) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -434,7 +441,7 @@ static MACHINE_CONFIG_DERIVED( pilot5k, palm ) MCFG_RAM_EXTRA_OPTIONS("1M,2M,4M,8M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( palmpro, palm ) +MACHINE_CONFIG_DERIVED(palm_state::palmpro, palm) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -442,7 +449,7 @@ static MACHINE_CONFIG_DERIVED( palmpro, palm ) MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( palmiii, palm ) +MACHINE_CONFIG_DERIVED(palm_state::palmiii, palm) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -450,7 +457,7 @@ static MACHINE_CONFIG_DERIVED( palmiii, palm ) MCFG_RAM_EXTRA_OPTIONS("4M,8M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( palmv, palm ) +MACHINE_CONFIG_DERIVED(palm_state::palmv, palm) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -458,7 +465,7 @@ static MACHINE_CONFIG_DERIVED( palmv, palm ) MCFG_RAM_EXTRA_OPTIONS("4M,8M") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( palmvx, palm ) +MACHINE_CONFIG_DERIVED(palm_state::palmvx, palm) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mame/drivers/palmz22.cpp b/src/mame/drivers/palmz22.cpp index 6a51dd93f49..eb8aeb7e38d 100644 --- a/src/mame/drivers/palmz22.cpp +++ b/src/mame/drivers/palmz22.cpp @@ -103,6 +103,7 @@ public: DECLARE_READ32_MEMBER(s3c2410_core_pin_r); DECLARE_READ32_MEMBER(s3c2410_adc_data_r ); + void palmz22(machine_config &config); }; @@ -278,7 +279,7 @@ DRIVER_INIT_MEMBER(palmz22_state,palmz22) { } -static MACHINE_CONFIG_START( palmz22 ) +MACHINE_CONFIG_START(palmz22_state::palmz22) MCFG_CPU_ADD("maincpu", ARM920T, 266000000) MCFG_CPU_PROGRAM_MAP(palmz22_map) diff --git a/src/mame/drivers/pandoras.cpp b/src/mame/drivers/pandoras.cpp index 6ce65d76df4..397d70d2870 100644 --- a/src/mame/drivers/pandoras.cpp +++ b/src/mame/drivers/pandoras.cpp @@ -305,7 +305,7 @@ READ8_MEMBER(pandoras_state::pandoras_portB_r) return (m_audiocpu->total_cycles() / 512) & 0x0f; } -static MACHINE_CONFIG_START( pandoras ) +MACHINE_CONFIG_START(pandoras_state::pandoras) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/6) /* CPU A */ diff --git a/src/mame/drivers/pangofun.cpp b/src/mame/drivers/pangofun.cpp index 3e46859c913..fe99e2fd940 100644 --- a/src/mame/drivers/pangofun.cpp +++ b/src/mame/drivers/pangofun.cpp @@ -109,6 +109,7 @@ public: DECLARE_DRIVER_INIT(pangofun); virtual void machine_start() override; + void pangofun(machine_config &config); }; @@ -171,7 +172,7 @@ void pangofun_state::machine_start() { } -static MACHINE_CONFIG_START( pangofun ) +MACHINE_CONFIG_START(pangofun_state::pangofun) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I486, 25000000 ) /* I486 ?? Mhz (25 according to POST) */ MCFG_CPU_PROGRAM_MAP(pcat_map) diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp index 0ef131300ac..9cf24043cba 100644 --- a/src/mame/drivers/panicr.cpp +++ b/src/mame/drivers/panicr.cpp @@ -124,6 +124,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect ); TIMER_DEVICE_CALLBACK_MEMBER(scanline); + void panicr(machine_config &config); }; @@ -606,7 +607,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(panicr_state::scanline) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xc8/4); } -static MACHINE_CONFIG_START( panicr ) +MACHINE_CONFIG_START(panicr_state::panicr) MCFG_CPU_ADD("maincpu", V20,MASTER_CLOCK/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */ MCFG_CPU_PROGRAM_MAP(panicr_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", panicr_state, scanline, "screen", 0, 1) diff --git a/src/mame/drivers/paradise.cpp b/src/mame/drivers/paradise.cpp index d1063fc72b1..656abd92de2 100644 --- a/src/mame/drivers/paradise.cpp +++ b/src/mame/drivers/paradise.cpp @@ -726,7 +726,7 @@ INTERRUPT_GEN_MEMBER(paradise_state::irq) m_maincpu->set_input_line(INPUT_LINE_IRQ0, HOLD_LINE); } -static MACHINE_CONFIG_START( paradise ) +MACHINE_CONFIG_START(paradise_state::paradise) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Z8400B - 6mhz Verified */ @@ -758,14 +758,14 @@ static MACHINE_CONFIG_START( paradise ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tgtball, paradise ) +MACHINE_CONFIG_DERIVED(paradise_state::tgtball, paradise) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tgtball_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( torus, paradise ) +MACHINE_CONFIG_DERIVED(paradise_state::torus, paradise) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -779,7 +779,7 @@ static MACHINE_CONFIG_DERIVED( torus, paradise ) MCFG_DEVICE_REMOVE("oki2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( madball, torus ) +MACHINE_CONFIG_DERIVED(paradise_state::madball, torus) MCFG_GFXDECODE_MODIFY("gfxdecode", madball) @@ -787,7 +787,7 @@ static MACHINE_CONFIG_DERIVED( madball, torus ) MCFG_SCREEN_UPDATE_DRIVER(paradise_state, screen_update_madball) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( penky, paradise ) +MACHINE_CONFIG_DERIVED(paradise_state::penky, paradise) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -796,7 +796,7 @@ static MACHINE_CONFIG_DERIVED( penky, paradise ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( penkyi, penky ) +MACHINE_CONFIG_DERIVED(paradise_state::penkyi, penky) // TODO add ticket dispenser diff --git a/src/mame/drivers/paranoia.cpp b/src/mame/drivers/paranoia.cpp index 53b265ed0cf..dae6f71a90e 100644 --- a/src/mame/drivers/paranoia.cpp +++ b/src/mame/drivers/paranoia.cpp @@ -64,6 +64,7 @@ public: DECLARE_WRITE8_MEMBER(i8155_b_w); DECLARE_WRITE8_MEMBER(i8155_c_w); DECLARE_WRITE_LINE_MEMBER(i8155_timer_out); + void paranoia(machine_config &config); }; @@ -155,7 +156,7 @@ WRITE_LINE_MEMBER(paranoia_state::i8155_timer_out) //logerror("Timer out %d\n", state); } -static MACHINE_CONFIG_START( paranoia ) +MACHINE_CONFIG_START(paranoia_state::paranoia) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3) MCFG_CPU_PROGRAM_MAP(pce_mem) diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp index eef94f93b94..e4921923328 100644 --- a/src/mame/drivers/parodius.cpp +++ b/src/mame/drivers/parodius.cpp @@ -224,7 +224,7 @@ WRITE8_MEMBER( parodius_state::banking_callback ) membank("bank1")->set_entry((data & 0x0f) ^ 0x0f); } -static MACHINE_CONFIG_START( parodius ) +MACHINE_CONFIG_START(parodius_state::parodius) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* 053248 */ diff --git a/src/mame/drivers/partner.cpp b/src/mame/drivers/partner.cpp index b059fdd7224..5e33d34f39f 100644 --- a/src/mame/drivers/partner.cpp +++ b/src/mame/drivers/partner.cpp @@ -167,7 +167,7 @@ static GFXDECODE_START( partner ) GFXDECODE_END -static MACHINE_CONFIG_START( partner ) +MACHINE_CONFIG_START(partner_state::partner) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_16MHz / 9) MCFG_CPU_PROGRAM_MAP(partner_mem) diff --git a/src/mame/drivers/pasha2.cpp b/src/mame/drivers/pasha2.cpp index 6a439e18c91..64cc3404601 100644 --- a/src/mame/drivers/pasha2.cpp +++ b/src/mame/drivers/pasha2.cpp @@ -124,6 +124,7 @@ public: required_device m_oki1; required_device m_oki2; required_device m_palette; + void pasha2(machine_config &config); }; @@ -412,7 +413,7 @@ void pasha2_state::machine_reset() m_vbuffer = 0; } -static MACHINE_CONFIG_START( pasha2 ) +MACHINE_CONFIG_START(pasha2_state::pasha2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", E116XT, 20000000*4) /* 4x internal multiplier */ diff --git a/src/mame/drivers/paso1600.cpp b/src/mame/drivers/paso1600.cpp index 1ffd41e6725..7db517f20bd 100644 --- a/src/mame/drivers/paso1600.cpp +++ b/src/mame/drivers/paso1600.cpp @@ -49,6 +49,7 @@ public: DECLARE_WRITE8_MEMBER(pc_dma_write_byte); uint32_t screen_update_paso1600(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void paso1600(machine_config &config); private: uint8_t m_crtc_vreg[0x100],m_crtc_index; struct{ @@ -296,7 +297,7 @@ WRITE8_MEMBER(paso1600_state::pc_dma_write_byte) space.write_byte(offset, data); } -static MACHINE_CONFIG_START( paso1600 ) +MACHINE_CONFIG_START(paso1600_state::paso1600) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, 16000000/2) MCFG_CPU_PROGRAM_MAP(paso1600_map) diff --git a/src/mame/drivers/pasogo.cpp b/src/mame/drivers/pasogo.cpp index f9eb18c9e66..e923ed1967e 100644 --- a/src/mame/drivers/pasogo.cpp +++ b/src/mame/drivers/pasogo.cpp @@ -174,6 +174,7 @@ public: memory_region *m_cart_rom; uint8_t m_ems_index; uint16_t m_ems_bank[28]; + void pasogo(machine_config &config); }; @@ -533,7 +534,7 @@ void pasogo_state::machine_reset() contrast(*color->fields().first(), nullptr, 0, color->read()); } -static MACHINE_CONFIG_START( pasogo ) +MACHINE_CONFIG_START(pasogo_state::pasogo) MCFG_CPU_ADD("maincpu", V30, XTAL_32_22MHz/2) MCFG_CPU_PROGRAM_MAP(pasogo_mem) diff --git a/src/mame/drivers/pasopia.cpp b/src/mame/drivers/pasopia.cpp index 15fda1c91be..892ebd9b749 100644 --- a/src/mame/drivers/pasopia.cpp +++ b/src/mame/drivers/pasopia.cpp @@ -53,6 +53,7 @@ public: DECLARE_DRIVER_INIT(pasopia); TIMER_CALLBACK_MEMBER(pio_timer); + void pasopia(machine_config &config); private: uint8_t m_hblank; uint16_t m_vram_addr; @@ -277,7 +278,7 @@ We preset all banks here, so that bankswitching will incur no speed penalty. m_pio_timer->adjust(attotime::from_hz(50), 0, attotime::from_hz(50)); } -static MACHINE_CONFIG_START( pasopia ) +MACHINE_CONFIG_START(pasopia_state::pasopia) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(pasopia_map) diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp index edc4671dce5..689f596dd9b 100644 --- a/src/mame/drivers/pasopia7.cpp +++ b/src/mame/drivers/pasopia7.cpp @@ -88,6 +88,9 @@ public: DECLARE_PALETTE_INIT(p7_lcd); uint32_t screen_update_pasopia7(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void p7_base(machine_config &config); + void p7_lcd(machine_config &config); + void p7_raster(machine_config &config); private: uint8_t m_vram_sel; uint8_t m_mio_sel; @@ -908,7 +911,7 @@ static SLOT_INTERFACE_START( pasopia7_floppies ) SLOT_INTERFACE( "525hd", FLOPPY_525_HD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( p7_base ) +MACHINE_CONFIG_START(pasopia7_state::p7_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(pasopia7_mem) @@ -959,7 +962,7 @@ static MACHINE_CONFIG_START( p7_base ) MCFG_FLOPPY_DRIVE_ADD("fdc:1", pasopia7_floppies, "525hd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( p7_raster, p7_base ) +MACHINE_CONFIG_DERIVED(pasopia7_state::p7_raster, p7_base) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ @@ -978,7 +981,7 @@ static MACHINE_CONFIG_DERIVED( p7_raster, p7_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( p7_lcd, p7_base ) +MACHINE_CONFIG_DERIVED(pasopia7_state::p7_lcd, p7_base) MCFG_SCREEN_ADD("screen", LCD) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ diff --git a/src/mame/drivers/pass.cpp b/src/mame/drivers/pass.cpp index 5392255da57..94693566ca8 100644 --- a/src/mame/drivers/pass.cpp +++ b/src/mame/drivers/pass.cpp @@ -237,7 +237,7 @@ static GFXDECODE_START( pass ) GFXDECODE_END /* todo : is this correct? */ -static MACHINE_CONFIG_START( pass ) +MACHINE_CONFIG_START(pass_state::pass) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14318180/2 ) diff --git a/src/mame/drivers/pastelg.cpp b/src/mame/drivers/pastelg.cpp index 4b1c601609e..d26b5c22672 100644 --- a/src/mame/drivers/pastelg.cpp +++ b/src/mame/drivers/pastelg.cpp @@ -394,7 +394,7 @@ static INPUT_PORTS_START( galds ) INPUT_PORTS_END -static MACHINE_CONFIG_START( pastelg ) +MACHINE_CONFIG_START(pastelg_state::pastelg) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 19968000/4) /* unknown divider, galds definitely relies on this for correct voice pitch */ @@ -455,7 +455,7 @@ Note */ -static MACHINE_CONFIG_START( threeds ) +MACHINE_CONFIG_START(pastelg_state::threeds) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 19968000/4) /* unknown divider, galds definitely relies on this for correct voice pitch */ diff --git a/src/mame/drivers/patapata.cpp b/src/mame/drivers/patapata.cpp index 6971bf7416a..2fc4ba0f9f3 100644 --- a/src/mame/drivers/patapata.cpp +++ b/src/mame/drivers/patapata.cpp @@ -48,6 +48,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void patapata(machine_config &config); protected: virtual void video_start() override; @@ -280,7 +281,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(patapata_state::scanline) if (param==128) m_maincpu->set_input_line(1, HOLD_LINE); } -static MACHINE_CONFIG_START( patapata ) +MACHINE_CONFIG_START(patapata_state::patapata) MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // 16 MHz XTAL, 16 MHz CPU MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/patinho_feio.cpp b/src/mame/drivers/patinho_feio.cpp index 211fa4f95b0..a58d54d656a 100644 --- a/src/mame/drivers/patinho_feio.cpp +++ b/src/mame/drivers/patinho_feio.cpp @@ -241,7 +241,7 @@ static INPUT_PORTS_START( patinho_feio ) PORT_BIT(0x800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("MEMORIA (Liberada/Protegida)") PORT_CODE(KEYCODE_M) PORT_TOGGLE INPUT_PORTS_END -static MACHINE_CONFIG_START( patinho_feio ) +MACHINE_CONFIG_START(patinho_feio_state::patinho_feio) /* basic machine hardware */ /* CPU @ approx. 500 kHz (memory cycle time is 2usec) */ MCFG_CPU_ADD("maincpu", PATO_FEIO_CPU, 500000) diff --git a/src/mame/drivers/pb1000.cpp b/src/mame/drivers/pb1000.cpp index 3e60c1a1b0a..93dc146bbb1 100644 --- a/src/mame/drivers/pb1000.cpp +++ b/src/mame/drivers/pb1000.cpp @@ -74,6 +74,8 @@ public: uint16_t read_touchscreen(uint8_t line); DECLARE_PALETTE_INIT(pb1000); TIMER_CALLBACK_MEMBER(keyboard_timer); + void pb2000c(machine_config &config); + void pb1000(machine_config &config); }; static ADDRESS_MAP_START(pb1000_mem, AS_PROGRAM, 16, pb1000_state) @@ -474,7 +476,7 @@ void pb1000_state::machine_start() m_kb_timer->adjust(attotime::from_hz(192), 0, attotime::from_hz(192)); } -static MACHINE_CONFIG_START( pb1000 ) +MACHINE_CONFIG_START(pb1000_state::pb1000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD61700, 910000) MCFG_CPU_PROGRAM_MAP(pb1000_mem) @@ -512,7 +514,7 @@ static MACHINE_CONFIG_START( pb1000 ) MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pb2000c, pb1000 ) +MACHINE_CONFIG_DERIVED(pb1000_state::pb2000c, pb1000) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pb2000c_mem) diff --git a/src/mame/drivers/pbaction.cpp b/src/mame/drivers/pbaction.cpp index d163c427e6e..786eaf9aa13 100644 --- a/src/mame/drivers/pbaction.cpp +++ b/src/mame/drivers/pbaction.cpp @@ -281,7 +281,7 @@ INTERRUPT_GEN_MEMBER(pbaction_state::vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( pbaction ) +MACHINE_CONFIG_START(pbaction_state::pbaction) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */ @@ -323,7 +323,7 @@ static MACHINE_CONFIG_START( pbaction ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pbactionx, pbaction ) +MACHINE_CONFIG_DERIVED(pbaction_state::pbactionx, pbaction) MCFG_CPU_REPLACE("maincpu", SEGA_CPU_PBACTIO4, 4000000) /* 4 MHz? */ MCFG_CPU_PROGRAM_MAP(pbaction_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", pbaction_state, vblank_irq) diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp index b04cf4e2539..1f6b2d822ef 100644 --- a/src/mame/drivers/pc.cpp +++ b/src/mame/drivers/pc.cpp @@ -371,6 +371,30 @@ public: DECLARE_INPUT_CHANGED_MEMBER(pc_turbo_callback); double m_turbo_off_speed; + + static void cfg_dual_720K(device_t *device); + static void cfg_single_360K(device_t *device); + static void cfg_single_720K(device_t *device); + + void ataripc1(machine_config &config); + void ncrpc4i(machine_config &config); + void kaypro16(machine_config &config); + void epc(machine_config &config); + void m15(machine_config &config); + void bondwell(machine_config &config); + void siemens(machine_config &config); + void iskr3104(machine_config &config); + void poisk2(machine_config &config); + void dgone(machine_config &config); + void pccga(machine_config &config); + void mk88(machine_config &config); + void eppc(machine_config &config); + void olytext30(machine_config &config); + void laser_xt3(machine_config &config); + void zenith(machine_config &config); + void eagle1600(machine_config &config); + void laser_turbo_xt(machine_config &config); + void ibm5550(machine_config &config); }; static ADDRESS_MAP_START( pc8_map, AS_PROGRAM, 8, pc_state ) @@ -479,7 +503,7 @@ DEVICE_INPUT_DEFAULTS_END MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb) -static MACHINE_CONFIG_START( pccga ) +MACHINE_CONFIG_START(pc_state::pccga) /* basic machine hardware */ MCFG_CPU_PC(pc8, pc8, I8088, 4772720) /* 4,77 MHz */ @@ -503,36 +527,34 @@ static MACHINE_CONFIG_START( pccga ) MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5150") MACHINE_CONFIG_END +void pc_state::cfg_dual_720K(device_t *device) +{ + device_slot_interface::static_set_default_option(*device->subdevice("fdc:0"), "35dd"); + device_slot_interface::static_set_default_option(*device->subdevice("fdc:1"), "35dd"); +} -static MACHINE_CONFIG_START( cfg_dual_720K ) - MCFG_DEVICE_MODIFY("fdc:0") - MCFG_SLOT_DEFAULT_OPTION("35dd") - MCFG_DEVICE_MODIFY("fdc:1") - MCFG_SLOT_DEFAULT_OPTION("35dd") -MACHINE_CONFIG_END - -static MACHINE_CONFIG_START( cfg_single_360K ) - MCFG_DEVICE_MODIFY("fdc:0") - MCFG_SLOT_DEFAULT_OPTION("525dd") - MCFG_SLOT_FIXED(true) - MCFG_DEVICE_REMOVE("fdc:1") -MACHINE_CONFIG_END +void pc_state::cfg_single_360K(device_t *device) +{ + device_slot_interface::static_set_default_option(*device->subdevice("fdc:0"), "525dd"); + device_slot_interface::static_set_fixed(*device->subdevice("fdc:0"), true); + device_slot_interface::static_set_default_option(*device->subdevice("fdc:1"), ""); +} -static MACHINE_CONFIG_START( cfg_single_720K ) - MCFG_DEVICE_MODIFY("fdc:0") - MCFG_SLOT_DEFAULT_OPTION("35dd") - MCFG_SLOT_FIXED(true) - MCFG_DEVICE_REMOVE("fdc:1") -MACHINE_CONFIG_END +void pc_state::cfg_single_720K(device_t *device) +{ + device_slot_interface::static_set_default_option(*device->subdevice("fdc:0"), "35dd"); + device_slot_interface::static_set_fixed(*device->subdevice("fdc:0"), true); + device_slot_interface::static_set_default_option(*device->subdevice("fdc:1"), ""); +} //Data General One -static MACHINE_CONFIG_DERIVED( dgone, pccga ) +MACHINE_CONFIG_DERIVED(pc_state::dgone, pccga) MCFG_DEVICE_MODIFY("isa2") MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc_xt", cfg_dual_720K) MACHINE_CONFIG_END // Ericsson Information System -static MACHINE_CONFIG_DERIVED( epc, pccga ) +MACHINE_CONFIG_DERIVED(pc_state::epc, pccga) MCFG_DEVICE_REMOVE("maincpu") MCFG_CPU_PC(pc8, epc, I8088, 4772720) MCFG_DEVICE_MODIFY("isa1") @@ -540,7 +562,7 @@ static MACHINE_CONFIG_DERIVED( epc, pccga ) MCFG_DEVICE_ADD("i8251", I8251, 0) // clock? MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( eppc, pccga ) +MACHINE_CONFIG_DERIVED(pc_state::eppc, pccga) MACHINE_CONFIG_END // Bondwell BW230 @@ -553,7 +575,7 @@ static INPUT_PORTS_START( bondwell ) PORT_DIPSETTING( 0x02, "On (12 MHz)" ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED(bondwell, pccga) +MACHINE_CONFIG_DERIVED(pc_state::bondwell, pccga) MCFG_DEVICE_REMOVE("maincpu") MCFG_CPU_PC(pc8, pc8, I8088, 4772720) // turbo? MACHINE_CONFIG_END @@ -564,7 +586,7 @@ static DEVICE_INPUT_DEFAULTS_START( iskr3104 ) DEVICE_INPUT_DEFAULTS("DSW0", 0x30, 0x00) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( iskr3104 ) +MACHINE_CONFIG_START(pc_state::iskr3104) /* basic machine hardware */ MCFG_CPU_PC(pc16, pc16, I8086, 4772720) @@ -588,7 +610,7 @@ MACHINE_CONFIG_END //Poisk-2 -static MACHINE_CONFIG_START( poisk2 ) +MACHINE_CONFIG_START(pc_state::poisk2) /* basic machine hardware */ MCFG_CPU_PC(pc16, pc16, I8086, 4772720) @@ -610,14 +632,14 @@ MACHINE_CONFIG_END //MK-88 -static MACHINE_CONFIG_DERIVED(mk88, poisk2) +MACHINE_CONFIG_DERIVED(pc_state::mk88, poisk2) MCFG_DEVICE_MODIFY("isa1") MCFG_SLOT_DEFAULT_OPTION("cga_ec1841") MACHINE_CONFIG_END // Zenith SuperSport -static MACHINE_CONFIG_START( zenith ) +MACHINE_CONFIG_START(pc_state::zenith) /* basic machine hardware */ MCFG_CPU_PC(zenith, pc8, I8088, XTAL_14_31818MHz/3) /* 4,77 MHz */ @@ -643,7 +665,7 @@ MACHINE_CONFIG_END //NCR PC4i -static MACHINE_CONFIG_DERIVED ( ncrpc4i, pccga ) +MACHINE_CONFIG_DERIVED(pc_state::ncrpc4i, pccga) //MCFG_DEVICE_MODIFY("mb:isa") MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, nullptr, false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa7", pc_isa8_cards, nullptr, false) @@ -659,7 +681,7 @@ static DEVICE_INPUT_DEFAULTS_START( siemens ) DEVICE_INPUT_DEFAULTS("DSW0", 0x30, 0x30) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( siemens ) +MACHINE_CONFIG_START(pc_state::siemens) /* basic machine hardware */ MCFG_CPU_PC(pc8, pc8, I8088, XTAL_14_31818MHz/3) /* 4,77 MHz */ @@ -684,7 +706,7 @@ MACHINE_CONFIG_END // IBM 5550 -static MACHINE_CONFIG_START( ibm5550 ) +MACHINE_CONFIG_START(pc_state::ibm5550) /* basic machine hardware */ MCFG_CPU_PC(pc16, ibm5550, I8086, 8000000) @@ -711,7 +733,7 @@ static DEVICE_INPUT_DEFAULTS_START( m15 ) DEVICE_INPUT_DEFAULTS("DSW0", 0x01, 0x00) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_DERIVED(m15, pccga) +MACHINE_CONFIG_DERIVED(pc_state::m15, pccga) MCFG_DEVICE_MODIFY("mb") MCFG_DEVICE_INPUT_DEFAULTS(m15) MCFG_DEVICE_MODIFY("isa2") @@ -723,7 +745,7 @@ MACHINE_CONFIG_END // Atari PC1 -static MACHINE_CONFIG_DERIVED(ataripc1, pccga) +MACHINE_CONFIG_DERIVED(pc_state::ataripc1, pccga) MCFG_DEVICE_MODIFY("isa1") MCFG_SLOT_DEFAULT_OPTION("ega") MCFG_DEVICE_MODIFY("isa2") @@ -731,14 +753,14 @@ static MACHINE_CONFIG_DERIVED(ataripc1, pccga) MACHINE_CONFIG_END //Eagle 1600 -static MACHINE_CONFIG_DERIVED(eagle1600, pccga) +MACHINE_CONFIG_DERIVED(pc_state::eagle1600, pccga) MCFG_DEVICE_REMOVE("maincpu") MCFG_CPU_PC(pc16, pc16, I8086, 8000000) MACHINE_CONFIG_END //Laser XT/3 -static MACHINE_CONFIG_START( laser_xt3 ) +MACHINE_CONFIG_START(pc_state::laser_xt3) MCFG_CPU_PC(pc8, pc8, I8088, XTAL_14_31818MHz/3) /* 4,77 MHz */ MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu") @@ -767,7 +789,7 @@ MACHINE_CONFIG_END //Laser Turbo XT -static MACHINE_CONFIG_START( laser_turbo_xt ) +MACHINE_CONFIG_START(pc_state::laser_turbo_xt) MCFG_CPU_PC(pc8, pc8, I8088, XTAL_14_31818MHz/3) /* 4,77 MHz */ MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu") @@ -795,7 +817,7 @@ static MACHINE_CONFIG_START( laser_turbo_xt ) MACHINE_CONFIG_END //Olytext 30 -static MACHINE_CONFIG_DERIVED(olytext30, pccga) +MACHINE_CONFIG_DERIVED(pc_state::olytext30, pccga) MCFG_DEVICE_REMOVE("maincpu") MCFG_CPU_PC(pc8, pc8, V20, XTAL_14_31818MHz/3) /* 4,77 MHz */ MCFG_DEVICE_MODIFY("isa2") @@ -809,7 +831,7 @@ static MACHINE_CONFIG_DERIVED(olytext30, pccga) MACHINE_CONFIG_END // Kaypro 16 -static MACHINE_CONFIG_DERIVED(kaypro16, pccga) +MACHINE_CONFIG_DERIVED(pc_state::kaypro16, pccga) MCFG_DEVICE_MODIFY("isa1") MCFG_SLOT_FIXED(true) MCFG_DEVICE_MODIFY("isa2") diff --git a/src/mame/drivers/pc100.cpp b/src/mame/drivers/pc100.cpp index e0ff6a99a7e..89bfa9191e6 100644 --- a/src/mame/drivers/pc100.cpp +++ b/src/mame/drivers/pc100.cpp @@ -145,6 +145,7 @@ public: WRITE_LINE_MEMBER(rtc_portc_2_w) { m_rtc_portc = (m_rtc_portc & ~(1 << 2)) | ((state & 1) << 2); } WRITE_LINE_MEMBER(rtc_portc_3_w) { m_rtc_portc = (m_rtc_portc & ~(1 << 3)) | ((state & 1) << 3); } uint8_t m_rtc_portc; + void pc100(machine_config &config); }; void pc100_state::video_start() @@ -491,7 +492,7 @@ SLOT_INTERFACE_END #define MASTER_CLOCK 6988800 -static MACHINE_CONFIG_START( pc100 ) +MACHINE_CONFIG_START(pc100_state::pc100) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(pc100_map) diff --git a/src/mame/drivers/pc1500.cpp b/src/mame/drivers/pc1500.cpp index 1620a6a84e8..7f84f913559 100644 --- a/src/mame/drivers/pc1500.cpp +++ b/src/mame/drivers/pc1500.cpp @@ -53,6 +53,7 @@ public: DECLARE_READ8_MEMBER( pc1500_kb_r ); DECLARE_PALETTE_INIT(pc1500); + void pc1500(machine_config &config); }; static ADDRESS_MAP_START( pc1500_mem , AS_PROGRAM, 8, pc1500_state) @@ -262,7 +263,7 @@ PALETTE_INIT_MEMBER(pc1500_state, pc1500) palette.set_pen_color(1, rgb_t(92, 83, 88)); } -static MACHINE_CONFIG_START( pc1500 ) +MACHINE_CONFIG_START(pc1500_state::pc1500) MCFG_CPU_ADD("maincpu", LH5801, 1300000) //1.3 MHz MCFG_CPU_PROGRAM_MAP( pc1500_mem ) MCFG_CPU_IO_MAP( pc1500_mem_io ) diff --git a/src/mame/drivers/pc1512.cpp b/src/mame/drivers/pc1512.cpp index d471a377828..867dce405e1 100644 --- a/src/mame/drivers/pc1512.cpp +++ b/src/mame/drivers/pc1512.cpp @@ -1181,7 +1181,7 @@ void pc1640_state::machine_reset() // MACHINE_CONFIG( pc1512 ) //------------------------------------------------- -static MACHINE_CONFIG_START( pc1512 ) +MACHINE_CONFIG_START(pc1512_state::pc1512) MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_24MHz/3) MCFG_CPU_PROGRAM_MAP(pc1512_mem) MCFG_CPU_IO_MAP(pc1512_io) @@ -1295,7 +1295,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pc1512dd ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pc1512dd, pc1512 ) +MACHINE_CONFIG_DERIVED(pc1512_state::pc1512dd, pc1512) MCFG_DEVICE_MODIFY(PC_FDC_XT_TAG ":1") MCFG_SLOT_DEFAULT_OPTION("525dd") MACHINE_CONFIG_END @@ -1305,7 +1305,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pc1512hd ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pc1512hd, pc1512 ) +MACHINE_CONFIG_DERIVED(pc1512_state::pc1512hd, pc1512) MCFG_DEVICE_MODIFY("isa1") //MCFG_SLOT_DEFAULT_OPTION("wdxt_gen") MCFG_SLOT_DEFAULT_OPTION("hdc") @@ -1316,7 +1316,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pc1640 ) //------------------------------------------------- -static MACHINE_CONFIG_START( pc1640 ) +MACHINE_CONFIG_START(pc1640_state::pc1640) MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_24MHz/3) MCFG_CPU_PROGRAM_MAP(pc1640_mem) MCFG_CPU_IO_MAP(pc1640_io) @@ -1428,7 +1428,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pc1640dd ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pc1640dd, pc1640 ) +MACHINE_CONFIG_DERIVED(pc1640_state::pc1640dd, pc1640) MCFG_DEVICE_MODIFY(PC_FDC_XT_TAG ":1") MCFG_SLOT_DEFAULT_OPTION("525dd") MACHINE_CONFIG_END @@ -1438,7 +1438,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pc1640hd ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pc1640hd, pc1640 ) +MACHINE_CONFIG_DERIVED(pc1640_state::pc1640hd, pc1640) MCFG_DEVICE_MODIFY("isa1") //MCFG_SLOT_DEFAULT_OPTION("wdxt_gen") MCFG_SLOT_DEFAULT_OPTION("hdc") diff --git a/src/mame/drivers/pc2000.cpp b/src/mame/drivers/pc2000.cpp index 82c8d85f16e..6b822b2db1f 100644 --- a/src/mame/drivers/pc2000.cpp +++ b/src/mame/drivers/pc2000.cpp @@ -69,6 +69,8 @@ public: DECLARE_WRITE8_MEMBER( beep_w ); DECLARE_PALETTE_INIT(pc2000); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(pc2000_cart); + void pc2000(machine_config &config); + void gl2000(machine_config &config); }; class gl3000s_state : public pc2000_state @@ -84,6 +86,7 @@ public: required_device m_lcdc_l; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void gl3000s(machine_config &config); }; class gl4004_state : public pc2000_state @@ -95,6 +98,7 @@ public: virtual void machine_start() override; HD44780_PIXEL_UPDATE(gl4000_pixel_update); + void gl4000(machine_config &config); }; class pc1000_state : public pc2000_state @@ -114,6 +118,8 @@ public: DECLARE_READ8_MEMBER( lcdc_control_r ); DECLARE_WRITE8_MEMBER( lcdc_control_w ); HD44780_PIXEL_UPDATE(pc1000_pixel_update); + void misterx(machine_config &config); + void pc1000(machine_config &config); }; @@ -829,7 +835,7 @@ DEVICE_IMAGE_LOAD_MEMBER( pc2000_state, pc2000_cart ) return image_init_result::PASS; } -static MACHINE_CONFIG_START( pc2000 ) +MACHINE_CONFIG_START(pc2000_state::pc2000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) /* probably not accurate */ MCFG_CPU_PROGRAM_MAP(pc2000_mem) @@ -864,7 +870,7 @@ static MACHINE_CONFIG_START( pc2000 ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("pc1000_cart", "pc1000") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gl2000, pc2000 ) +MACHINE_CONFIG_DERIVED(pc2000_state::gl2000, pc2000) MCFG_SOFTWARE_LIST_ADD("cart_list", "gl2000") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("misterx_cart", "misterx") MACHINE_CONFIG_END @@ -886,7 +892,7 @@ HD44780_PIXEL_UPDATE(gl4004_state::gl4000_pixel_update) } } -static MACHINE_CONFIG_DERIVED( gl3000s, pc2000 ) +MACHINE_CONFIG_DERIVED(gl3000s_state::gl3000s, pc2000) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(gl3000s_io) @@ -907,7 +913,7 @@ static MACHINE_CONFIG_DERIVED( gl3000s, pc2000 ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("misterx_cart", "misterx") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gl4000, pc2000 ) +MACHINE_CONFIG_DERIVED(gl4004_state::gl4000, pc2000) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(120, 36) // 4x20 chars MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 36-1) @@ -920,7 +926,7 @@ static MACHINE_CONFIG_DERIVED( gl4000, pc2000 ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("misterx_cart", "misterx") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( misterx, pc2000 ) +MACHINE_CONFIG_DERIVED(pc1000_state::misterx, pc2000) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pc1000_mem) @@ -940,7 +946,7 @@ static MACHINE_CONFIG_DERIVED( misterx, pc2000 ) MCFG_SOFTWARE_LIST_ADD("cart_list", "misterx") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc1000, misterx ) +MACHINE_CONFIG_DERIVED(pc1000_state::pc1000, misterx) MCFG_SOFTWARE_LIST_REMOVE("cart_list") MCFG_SOFTWARE_LIST_REMOVE("pc1000_cart") MCFG_SOFTWARE_LIST_ADD("cart_list", "pc1000") diff --git a/src/mame/drivers/pc4.cpp b/src/mame/drivers/pc4.cpp index fdbc5588278..337a6151d3b 100644 --- a/src/mame/drivers/pc4.cpp +++ b/src/mame/drivers/pc4.cpp @@ -216,7 +216,7 @@ void pc4_state::machine_start() m_blink = 0; } -static MACHINE_CONFIG_START( pc4 ) +MACHINE_CONFIG_START(pc4_state::pc4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(pc4_mem) diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp index 0589b09c203..615bf78d91d 100644 --- a/src/mame/drivers/pc6001.cpp +++ b/src/mame/drivers/pc6001.cpp @@ -271,6 +271,10 @@ public: DECLARE_WRITE8_MEMBER(pc6001_8255_portc_w); DECLARE_READ8_MEMBER(pc6001_8255_portc_r); IRQ_CALLBACK_MEMBER(pc6001_irq_callback); + void pc6001sr(machine_config &config); + void pc6001m2(machine_config &config); + void pc6601(machine_config &config); + void pc6001(machine_config &config); protected: required_device m_maincpu; optional_device m_cassette; @@ -2271,7 +2275,7 @@ GFXDECODE_END #define PC6001_MAIN_CLOCK 7987200 -static MACHINE_CONFIG_START( pc6001 ) +MACHINE_CONFIG_START(pc6001_state::pc6001) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, PC6001_MAIN_CLOCK / 2) // ~4 Mhz MCFG_CPU_PROGRAM_MAP(pc6001_map) @@ -2327,7 +2331,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc6001m2, pc6001 ) +MACHINE_CONFIG_DERIVED(pc6001_state::pc6001m2, pc6001) MCFG_MACHINE_RESET_OVERRIDE(pc6001_state,pc6001m2) @@ -2350,7 +2354,7 @@ static MACHINE_CONFIG_DERIVED( pc6001m2, pc6001 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc6601, pc6001m2 ) +MACHINE_CONFIG_DERIVED(pc6001_state::pc6601, pc6001m2) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", Z80, PC6001_MAIN_CLOCK / 2) @@ -2360,7 +2364,7 @@ static MACHINE_CONFIG_DERIVED( pc6601, pc6001m2 ) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(pc6001_state,pc6001_irq_callback) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc6001sr, pc6001m2 ) +MACHINE_CONFIG_DERIVED(pc6001_state::pc6001sr, pc6001m2) MCFG_MACHINE_RESET_OVERRIDE(pc6001_state,pc6001sr) diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp index f0b54162fed..40fa972135c 100644 --- a/src/mame/drivers/pc8001.cpp +++ b/src/mame/drivers/pc8001.cpp @@ -476,7 +476,7 @@ void pc8001_state::machine_start() /* Machine Drivers */ -static MACHINE_CONFIG_START( pc8001 ) +MACHINE_CONFIG_START(pc8001_state::pc8001) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(pc8001_mem) @@ -526,7 +526,7 @@ static MACHINE_CONFIG_START( pc8001 ) MCFG_RAM_EXTRA_OPTIONS("32K,64K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pc8001mk2 ) +MACHINE_CONFIG_START(pc8001mk2_state::pc8001mk2) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(pc8001mk2_mem) diff --git a/src/mame/drivers/pc8401a.cpp b/src/mame/drivers/pc8401a.cpp index 08a6558e6cd..faeb0370b43 100644 --- a/src/mame/drivers/pc8401a.cpp +++ b/src/mame/drivers/pc8401a.cpp @@ -568,7 +568,7 @@ WRITE8_MEMBER( pc8401a_state::ppi_pc_w ) /* Machine Drivers */ -static MACHINE_CONFIG_START( pc8401a ) +MACHINE_CONFIG_START(pc8401a_state::pc8401a) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) // NEC uPD70008C MCFG_CPU_PROGRAM_MAP(pc8401a_mem) @@ -610,7 +610,7 @@ static MACHINE_CONFIG_START( pc8401a ) MCFG_RAM_EXTRA_OPTIONS("96K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pc8500 ) +MACHINE_CONFIG_START(pc8500_state::pc8500) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) // NEC uPD70008C MCFG_CPU_PROGRAM_MAP(pc8401a_mem) diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp index eb9f69697c4..53f157c22ce 100644 --- a/src/mame/drivers/pc8801.cpp +++ b/src/mame/drivers/pc8801.cpp @@ -472,6 +472,10 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_PALETTE_INIT(pc8801); + void pc8801mc(machine_config &config); + void pc8801fh(machine_config &config); + void pc8801(machine_config &config); + void pc8801ma(machine_config &config); protected: virtual void video_start() override; @@ -2566,7 +2570,7 @@ WRITE_LINE_MEMBER( pc8801_state::rxrdy_w ) // ... } -static MACHINE_CONFIG_START( pc8801 ) +MACHINE_CONFIG_START(pc8801_state::pc8801) /* main CPU */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz */ MCFG_CPU_PROGRAM_MAP(pc8801_mem) @@ -2647,15 +2651,15 @@ static MACHINE_CONFIG_START( pc8801 ) MCFG_TIMER_DRIVER_ADD_PERIODIC("rtc_timer", pc8801_state, pc8801_rtc_irq, attotime::from_hz(600)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc8801fh, pc8801 ) +MACHINE_CONFIG_DERIVED(pc8801_state::pc8801fh, pc8801) MCFG_MACHINE_RESET_OVERRIDE(pc8801_state, pc8801_clock_speed ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc8801ma, pc8801 ) +MACHINE_CONFIG_DERIVED(pc8801_state::pc8801ma, pc8801) MCFG_MACHINE_RESET_OVERRIDE(pc8801_state, pc8801_dic ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc8801mc, pc8801 ) +MACHINE_CONFIG_DERIVED(pc8801_state::pc8801mc, pc8801) MCFG_MACHINE_RESET_OVERRIDE(pc8801_state, pc8801_cdrom ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp index 706c1372442..b4a421867ef 100644 --- a/src/mame/drivers/pc88va.cpp +++ b/src/mame/drivers/pc88va.cpp @@ -187,6 +187,7 @@ DECLARE_WRITE8_MEMBER(dma_memw_cb); void execute_spron_cmd(); void execute_sprsw_cmd(); + void pc88va(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; required_device m_gfxdecode; @@ -1779,7 +1780,7 @@ printf("%08x %02x\n",offset,data); } -static MACHINE_CONFIG_START( pc88va ) +MACHINE_CONFIG_START(pc88va_state::pc88va) MCFG_CPU_ADD("maincpu", V30, 8000000) /* 8 MHz */ MCFG_CPU_PROGRAM_MAP(pc88va_map) diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index 6267f6b38b1..d051b25cbfd 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -2213,12 +2213,12 @@ SLOT_INTERFACE_START(pc9801_atapi_devices) SLOT_INTERFACE("pc9801_cd", PC9801_CD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( pc9801_keyboard ) +MACHINE_CONFIG_START(pc9801_state::pc9801_keyboard) MCFG_DEVICE_ADD("keyb", PC9801_KBD, 53) MCFG_PC9801_KBD_IRQ_CALLBACK(DEVWRITELINE("pic8259_master", pic8259_device, ir1_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pc9801_mouse ) +MACHINE_CONFIG_START(pc9801_state::pc9801_mouse) MCFG_DEVICE_ADD("ppi8255_mouse", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(pc9801_state, ppi_mouse_porta_r)) MCFG_I8255_OUT_PORTA_CB(WRITE8(pc9801_state, ppi_mouse_porta_w)) @@ -2230,13 +2230,13 @@ static MACHINE_CONFIG_START( pc9801_mouse ) MCFG_TIMER_DRIVER_ADD_PERIODIC("mouse_timer", pc9801_state, mouse_irq_cb, attotime::from_hz(120)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pc9801_cbus ) +MACHINE_CONFIG_START(pc9801_state::pc9801_cbus) MCFG_PC9801CBUS_SLOT_ADD("cbus0", pc9801_cbus, "pc9801_26") MCFG_PC9801CBUS_SLOT_ADD("cbus1", pc9801_cbus, nullptr) // TODO: six max slots MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pc9801_sasi ) +MACHINE_CONFIG_START(pc9801_state::pc9801_sasi) MCFG_DEVICE_ADD(SASIBUS_TAG, SCSI_PORT, 0) MCFG_SCSI_DATA_INPUT_BUFFER("sasi_data_in") MCFG_SCSI_IO_HANDLER(WRITELINE(pc9801_state, write_sasi_io)) // bit2 @@ -2258,7 +2258,7 @@ static MACHINE_CONFIG_START( pc9801_sasi ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pc9801_ide ) +MACHINE_CONFIG_START(pc9801_state::pc9801_ide) MCFG_ATA_INTERFACE_ADD("ide1", ata_devices, "hdd", nullptr, false) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(pc9801_state, ide1_irq_w)) MCFG_ATA_INTERFACE_ADD("ide2", pc9801_atapi_devices, "pc9801_cd", nullptr, false) @@ -2267,7 +2267,7 @@ static MACHINE_CONFIG_START( pc9801_ide ) MCFG_SOFTWARE_LIST_ADD("cd_list","pc98_cd") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pc9801_common ) +MACHINE_CONFIG_START(pc9801_state::pc9801_common) MCFG_DEVICE_ADD("pit8253", PIT8253, 0) MCFG_PIT8253_CLK0(MAIN_CLOCK_X1) /* heartbeat IRQ */ MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259_master", pic8259_device, ir0_w)) @@ -2349,7 +2349,7 @@ static MACHINE_CONFIG_START( pc9801_common ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc9801) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pc9801 ) +MACHINE_CONFIG_START(pc9801_state::pc9801) MCFG_CPU_ADD("maincpu", I8086, 5000000) //unknown clock MCFG_CPU_PROGRAM_MAP(pc9801_map) MCFG_CPU_IO_MAP(pc9801_io) @@ -2384,7 +2384,7 @@ static MACHINE_CONFIG_START( pc9801 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pc9801rs ) +MACHINE_CONFIG_START(pc9801_state::pc9801rs) MCFG_CPU_ADD("maincpu", I386SX, MAIN_CLOCK_X1*8) // unknown clock. MCFG_CPU_PROGRAM_MAP(pc9801rs_map) MCFG_CPU_IO_MAP(pc9801rs_io) @@ -2420,7 +2420,7 @@ static MACHINE_CONFIG_START( pc9801rs ) MCFG_PALETTE_INIT_OWNER(pc9801_state,pc9801) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc9801vm, pc9801rs ) +MACHINE_CONFIG_DERIVED(pc9801_state::pc9801vm, pc9801rs) MCFG_CPU_REPLACE("maincpu",V30,10000000) MCFG_CPU_PROGRAM_MAP(pc9801ux_map) MCFG_CPU_IO_MAP(pc9801ux_io) @@ -2434,7 +2434,7 @@ static MACHINE_CONFIG_DERIVED( pc9801vm, pc9801rs ) MCFG_MACHINE_RESET_OVERRIDE(pc9801_state,pc9801_common) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc9801ux, pc9801rs ) +MACHINE_CONFIG_DERIVED(pc9801_state::pc9801ux, pc9801rs) MCFG_CPU_REPLACE("maincpu",I80286,10000000) MCFG_CPU_PROGRAM_MAP(pc9801ux_map) MCFG_CPU_IO_MAP(pc9801ux_io) @@ -2444,7 +2444,7 @@ static MACHINE_CONFIG_DERIVED( pc9801ux, pc9801rs ) // MCFG_DEVICE_MODIFY("i8237", AM9157A, 10000000) // unknown clock MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc9801bx2, pc9801rs ) +MACHINE_CONFIG_DERIVED(pc9801_state::pc9801bx2, pc9801rs) MCFG_CPU_REPLACE("maincpu",I486,25000000) MCFG_CPU_PROGRAM_MAP(pc9821_map) MCFG_CPU_IO_MAP(pc9821_io) @@ -2454,7 +2454,7 @@ static MACHINE_CONFIG_DERIVED( pc9801bx2, pc9801rs ) MCFG_MACHINE_START_OVERRIDE(pc9801_state,pc9801bx2) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc9821, pc9801rs ) +MACHINE_CONFIG_DERIVED(pc9801_state::pc9821, pc9801rs) MCFG_CPU_REPLACE("maincpu", I486, 16000000) // unknown clock MCFG_CPU_PROGRAM_MAP(pc9821_map) MCFG_CPU_IO_MAP(pc9821_io) @@ -2477,7 +2477,7 @@ static MACHINE_CONFIG_DERIVED( pc9821, pc9801rs ) MCFG_PALETTE_INIT_OWNER(pc9801_state,pc9801) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc9821ap2, pc9821) +MACHINE_CONFIG_DERIVED(pc9801_state::pc9821ap2, pc9821) MCFG_CPU_REPLACE("maincpu", I486, 66666667) // unknown clock MCFG_CPU_PROGRAM_MAP(pc9821_map) MCFG_CPU_IO_MAP(pc9821_io) @@ -2487,7 +2487,7 @@ static MACHINE_CONFIG_DERIVED( pc9821ap2, pc9821) MCFG_MACHINE_START_OVERRIDE(pc9801_state,pc9821ap2) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc9821v20, pc9821 ) +MACHINE_CONFIG_DERIVED(pc9801_state::pc9821v20, pc9821) MCFG_CPU_REPLACE("maincpu",PENTIUM,32000000) /* TODO: clock */ MCFG_CPU_PROGRAM_MAP(pc9821_map) MCFG_CPU_IO_MAP(pc9821_io) diff --git a/src/mame/drivers/pcat_dyn.cpp b/src/mame/drivers/pcat_dyn.cpp index 55958f3d9ad..31046a39ae6 100644 --- a/src/mame/drivers/pcat_dyn.cpp +++ b/src/mame/drivers/pcat_dyn.cpp @@ -59,6 +59,8 @@ public: DECLARE_WRITE8_MEMBER(dma8237_1_dack_w); virtual void machine_start() override; void nvram_init(nvram_device &nvram, void *base, size_t size); + static void pcat_dyn_sb_conf(device_t *device); + void pcat_dyn(machine_config &config); }; void pcat_dyn_state::machine_start() @@ -147,12 +149,13 @@ static DEVICE_INPUT_DEFAULTS_START( pcat_dyn_sb_def ) DEVICE_INPUT_DEFAULTS("CONFIG", 0x03, 0x01) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( pcat_dyn_sb_conf ) - MCFG_DEVICE_MODIFY("pc_joy") +void pcat_dyn_state::pcat_dyn_sb_conf(device_t *device) +{ + device = device->subdevice("pc_joy"); MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, nullptr, true) // remove joystick -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_START( pcat_dyn ) +MACHINE_CONFIG_START(pcat_dyn_state::pcat_dyn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I486, 40000000) /* Am486 DX-40 */ MCFG_CPU_PROGRAM_MAP(pcat_map) diff --git a/src/mame/drivers/pcat_nit.cpp b/src/mame/drivers/pcat_nit.cpp index 2dbc6ba87a9..e64170f5742 100644 --- a/src/mame/drivers/pcat_nit.cpp +++ b/src/mame/drivers/pcat_nit.cpp @@ -107,6 +107,8 @@ public: DECLARE_READ8_MEMBER(pcat_nit_io_r); DECLARE_DRIVER_INIT(pcat_nit); virtual void machine_start() override; + void bonanza(machine_config &config); + void pcat_nit(machine_config &config); }; /************************************* @@ -218,7 +220,7 @@ void pcat_nit_state::machine_start() membank("rombank")->set_entry(0); } -static MACHINE_CONFIG_START( pcat_nit ) +MACHINE_CONFIG_START(pcat_nit_state::pcat_nit) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */ MCFG_CPU_PROGRAM_MAP(pcat_map) @@ -237,7 +239,7 @@ static MACHINE_CONFIG_START( pcat_nit ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bonanza ) +MACHINE_CONFIG_START(pcat_nit_state::bonanza) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */ MCFG_CPU_PROGRAM_MAP(bonanza_map) diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp index fe002e1488f..3bea28e01bc 100644 --- a/src/mame/drivers/pcd.cpp +++ b/src/mame/drivers/pcd.cpp @@ -80,6 +80,8 @@ public: DECLARE_WRITE_LINE_MEMBER(write_scsi_msg); DECLARE_WRITE_LINE_MEMBER(write_scsi_req); + void pcx(machine_config &config); + void pcd(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -487,7 +489,7 @@ static INPUT_PORTS_START(pcx) PORT_CONFSETTING(0x02, "SINIX 1.2") INPUT_PORTS_END -static MACHINE_CONFIG_START( pcd ) +MACHINE_CONFIG_START(pcd_state::pcd) MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(pcd_map) MCFG_CPU_IO_MAP(pcd_io) @@ -568,7 +570,7 @@ static MACHINE_CONFIG_START( pcd ) MCFG_SCSIDEV_ADD("scsi:1", "harddisk", OMTI5100, SCSI_ID_0) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(pcx, pcd) +MACHINE_CONFIG_DERIVED(pcd_state::pcx, pcd) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(pcx_io) diff --git a/src/mame/drivers/pce.cpp b/src/mame/drivers/pce.cpp index 8c76d52a286..93c711635c9 100644 --- a/src/mame/drivers/pce.cpp +++ b/src/mame/drivers/pce.cpp @@ -305,7 +305,7 @@ static SLOT_INTERFACE_START(pce_cart) SLOT_INTERFACE_INTERNAL("sf2", PCE_ROM_SF2) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( pce_common ) +MACHINE_CONFIG_START(pce_state::pce_common) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H6280, MAIN_CLOCK/3) MCFG_CPU_PROGRAM_MAP(pce_mem) @@ -343,19 +343,19 @@ static MACHINE_CONFIG_START( pce_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pce, pce_common ) +MACHINE_CONFIG_DERIVED(pce_state::pce, pce_common) MCFG_PCE_CARTRIDGE_ADD("cartslot", pce_cart, nullptr) MCFG_SOFTWARE_LIST_ADD("cart_list","pce") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tg16, pce_common ) +MACHINE_CONFIG_DERIVED(pce_state::tg16, pce_common) MCFG_TG16_CARTRIDGE_ADD("cartslot", pce_cart, nullptr) MCFG_SOFTWARE_LIST_ADD("cart_list","tg16") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sgx ) +MACHINE_CONFIG_START(pce_state::sgx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H6280, MAIN_CLOCK/3) MCFG_CPU_PROGRAM_MAP(sgx_mem) diff --git a/src/mame/drivers/pce220.cpp b/src/mame/drivers/pce220.cpp index 903cb8af270..4d2cdbc829b 100644 --- a/src/mame/drivers/pce220.cpp +++ b/src/mame/drivers/pce220.cpp @@ -103,6 +103,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(kb_irq); DECLARE_INPUT_CHANGED_MEMBER(on_irq); TIMER_DEVICE_CALLBACK_MEMBER(pce220_timer_callback); + void pce220(machine_config &config); }; class pcg850v_state : public pce220_state @@ -126,6 +127,8 @@ public: DECLARE_WRITE8_MEMBER( g850v_lcd_control_w ); DECLARE_READ8_MEMBER( g850v_lcd_data_r ); DECLARE_WRITE8_MEMBER( g850v_lcd_data_w ); + void pcg850v(machine_config &config); + void pcg815(machine_config &config); }; uint32_t pce220_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -926,7 +929,7 @@ PALETTE_INIT_MEMBER(pce220_state,pce220) } -static MACHINE_CONFIG_START( pce220 ) +MACHINE_CONFIG_START(pce220_state::pce220) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, 3072000 ) // CMOS-SC7852 MCFG_CPU_PROGRAM_MAP(pce220_mem) @@ -962,7 +965,7 @@ static MACHINE_CONFIG_START( pce220 ) MCFG_PCE220_SERIAL_ADD(PCE220SERIAL_TAG) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pcg815 ) +MACHINE_CONFIG_START(pcg850v_state::pcg815) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz ) // 3.54MHz MCFG_CPU_PROGRAM_MAP(pce220_mem) @@ -998,7 +1001,7 @@ static MACHINE_CONFIG_START( pcg815 ) MCFG_PCE220_SERIAL_ADD(PCE220SERIAL_TAG) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pcg850v ) +MACHINE_CONFIG_START(pcg850v_state::pcg850v) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz ) // CMOS-SC7852 MCFG_CPU_PROGRAM_MAP(pce220_mem) diff --git a/src/mame/drivers/pcfx.cpp b/src/mame/drivers/pcfx.cpp index ef31f61be57..8e2fb8d63dd 100644 --- a/src/mame/drivers/pcfx.cpp +++ b/src/mame/drivers/pcfx.cpp @@ -49,6 +49,7 @@ public: DECLARE_WRITE_LINE_MEMBER( irq15_w ); TIMER_CALLBACK_MEMBER(pad_func); + void pcfx(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -410,7 +411,7 @@ uint32_t pcfx_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, } -static MACHINE_CONFIG_START( pcfx ) +MACHINE_CONFIG_START(pcfx_state::pcfx) MCFG_CPU_ADD( "maincpu", V810, XTAL_21_4772MHz ) MCFG_CPU_PROGRAM_MAP( pcfx_mem) MCFG_CPU_IO_MAP( pcfx_io) diff --git a/src/mame/drivers/pcipc.cpp b/src/mame/drivers/pcipc.cpp index 9c6035ec224..ec9e792d863 100644 --- a/src/mame/drivers/pcipc.cpp +++ b/src/mame/drivers/pcipc.cpp @@ -49,6 +49,8 @@ public: virtual void machine_reset() override; + void pcipc(machine_config &config); + void pcipctx(machine_config &config); }; pcipc_state::pcipc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) @@ -463,7 +465,7 @@ WRITE8_MEMBER(pcipc_state::boot_state_award_w) } -static MACHINE_CONFIG_START(pcipc) +MACHINE_CONFIG_START(pcipc_state::pcipc) MCFG_CPU_ADD("maincpu", PENTIUM, 90000000) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pci:07.0:pic8259_master", pic8259_device, inta_cb) @@ -475,7 +477,7 @@ static MACHINE_CONFIG_START(pcipc) MCFG_MGA2064W_ADD( ":pci:12.0") MACHINE_CONFIG_END -static MACHINE_CONFIG_START(pcipctx) +MACHINE_CONFIG_START(pcipc_state::pcipctx) MCFG_CPU_ADD("maincpu", PENTIUM, 60000000) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pci:07.0:pic8259_master", pic8259_device, inta_cb) diff --git a/src/mame/drivers/pcktgal.cpp b/src/mame/drivers/pcktgal.cpp index da0fa64af82..b000bb40363 100644 --- a/src/mame/drivers/pcktgal.cpp +++ b/src/mame/drivers/pcktgal.cpp @@ -221,7 +221,7 @@ void pcktgal_state::machine_start() save_item(NAME(m_toggle)); } -static MACHINE_CONFIG_START( pcktgal ) +MACHINE_CONFIG_START(pcktgal_state::pcktgal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 2000000) @@ -269,13 +269,13 @@ static MACHINE_CONFIG_START( pcktgal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bootleg, pcktgal ) +MACHINE_CONFIG_DERIVED(pcktgal_state::bootleg, pcktgal) MCFG_GFXDECODE_MODIFY("gfxdecode", bootleg) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(pcktgal_state, screen_update_pcktgalb) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pcktgal2, pcktgal ) +MACHINE_CONFIG_DERIVED(pcktgal_state::pcktgal2, pcktgal) MCFG_DEVICE_REMOVE("audiocpu") MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* doesn't use the encrypted 222 */ MCFG_CPU_PROGRAM_MAP(pcktgal_sound_map) diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp index 7b6cce016b9..08a41c911b7 100644 --- a/src/mame/drivers/pcm.cpp +++ b/src/mame/drivers/pcm.cpp @@ -88,6 +88,7 @@ public: DECLARE_WRITE8_MEMBER( pcm_85_w ); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void pcm(machine_config &config); private: bool m_cone; uint8_t m_85; @@ -248,7 +249,7 @@ static GFXDECODE_START( pcm ) GFXDECODE_ENTRY( "chargen", 0x0000, pcm_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( pcm ) +MACHINE_CONFIG_START(pcm_state::pcm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_10MHz /4) MCFG_CPU_PROGRAM_MAP(pcm_mem) diff --git a/src/mame/drivers/pcw.cpp b/src/mame/drivers/pcw.cpp index c212605c751..2e070e9fd37 100644 --- a/src/mame/drivers/pcw.cpp +++ b/src/mame/drivers/pcw.cpp @@ -1242,7 +1242,7 @@ static SLOT_INTERFACE_START( pcw_floppies ) SLOT_INTERFACE_END /* PCW8256, PCW8512, PCW9256 */ -static MACHINE_CONFIG_START( pcw ) +MACHINE_CONFIG_START(pcw_state::pcw) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* clock supplied to chip, but in reality it is 3.4 MHz */ MCFG_CPU_PROGRAM_MAP(pcw_map) @@ -1301,7 +1301,7 @@ static MACHINE_CONFIG_START( pcw ) MCFG_TIMER_DRIVER_ADD_PERIODIC("pcw_timer", pcw_state, pcw_timer_interrupt, attotime::from_hz(300)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pcw8256, pcw ) +MACHINE_CONFIG_DERIVED(pcw_state::pcw8256, pcw) MCFG_SCREEN_ADD("printer",RASTER) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE( PCW_PRINTER_WIDTH, PCW_PRINTER_HEIGHT ) @@ -1313,7 +1313,7 @@ static MACHINE_CONFIG_DERIVED( pcw8256, pcw ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pcw8512, pcw ) +MACHINE_CONFIG_DERIVED(pcw_state::pcw8512, pcw) MCFG_SCREEN_ADD("printer",RASTER) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE( PCW_PRINTER_WIDTH, PCW_PRINTER_HEIGHT ) @@ -1329,7 +1329,7 @@ static MACHINE_CONFIG_DERIVED( pcw8512, pcw ) MACHINE_CONFIG_END /* PCW9512, PCW9512+, PCW10 */ -static MACHINE_CONFIG_DERIVED( pcw9512, pcw ) +MACHINE_CONFIG_DERIVED(pcw_state::pcw9512, pcw) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_IO_MAP(pcw9512_io) diff --git a/src/mame/drivers/pcw16.cpp b/src/mame/drivers/pcw16.cpp index c5ed761e04c..0cd6df67e1a 100644 --- a/src/mame/drivers/pcw16.cpp +++ b/src/mame/drivers/pcw16.cpp @@ -1006,7 +1006,7 @@ static SLOT_INTERFACE_START(pcw16_com) SLOT_INTERFACE("msystems_mouse", MSYSTEM_SERIAL_MOUSE) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( pcw16 ) +MACHINE_CONFIG_START(pcw16_state::pcw16) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 16000000) MCFG_CPU_PROGRAM_MAP(pcw16_map) diff --git a/src/mame/drivers/pcxt.cpp b/src/mame/drivers/pcxt.cpp index 2cde379b316..d03ebef3746 100644 --- a/src/mame/drivers/pcxt.cpp +++ b/src/mame/drivers/pcxt.cpp @@ -93,6 +93,8 @@ public: required_device m_maincpu; required_device m_mb; optional_device m_bank; + void tetriskr(machine_config &config); + void filetto(machine_config &config); }; @@ -480,7 +482,7 @@ static SLOT_INTERFACE_START( filetto_isa8_cards ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( filetto ) +MACHINE_CONFIG_START(pcxt_state::filetto) MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3) MCFG_CPU_PROGRAM_MAP(filetto_map) MCFG_CPU_IO_MAP(filetto_io) @@ -501,7 +503,7 @@ static MACHINE_CONFIG_START( filetto ) MCFG_ADDRESS_MAP_BANK_STRIDE(0x10000) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tetriskr ) +MACHINE_CONFIG_START(pcxt_state::tetriskr) MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3) MCFG_CPU_PROGRAM_MAP(tetriskr_map) MCFG_CPU_IO_MAP(tetriskr_io) diff --git a/src/mame/drivers/pda600.cpp b/src/mame/drivers/pda600.cpp index dfe5ff7eee0..bc8157271cf 100644 --- a/src/mame/drivers/pda600.cpp +++ b/src/mame/drivers/pda600.cpp @@ -78,6 +78,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint8_t * m_video_ram; + void pda600(machine_config &config); }; @@ -196,7 +197,7 @@ static GFXDECODE_START( pda600 ) GFXDECODE_END -static MACHINE_CONFIG_START( pda600 ) +MACHINE_CONFIG_START(pda600_state::pda600) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z180, XTAL_14_31818MHz) MCFG_CPU_PROGRAM_MAP(pda600_mem) diff --git a/src/mame/drivers/pdp1.cpp b/src/mame/drivers/pdp1.cpp index aa300fa7976..886c4c9fcaf 100644 --- a/src/mame/drivers/pdp1.cpp +++ b/src/mame/drivers/pdp1.cpp @@ -1917,7 +1917,7 @@ INTERRUPT_GEN_MEMBER(pdp1_state::pdp1_interrupt) } -static MACHINE_CONFIG_START( pdp1 ) +MACHINE_CONFIG_START(pdp1_state::pdp1) /* basic machine hardware */ /* PDP1 CPU @ 200 kHz (no master clock, but the instruction and memory rate is 200 kHz) */ diff --git a/src/mame/drivers/pdp11.cpp b/src/mame/drivers/pdp11.cpp index 3934139c8db..c4dfcbe7c30 100644 --- a/src/mame/drivers/pdp11.cpp +++ b/src/mame/drivers/pdp11.cpp @@ -116,6 +116,9 @@ public: DECLARE_MACHINE_RESET(pdp11ub2); DECLARE_MACHINE_RESET(pdp11qb); void load9312prom(uint8_t *desc, uint8_t *src, int size); + void pdp11ub2(machine_config &config); + void pdp11(machine_config &config); + void pdp11qb(machine_config &config); }; READ16_MEMBER(pdp11_state::teletype_ctrl_r) @@ -346,7 +349,7 @@ void pdp11_state::kbd_put(u8 data) m_teletype_status |= 0x80; } -static MACHINE_CONFIG_START( pdp11 ) +MACHINE_CONFIG_START(pdp11_state::pdp11) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",T11, XTAL_4MHz) // Need proper CPU here MCFG_T11_INITIAL_MODE(6 << 13) @@ -360,11 +363,11 @@ static MACHINE_CONFIG_START( pdp11 ) MCFG_RX01_ADD("rx01") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pdp11ub2, pdp11 ) +MACHINE_CONFIG_DERIVED(pdp11_state::pdp11ub2, pdp11) MCFG_MACHINE_RESET_OVERRIDE(pdp11_state,pdp11ub2) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pdp11qb, pdp11 ) +MACHINE_CONFIG_DERIVED(pdp11_state::pdp11qb, pdp11) MCFG_MACHINE_RESET_OVERRIDE(pdp11_state,pdp11qb) MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/pecom.cpp b/src/mame/drivers/pecom.cpp index f9aff51cea0..53a1e7efaba 100644 --- a/src/mame/drivers/pecom.cpp +++ b/src/mame/drivers/pecom.cpp @@ -168,7 +168,7 @@ static INPUT_PORTS_START( pecom ) INPUT_PORTS_END /* Machine driver */ -static MACHINE_CONFIG_START( pecom64 ) +MACHINE_CONFIG_START(pecom_state::pecom64) /* basic machine hardware */ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, cdp1869_device::DOT_CLK_PAL/3) MCFG_CPU_PROGRAM_MAP(pecom64_mem) diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp index 1e214f8375f..d51506eee3b 100644 --- a/src/mame/drivers/pegasus.cpp +++ b/src/mame/drivers/pegasus.cpp @@ -90,6 +90,8 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp0c_load) { return load_cart(image, m_exp_0c, "c000"); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp0d_load) { return load_cart(image, m_exp_0d, "d000"); } + void pegasusm(machine_config &config); + void pegasus(machine_config &config); private: uint8_t m_kbd_row; bool m_kbd_irq; @@ -478,7 +480,7 @@ DRIVER_INIT_MEMBER(pegasus_state, pegasus) pegasus_decrypt_rom(base); } -static MACHINE_CONFIG_START( pegasus ) +MACHINE_CONFIG_START(pegasus_state::pegasus) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz) // actually a 6809C - 4MHZ clock coming in, 1MHZ internally MCFG_CPU_PROGRAM_MAP(pegasus_mem) @@ -539,7 +541,7 @@ static MACHINE_CONFIG_START( pegasus ) MCFG_SOFTWARE_LIST_ADD("cart_list", "pegasus_cart") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pegasusm, pegasus ) +MACHINE_CONFIG_DERIVED(pegasus_state::pegasusm, pegasus) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(pegasusm_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp index a189f8ef50a..731e693cf41 100644 --- a/src/mame/drivers/pencil2.cpp +++ b/src/mame/drivers/pencil2.cpp @@ -115,6 +115,7 @@ public: DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); DECLARE_CUSTOM_INPUT_MEMBER(printer_ready_r); DECLARE_CUSTOM_INPUT_MEMBER(printer_ack_r); + void pencil2(machine_config &config); private: virtual void machine_start() override; int m_centronics_busy; @@ -303,7 +304,7 @@ void pencil2_state::machine_start() m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xffff, read8_delegate(FUNC(generic_slot_device::read_rom),(generic_slot_device*)m_cart)); } -static MACHINE_CONFIG_START( pencil2 ) +MACHINE_CONFIG_START(pencil2_state::pencil2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/pengadvb.cpp b/src/mame/drivers/pengadvb.cpp index f24999f4e7a..bac42a90908 100644 --- a/src/mame/drivers/pengadvb.cpp +++ b/src/mame/drivers/pengadvb.cpp @@ -68,6 +68,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; void pengadvb_decrypt(const char* region); + void pengadvb(machine_config &config); }; @@ -203,7 +204,7 @@ WRITE8_MEMBER(pengadvb_state::pengadvb_ppi_port_c_w) ***************************************************************************/ -static MACHINE_CONFIG_START( pengadvb ) +MACHINE_CONFIG_START(pengadvb_state::pengadvb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3) diff --git a/src/mame/drivers/pengo.cpp b/src/mame/drivers/pengo.cpp index 4157f5c89a2..e3851e3cfab 100644 --- a/src/mame/drivers/pengo.cpp +++ b/src/mame/drivers/pengo.cpp @@ -85,6 +85,10 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); optional_shared_ptr m_decrypted_opcodes; + void jrpacmbl(machine_config &config); + void pengoe(machine_config &config); + void pengou(machine_config &config); + void pengo(machine_config &config); }; @@ -366,7 +370,7 @@ INTERRUPT_GEN_MEMBER(pengo_state::vblank_irq) } -static MACHINE_CONFIG_START( pengo ) +MACHINE_CONFIG_START(pengo_state::pengo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) @@ -407,13 +411,13 @@ static MACHINE_CONFIG_START( pengo ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pengou, pengo ) +MACHINE_CONFIG_DERIVED(pengo_state::pengou, pengo) MCFG_CPU_MODIFY("maincpu") MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_OPCODES) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pengoe, pengo ) +MACHINE_CONFIG_DERIVED(pengo_state::pengoe, pengo) MCFG_CPU_REPLACE("maincpu", SEGA_315_5010, MASTER_CLOCK/6) MCFG_CPU_PROGRAM_MAP(pengo_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) @@ -421,7 +425,7 @@ static MACHINE_CONFIG_DERIVED( pengoe, pengo ) MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jrpacmbl, pengo ) +MACHINE_CONFIG_DERIVED(pengo_state::jrpacmbl, pengo) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/pentagon.cpp b/src/mame/drivers/pentagon.cpp index cc053c8e12e..37d23866f4e 100644 --- a/src/mame/drivers/pentagon.cpp +++ b/src/mame/drivers/pentagon.cpp @@ -41,6 +41,8 @@ public: INTERRUPT_GEN_MEMBER(pentagon_interrupt); TIMER_CALLBACK_MEMBER(irq_on); TIMER_CALLBACK_MEMBER(irq_off); + void pent1024(machine_config &config); + void pentagon(machine_config &config); protected: required_memory_bank m_bank1; required_memory_bank m_bank2; @@ -248,7 +250,7 @@ GFXDECODE_END -static MACHINE_CONFIG_DERIVED( pentagon, spectrum_128 ) +MACHINE_CONFIG_DERIVED(pentagon_state::pentagon, spectrum_128) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(XTAL_14MHz / 4) MCFG_CPU_PROGRAM_MAP(pentagon_mem) @@ -277,7 +279,7 @@ static MACHINE_CONFIG_DERIVED( pentagon, spectrum_128 ) MCFG_SOFTWARE_LIST_ADD("cass_list_pen","pentagon_cass") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pent1024, pentagon) +MACHINE_CONFIG_DERIVED(pentagon_state::pent1024, pentagon) /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1024K") diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp index 79bc4ef2b05..58b88303ef0 100644 --- a/src/mame/drivers/peoplepc.cpp +++ b/src/mame/drivers/peoplepc.cpp @@ -62,6 +62,7 @@ public: void floppy_unload(floppy_image_device *dev); uint8_t m_dma0pg; + void olypeopl(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -233,7 +234,7 @@ static DEVICE_INPUT_DEFAULTS_START(keyboard) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( olypeopl ) +MACHINE_CONFIG_START(peoplepc_state::olypeopl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, XTAL_14_7456MHz/3) MCFG_CPU_PROGRAM_MAP(peoplepc_map) diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp index fadf787cca3..6205be46af3 100644 --- a/src/mame/drivers/peplus.cpp +++ b/src/mame/drivers/peplus.cpp @@ -337,6 +337,7 @@ public: DECLARE_PALETTE_INIT(peplus); void handle_lightpen(); + void peplus(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -1325,7 +1326,7 @@ void peplus_state::machine_reset() * Machine Driver * *************************/ -static MACHINE_CONFIG_START( peplus ) +MACHINE_CONFIG_START(peplus_state::peplus) // basic machine hardware MCFG_CPU_ADD("maincpu", I80C32, XTAL_20MHz/2) /* 10MHz */ MCFG_CPU_PROGRAM_MAP(peplus_map) diff --git a/src/mame/drivers/perq.cpp b/src/mame/drivers/perq.cpp index 650b4990410..e7c3dba3396 100644 --- a/src/mame/drivers/perq.cpp +++ b/src/mame/drivers/perq.cpp @@ -21,6 +21,7 @@ public: // , m_maincpu(*this, "maincpu") { } +void perq(machine_config &config); private: // required_device m_maincpu; }; @@ -31,7 +32,7 @@ private: static INPUT_PORTS_START( perq ) INPUT_PORTS_END -static MACHINE_CONFIG_START( perq ) +MACHINE_CONFIG_START(perq_state::perq) MACHINE_CONFIG_END ROM_START( perq ) diff --git a/src/mame/drivers/pes.cpp b/src/mame/drivers/pes.cpp index 35bfcc1c523..1cba0719ba5 100644 --- a/src/mame/drivers/pes.cpp +++ b/src/mame/drivers/pes.cpp @@ -245,7 +245,7 @@ INPUT_PORTS_END /****************************************************************************** Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( pes ) +MACHINE_CONFIG_START(pes_state::pes) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C31, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(i80c31_mem) diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp index 8e2bed8698c..5363c192e8f 100644 --- a/src/mame/drivers/pet.cpp +++ b/src/mame/drivers/pet.cpp @@ -326,6 +326,25 @@ public: int m_pia2b_irq; int m_exp_irq; int m_user_diag; + void _4k(machine_config &config); + void _8k(machine_config &config); + void _16k(machine_config &config); + void _32k(machine_config &config); + void pet(machine_config &config); + void pet2001n(machine_config &config); + void pet2001n8(machine_config &config); + void cbm3032(machine_config &config); + void pet20018(machine_config &config); + void pet2001n16(machine_config &config); + void cbm3016(machine_config &config); + void cbm3000(machine_config &config); + void cbm4000(machine_config &config); + void cbm4032f(machine_config &config); + void cbm4032(machine_config &config); + void cbm4016(machine_config &config); + void cbm3008(machine_config &config); + void pet2001(machine_config &config); + void pet2001n32(machine_config &config); }; @@ -337,6 +356,20 @@ public: { } DECLARE_READ8_MEMBER( pia1_pb_r ); + void pet2001b(machine_config &config); + void pet2001b32(machine_config &config); + void pet4000(machine_config &config); + void pet4000b(machine_config &config); + void pet4001b(machine_config &config); + void pet4032f(machine_config &config); + void pet4032b(machine_config &config); + void pet4032(machine_config &config); + void pet2001b16(machine_config &config); + void cbm3032b(machine_config &config); + void cbm4000b(machine_config &config); + void cbm4032b(machine_config &config); + void pet2001b8(machine_config &config); + void pet4016(machine_config &config); }; @@ -352,6 +385,8 @@ public: MC6845_UPDATE_ROW( pet80_update_row ); MC6845_UPDATE_ROW( cbm8296_update_row ); + void pet80(machine_config &config); + void pet8032(machine_config &config); }; @@ -361,6 +396,7 @@ public: superpet_state(const machine_config &mconfig, device_type type, const char *tag) : pet80_state(mconfig, type, tag) { } + void superpet(machine_config &config); }; @@ -370,6 +406,7 @@ public: cbm8096_state(const machine_config &mconfig, device_type type, const char *tag) : pet80_state(mconfig, type, tag) { } + void cbm8096(machine_config &config); }; @@ -408,6 +445,8 @@ public: DECLARE_WRITE8_MEMBER( write ); uint8_t m_cr; + void cbm8296d(machine_config &config); + void cbm8296(machine_config &config); }; @@ -1690,7 +1729,7 @@ MACHINE_RESET_MEMBER( cbm8296_state, cbm8296 ) // MACHINE_CONFIG( 4k ) //------------------------------------------------- -static MACHINE_CONFIG_START( 4k ) +MACHINE_CONFIG_START(pet_state::_4k) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("4K") MCFG_RAM_EXTRA_OPTIONS("8K,16K,32K") @@ -1701,7 +1740,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( 8k ) //------------------------------------------------- -static MACHINE_CONFIG_START( 8k ) +MACHINE_CONFIG_START(pet_state::_8k) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("8K") MCFG_RAM_EXTRA_OPTIONS("16K,32K") @@ -1709,10 +1748,10 @@ MACHINE_CONFIG_END //------------------------------------------------- -// MACHINE_CONFIG( 8k ) +// MACHINE_CONFIG( 16k ) //------------------------------------------------- -static MACHINE_CONFIG_START( 16k ) +MACHINE_CONFIG_START(pet_state::_16k) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("16K") MCFG_RAM_EXTRA_OPTIONS("32K") @@ -1720,10 +1759,10 @@ MACHINE_CONFIG_END //------------------------------------------------- -// MACHINE_CONFIG( 8k ) +// MACHINE_CONFIG( 32k ) //------------------------------------------------- -static MACHINE_CONFIG_START( 32k ) +MACHINE_CONFIG_START(pet_state::_32k) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("32K") MACHINE_CONFIG_END @@ -1733,7 +1772,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet ) //------------------------------------------------- -static MACHINE_CONFIG_START( pet ) +MACHINE_CONFIG_START(pet_state::pet) MCFG_MACHINE_START_OVERRIDE(pet_state, pet2001) MCFG_MACHINE_RESET_OVERRIDE(pet_state, pet) @@ -1816,8 +1855,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet2001 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet2001, pet ) - MCFG_FRAGMENT_ADD(4k) +MACHINE_CONFIG_DERIVED(pet_state::pet2001, pet) + MCFG_FRAGMENT_ADD(_4k) MACHINE_CONFIG_END @@ -1825,8 +1864,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet20018 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet20018, pet ) - MCFG_FRAGMENT_ADD(8k) +MACHINE_CONFIG_DERIVED(pet_state::pet20018, pet) + MCFG_FRAGMENT_ADD(_8k) MACHINE_CONFIG_END @@ -1834,7 +1873,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet2001n ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet2001n, pet ) +MACHINE_CONFIG_DERIVED(pet_state::pet2001n, pet) MCFG_GENERIC_CARTSLOT_ADD("cart_9000", generic_linear_slot, "pet_9000_rom") MCFG_GENERIC_EXTENSIONS("bin,rom") @@ -1852,8 +1891,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet2001n8 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet2001n8, pet2001n ) - MCFG_FRAGMENT_ADD(8k) +MACHINE_CONFIG_DERIVED(pet_state::pet2001n8, pet2001n) + MCFG_FRAGMENT_ADD(_8k) MACHINE_CONFIG_END @@ -1861,8 +1900,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet2001n16 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet2001n16, pet2001n ) - MCFG_FRAGMENT_ADD(16k) +MACHINE_CONFIG_DERIVED(pet_state::pet2001n16, pet2001n) + MCFG_FRAGMENT_ADD(_16k) MACHINE_CONFIG_END @@ -1870,8 +1909,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet2001n32 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet2001n32, pet2001n ) - MCFG_FRAGMENT_ADD(32k) +MACHINE_CONFIG_DERIVED(pet_state::pet2001n32, pet2001n) + MCFG_FRAGMENT_ADD(_32k) MACHINE_CONFIG_END @@ -1879,7 +1918,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm3000 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm3000, pet2001n ) +MACHINE_CONFIG_DERIVED(pet_state::cbm3000, pet2001n) // video hardware MCFG_SCREEN_MODIFY(SCREEN_TAG) MCFG_SCREEN_REFRESH_RATE(50) @@ -1896,8 +1935,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm3008 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm3008, cbm3000 ) - MCFG_FRAGMENT_ADD(8k) +MACHINE_CONFIG_DERIVED(pet_state::cbm3008, cbm3000) + MCFG_FRAGMENT_ADD(_8k) MACHINE_CONFIG_END @@ -1905,8 +1944,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm3016 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm3016, cbm3000 ) - MCFG_FRAGMENT_ADD(16k) +MACHINE_CONFIG_DERIVED(pet_state::cbm3016, cbm3000) + MCFG_FRAGMENT_ADD(_16k) MACHINE_CONFIG_END @@ -1914,8 +1953,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm3032 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm3032, cbm3000 ) - MCFG_FRAGMENT_ADD(32k) +MACHINE_CONFIG_DERIVED(pet_state::cbm3032, cbm3000) + MCFG_FRAGMENT_ADD(_32k) MACHINE_CONFIG_END @@ -1923,7 +1962,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet2001b ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet2001b, pet2001n ) +MACHINE_CONFIG_DERIVED(pet2001b_state::pet2001b, pet2001n) MCFG_DEVICE_MODIFY(M6520_1_TAG) MCFG_PIA_READPB_HANDLER(READ8(pet2001b_state, pia1_pb_r)) MACHINE_CONFIG_END @@ -1933,8 +1972,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet2001b8 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet2001b8, pet2001b ) - MCFG_FRAGMENT_ADD(8k) +MACHINE_CONFIG_DERIVED(pet2001b_state::pet2001b8, pet2001b) + MCFG_FRAGMENT_ADD(_8k) MACHINE_CONFIG_END @@ -1942,8 +1981,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet2001b16 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet2001b16, pet2001b ) - MCFG_FRAGMENT_ADD(16k) +MACHINE_CONFIG_DERIVED(pet2001b_state::pet2001b16, pet2001b) + MCFG_FRAGMENT_ADD(_16k) MACHINE_CONFIG_END @@ -1951,8 +1990,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet2001b32 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet2001b32, pet2001b ) - MCFG_FRAGMENT_ADD(32k) +MACHINE_CONFIG_DERIVED(pet2001b_state::pet2001b32, pet2001b) + MCFG_FRAGMENT_ADD(_32k) MACHINE_CONFIG_END @@ -1960,7 +1999,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm3032b ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm3032b, pet2001b ) +MACHINE_CONFIG_DERIVED(pet2001b_state::cbm3032b, pet2001b) // video hardware MCFG_SCREEN_MODIFY(SCREEN_TAG) MCFG_SCREEN_REFRESH_RATE(50) @@ -1971,7 +2010,7 @@ static MACHINE_CONFIG_DERIVED( cbm3032b, pet2001b ) MCFG_DEVICE_REMOVE("sync_timer") MCFG_TIMER_DRIVER_ADD_PERIODIC("sync_timer", pet_state, sync_tick, attotime::from_hz(100)) - MCFG_FRAGMENT_ADD(32k) + MCFG_FRAGMENT_ADD(_32k) MACHINE_CONFIG_END @@ -1979,7 +2018,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet4000 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet4000, pet2001n ) +MACHINE_CONFIG_DERIVED(pet2001b_state::pet4000, pet2001n ) MCFG_DEVICE_REMOVE("cart_b000") MACHINE_CONFIG_END @@ -1988,7 +2027,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet4016 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet4016, pet4000 ) +MACHINE_CONFIG_DERIVED(pet2001b_state::pet4016, pet4000) // RAM not upgradeable MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("16K") @@ -1999,8 +2038,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet4032 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet4032, pet4000 ) - MCFG_FRAGMENT_ADD(32k) +MACHINE_CONFIG_DERIVED(pet2001b_state::pet4032, pet4000) + MCFG_FRAGMENT_ADD(_32k) MACHINE_CONFIG_END @@ -2008,7 +2047,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet4032f ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet4032f, pet4000 ) +MACHINE_CONFIG_DERIVED(pet2001b_state::pet4032f, pet4000) MCFG_MACHINE_START_OVERRIDE(pet_state, pet40) MCFG_MACHINE_RESET_OVERRIDE(pet_state, pet40) @@ -2033,7 +2072,7 @@ static MACHINE_CONFIG_DERIVED( pet4032f, pet4000 ) MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_FRAGMENT_ADD(32k) + MCFG_FRAGMENT_ADD(_32k) MACHINE_CONFIG_END @@ -2041,7 +2080,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm4000 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm4000, pet2001n ) +MACHINE_CONFIG_DERIVED(pet_state::cbm4000, pet2001n) // video hardware MCFG_SCREEN_MODIFY(SCREEN_TAG) MCFG_SCREEN_REFRESH_RATE(50) @@ -2060,7 +2099,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm4016 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm4016, cbm4000 ) +MACHINE_CONFIG_DERIVED(pet_state::cbm4016, cbm4000) // RAM not upgradeable MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("16K") @@ -2071,8 +2110,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm4032 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm4032, cbm4000 ) - MCFG_FRAGMENT_ADD(32k) +MACHINE_CONFIG_DERIVED(pet_state::cbm4032, cbm4000) + MCFG_FRAGMENT_ADD(_32k) MACHINE_CONFIG_END @@ -2080,7 +2119,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm4032f ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm4032f, cbm4000 ) +MACHINE_CONFIG_DERIVED(pet_state::cbm4032f, cbm4000) MCFG_MACHINE_START_OVERRIDE(pet_state, pet40) MCFG_MACHINE_RESET_OVERRIDE(pet_state, pet40) @@ -2105,7 +2144,7 @@ static MACHINE_CONFIG_DERIVED( cbm4032f, cbm4000 ) MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_FRAGMENT_ADD(32k) + MCFG_FRAGMENT_ADD(_32k) MACHINE_CONFIG_END @@ -2113,7 +2152,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet4000b ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet4000b, pet2001b ) +MACHINE_CONFIG_DERIVED(pet2001b_state::pet4000b, pet2001b) MCFG_DEVICE_REMOVE("cart_b000") MACHINE_CONFIG_END @@ -2122,8 +2161,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet4032b ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet4032b, pet4000b ) - MCFG_FRAGMENT_ADD(32k) +MACHINE_CONFIG_DERIVED(pet2001b_state::pet4032b, pet4000b) + MCFG_FRAGMENT_ADD(_32k) MACHINE_CONFIG_END @@ -2131,7 +2170,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm4000b ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm4000b, pet2001b ) +MACHINE_CONFIG_DERIVED(pet2001b_state::cbm4000b, pet2001b) // video hardware MCFG_SCREEN_MODIFY(SCREEN_TAG) MCFG_SCREEN_REFRESH_RATE(50) @@ -2150,8 +2189,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm4032b ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm4032b, cbm4000b ) - MCFG_FRAGMENT_ADD(32k) +MACHINE_CONFIG_DERIVED(pet2001b_state::cbm4032b, cbm4000b) + MCFG_FRAGMENT_ADD(_32k) MACHINE_CONFIG_END @@ -2159,7 +2198,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet80 ) //------------------------------------------------- -static MACHINE_CONFIG_START( pet80 ) +MACHINE_CONFIG_START(pet80_state::pet80) MCFG_MACHINE_START_OVERRIDE(pet80_state, pet80) MCFG_MACHINE_RESET_OVERRIDE(pet80_state, pet80) @@ -2259,8 +2298,8 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pet8032 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pet8032, pet80 ) - MCFG_FRAGMENT_ADD(32k) +MACHINE_CONFIG_DERIVED(pet80_state::pet8032, pet80) + MCFG_FRAGMENT_ADD(_32k) MACHINE_CONFIG_END @@ -2268,7 +2307,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( superpet ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( superpet, pet8032 ) +MACHINE_CONFIG_DERIVED(superpet_state::superpet, pet8032) MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG) MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, "superpet") MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) @@ -2281,7 +2320,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm8096 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm8096, pet80 ) +MACHINE_CONFIG_DERIVED(cbm8096_state::cbm8096, pet80) MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG) MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, "64k") MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) @@ -2297,7 +2336,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm8296 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm8296, pet80 ) +MACHINE_CONFIG_DERIVED(cbm8296_state::cbm8296, pet80) MCFG_MACHINE_START_OVERRIDE(cbm8296_state, cbm8296) MCFG_MACHINE_RESET_OVERRIDE(cbm8296_state, cbm8296) @@ -2328,7 +2367,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( cbm8296d ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( cbm8296d, cbm8296 ) +MACHINE_CONFIG_DERIVED(cbm8296_state::cbm8296d, cbm8296) MCFG_DEVICE_MODIFY("ieee8") MCFG_DEVICE_SLOT_INTERFACE(cbm8296d_ieee488_devices, "c8250lp", false) MACHINE_CONFIG_END diff --git a/src/mame/drivers/peyper.cpp b/src/mame/drivers/peyper.cpp index 7b74a445020..20db75890e5 100644 --- a/src/mame/drivers/peyper.cpp +++ b/src/mame/drivers/peyper.cpp @@ -66,6 +66,7 @@ public: DECLARE_DRIVER_INIT(peyper); DECLARE_DRIVER_INIT(odin); DECLARE_DRIVER_INIT(wolfman); + void peyper(machine_config &config); private: uint8_t m_digit; uint8_t m_disp_layout[36]; @@ -578,7 +579,7 @@ void peyper_state::machine_reset() { } -static MACHINE_CONFIG_START( peyper ) +MACHINE_CONFIG_START(peyper_state::peyper) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2500000) MCFG_CPU_PROGRAM_MAP(peyper_map) diff --git a/src/mame/drivers/pg685.cpp b/src/mame/drivers/pg685.cpp index d6479960660..7f310dbcb30 100644 --- a/src/mame/drivers/pg685.cpp +++ b/src/mame/drivers/pg685.cpp @@ -129,6 +129,11 @@ public: DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); + void pg685_backplane(machine_config &config); + void pg685_module(machine_config &config); + void pg685(machine_config &config); + void pg675(machine_config &config); + void pg685oua12(machine_config &config); private: virtual void machine_reset() override; virtual void video_start() override; @@ -380,7 +385,7 @@ MC6845_UPDATE_ROW( pg685_state::crtc_update_row_oua12 ) // MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START(pg685_backplane) +MACHINE_CONFIG_START(pg685_state::pg685_backplane) MCFG_DEVICE_ADD("bppit", PIT8253, 0) MCFG_DEVICE_ADD("bppic", PIC8259, 0) @@ -389,7 +394,7 @@ static MACHINE_CONFIG_START(pg685_backplane) MCFG_DEVICE_ADD("bpuart", MC2661, XTAL_4_9152MHz) // internal clock MACHINE_CONFIG_END -static MACHINE_CONFIG_START(pg685_module) +MACHINE_CONFIG_START(pg685_state::pg685_module) MCFG_DEVICE_ADD("fdc", FD1797, XTAL_4MHz / 2) // divider guessed MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("mainpic", pic8259_device, ir4_w)) @@ -402,7 +407,7 @@ static MACHINE_CONFIG_START(pg685_module) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pg675 ) +MACHINE_CONFIG_START(pg685_state::pg675) // main cpu MCFG_CPU_ADD("maincpu", I8088, XTAL_15MHz / 3) MCFG_CPU_PROGRAM_MAP(pg675_mem) @@ -451,7 +456,7 @@ static MACHINE_CONFIG_START( pg675 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pg685 ) +MACHINE_CONFIG_START(pg685_state::pg685) // main cpu MCFG_CPU_ADD("maincpu", V20, XTAL_15MHz / 3) MCFG_CPU_PROGRAM_MAP(pg685_mem) @@ -502,7 +507,7 @@ static MACHINE_CONFIG_START( pg685 ) MCFG_WD2010_OUT_INTRQ_CB(DEVWRITELINE("mainpic", pic8259_device, ir3_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pg685oua12 ) +MACHINE_CONFIG_START(pg685_state::pg685oua12) // main cpu MCFG_CPU_ADD("maincpu", I80286, XTAL_20MHz / 2) MCFG_CPU_PROGRAM_MAP(pg685oua12_mem) diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp index 12c6afaef3c..bb1f3562e4f 100644 --- a/src/mame/drivers/pgm.cpp +++ b/src/mame/drivers/pgm.cpp @@ -504,7 +504,7 @@ MACHINE_RESET_MEMBER(pgm_state,pgm) m_soundcpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); } -MACHINE_CONFIG_START( pgmbase ) +MACHINE_CONFIG_START(pgm_state::pgmbase) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 20000000) /* 20 mhz! verified on real board */ MCFG_CPU_PROGRAM_MAP(pgm_basic_mem) @@ -549,7 +549,7 @@ MACHINE_CONFIG_START( pgmbase ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0) MACHINE_CONFIG_END -MACHINE_CONFIG_START( pgm ) +MACHINE_CONFIG_START(pgm_state::pgm) MCFG_FRAGMENT_ADD(pgmbase) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp index 1be4693a618..6e8a21555c7 100644 --- a/src/mame/drivers/pgm2.cpp +++ b/src/mame/drivers/pgm2.cpp @@ -765,7 +765,7 @@ static GFXDECODE_START( pgm2_bg ) GFXDECODE_ENTRY( "bgtile", 0, tiles32x32x8_layout, 0, 0x2000/4/0x80 ) GFXDECODE_END -static MACHINE_CONFIG_START( pgm2 ) +MACHINE_CONFIG_START(pgm2_state::pgm2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", IGS036, 100000000) // ?? ARM based CPU, has internal ROM. @@ -813,19 +813,19 @@ static MACHINE_CONFIG_START( pgm2 ) MACHINE_CONFIG_END // not strictly needed as the video code supports changing on the fly, but makes recording easier etc. -static MACHINE_CONFIG_DERIVED( pgm2_lores, pgm2 ) +MACHINE_CONFIG_DERIVED(pgm2_state::pgm2_lores, pgm2) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pgm2_hires, pgm2 ) +MACHINE_CONFIG_DERIVED(pgm2_state::pgm2_hires, pgm2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pgm2_module_rom_map) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 240-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pgm2_ramrom, pgm2 ) +MACHINE_CONFIG_DERIVED(pgm2_state::pgm2_ramrom, pgm2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pgm2_ram_rom_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pgm3.cpp b/src/mame/drivers/pgm3.cpp index 48e102594a0..11eaa4e0e08 100644 --- a/src/mame/drivers/pgm3.cpp +++ b/src/mame/drivers/pgm3.cpp @@ -67,6 +67,7 @@ public: uint32_t screen_update_pgm3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_pgm3); required_device m_maincpu; + void pgm3(machine_config &config); }; static ADDRESS_MAP_START( pgm3_map, AS_PROGRAM, 32, pgm3_state ) @@ -97,7 +98,7 @@ void pgm3_state::machine_reset() { } -static MACHINE_CONFIG_START( pgm3 ) +MACHINE_CONFIG_START(pgm3_state::pgm3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM9, 800000000) // wrong, see notes at top of driver diff --git a/src/mame/drivers/phc25.cpp b/src/mame/drivers/phc25.cpp index 37881f0ede4..bd036737906 100644 --- a/src/mame/drivers/phc25.cpp +++ b/src/mame/drivers/phc25.cpp @@ -306,7 +306,7 @@ void phc25_state::video_start() /* Machine Driver */ -static MACHINE_CONFIG_START( phc25 ) +MACHINE_CONFIG_START(phc25_state::phc25) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(phc25_mem) @@ -340,7 +340,7 @@ static MACHINE_CONFIG_START( phc25 ) MCFG_SOFTWARE_LIST_ADD("cass_list", "phc25_cass") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pal, phc25 ) +MACHINE_CONFIG_DERIVED(phc25_state::pal, phc25) /* video hardware */ MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, MC6847_TAG) @@ -352,7 +352,7 @@ static MACHINE_CONFIG_DERIVED( pal, phc25 ) // other lines not connected MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ntsc, phc25 ) +MACHINE_CONFIG_DERIVED(phc25_state::ntsc, phc25) /* video hardware */ MCFG_SCREEN_MC6847_NTSC_ADD(SCREEN_TAG, MC6847_TAG) diff --git a/src/mame/drivers/phoenix.cpp b/src/mame/drivers/phoenix.cpp index d11faa0f872..e29130ab965 100644 --- a/src/mame/drivers/phoenix.cpp +++ b/src/mame/drivers/phoenix.cpp @@ -437,7 +437,7 @@ MACHINE_RESET_MEMBER(phoenix_state,phoenix) } -static MACHINE_CONFIG_START( phoenix ) +MACHINE_CONFIG_START(phoenix_state::phoenix) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, CPU_CLOCK) /* 2.75 MHz */ @@ -475,7 +475,7 @@ static MACHINE_CONFIG_START( phoenix ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pleiads, phoenix ) +MACHINE_CONFIG_DERIVED(phoenix_state::pleiads, phoenix) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -506,7 +506,7 @@ MACHINE_CONFIG_END /* Same as Phoenix, but uses an AY8910 and an extra visible line (column) */ -static MACHINE_CONFIG_START( survival ) +MACHINE_CONFIG_START(phoenix_state::survival) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, CPU_CLOCK) /* 5.50 MHz */ @@ -542,7 +542,7 @@ MACHINE_CONFIG_END /* Uses a Z80 */ -static MACHINE_CONFIG_DERIVED( condor, phoenix ) +MACHINE_CONFIG_DERIVED(phoenix_state::condor, phoenix) /* basic machine hardware */ /* FIXME: Verify clock. This is most likely 11MHz/2 */ diff --git a/src/mame/drivers/photon.cpp b/src/mame/drivers/photon.cpp index 4c3bc0fa5d6..aae27713c7d 100644 --- a/src/mame/drivers/photon.cpp +++ b/src/mame/drivers/photon.cpp @@ -48,6 +48,7 @@ public: void set_bank(uint8_t data); required_device m_speaker; + void photon(machine_config &config); }; @@ -195,7 +196,7 @@ uint32_t photon_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap return video_update(screen, bitmap, cliprect, memregion("maincpu")->base()); } -static MACHINE_CONFIG_START( photon ) +MACHINE_CONFIG_START(photon_state::photon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, 1780000) diff --git a/src/mame/drivers/photon2.cpp b/src/mame/drivers/photon2.cpp index 51e98a2b47e..b69ce54e343 100644 --- a/src/mame/drivers/photon2.cpp +++ b/src/mame/drivers/photon2.cpp @@ -61,6 +61,7 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank_spectrum); TIMER_DEVICE_CALLBACK_MEMBER(spec_interrupt_hack); + void photon2(machine_config &config); }; @@ -347,7 +348,7 @@ void photon2_state::machine_start() save_item(NAME(m_nmi_enable)); } -static MACHINE_CONFIG_START( photon2 ) +MACHINE_CONFIG_START(photon2_state::photon2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3500000) /* 3.5 MHz */ MCFG_CPU_PROGRAM_MAP(spectrum_mem) diff --git a/src/mame/drivers/photoply.cpp b/src/mame/drivers/photoply.cpp index 6c905d53af0..a83a69ed263 100644 --- a/src/mame/drivers/photoply.cpp +++ b/src/mame/drivers/photoply.cpp @@ -31,6 +31,7 @@ public: DECLARE_DRIVER_INIT(photoply); virtual void machine_start() override; + void photoply(machine_config &config); }; @@ -114,7 +115,7 @@ static GFXDECODE_START( photoply ) //there's also a 8x16 entry (just after the 8x8) GFXDECODE_END -static MACHINE_CONFIG_START( photoply ) +MACHINE_CONFIG_START(photoply_state::photoply) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I486, 75000000) /* I486DX4, 75 or 100 Mhz */ MCFG_CPU_PROGRAM_MAP(photoply_map) diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp index aa2d7c662ad..13bd3842dac 100644 --- a/src/mame/drivers/phunsy.cpp +++ b/src/mame/drivers/phunsy.cpp @@ -63,6 +63,7 @@ public: DECLARE_PALETTE_INIT(phunsy); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void phunsy(machine_config &config); private: uint8_t m_data_out; uint8_t m_keyboard_input; @@ -330,7 +331,7 @@ DRIVER_INIT_MEMBER( phunsy_state, phunsy ) membank("bankq")->set_entry(0); } -static MACHINE_CONFIG_START( phunsy ) +MACHINE_CONFIG_START(phunsy_state::phunsy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz) MCFG_CPU_PROGRAM_MAP(phunsy_mem) diff --git a/src/mame/drivers/picno.cpp b/src/mame/drivers/picno.cpp index 3a22b84aebc..984b12b25f1 100644 --- a/src/mame/drivers/picno.cpp +++ b/src/mame/drivers/picno.cpp @@ -41,6 +41,7 @@ public: , m_maincpu(*this, "maincpu") { } + void picno(machine_config &config); private: required_device m_maincpu; }; @@ -59,7 +60,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( picno ) INPUT_PORTS_END -static MACHINE_CONFIG_START( picno ) +MACHINE_CONFIG_START(picno_state::picno) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H83002, XTAL_20MHz) /* TODO: correct CPU type (H8/532), crystal is a guess, divided by 2 in the cpu */ MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/piggypas.cpp b/src/mame/drivers/piggypas.cpp index ff2468638ba..422a7cff08e 100644 --- a/src/mame/drivers/piggypas.cpp +++ b/src/mame/drivers/piggypas.cpp @@ -42,6 +42,7 @@ public: required_device m_ticket; uint8_t m_ctrl; uint8_t m_digit_idx; + void piggypas(machine_config &config); }; @@ -124,7 +125,7 @@ HD44780_PIXEL_UPDATE(piggypas_state::piggypas_pixel_update) bitmap.pix16(y, (line * 8 + pos) * 6 + x) = state; } -static MACHINE_CONFIG_START( piggypas ) +MACHINE_CONFIG_START(piggypas_state::piggypas) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C31, XTAL_8_448MHz) // OKI M80C31F or M80C154S diff --git a/src/mame/drivers/pimps.cpp b/src/mame/drivers/pimps.cpp index 97f424b1dff..4b0c462e066 100644 --- a/src/mame/drivers/pimps.cpp +++ b/src/mame/drivers/pimps.cpp @@ -82,6 +82,7 @@ public: , m_maincpu(*this, "maincpu") { } + void pimps(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -122,7 +123,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) // set up terminal to default to DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( pimps ) +MACHINE_CONFIG_START(pimps_state::pimps) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A, XTAL_2MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/pinball2k.cpp b/src/mame/drivers/pinball2k.cpp index b9ecdf28513..ee41dd5ee63 100644 --- a/src/mame/drivers/pinball2k.cpp +++ b/src/mame/drivers/pinball2k.cpp @@ -97,6 +97,7 @@ public: void draw_framebuffer(bitmap_rgb32 &bitmap, const rectangle &cliprect); void draw_cga(bitmap_rgb32 &bitmap, const rectangle &cliprect); void init_mediagx(); + void mediagx(machine_config &config); }; // Display controller registers @@ -591,7 +592,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, pinball2k_state ) AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START( mediagx ) +MACHINE_CONFIG_START(pinball2k_state::mediagx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MEDIAGX, 166000000) diff --git a/src/mame/drivers/pingpong.cpp b/src/mame/drivers/pingpong.cpp index 0393f1f0105..09160f6f20e 100644 --- a/src/mame/drivers/pingpong.cpp +++ b/src/mame/drivers/pingpong.cpp @@ -446,7 +446,7 @@ static GFXDECODE_START( pingpong ) GFXDECODE_END -static MACHINE_CONFIG_START( pingpong ) +MACHINE_CONFIG_START(pingpong_state::pingpong) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,18432000/6) /* 3.072 MHz (probably) */ @@ -476,7 +476,7 @@ static MACHINE_CONFIG_START( pingpong ) MACHINE_CONFIG_END /* too fast! */ -static MACHINE_CONFIG_DERIVED( merlinmm, pingpong ) +MACHINE_CONFIG_DERIVED(pingpong_state::merlinmm, pingpong) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(merlinmm_map) MCFG_TIMER_MODIFY("scantimer") diff --git a/src/mame/drivers/pinkiri8.cpp b/src/mame/drivers/pinkiri8.cpp index 849d42beb98..da23717e630 100644 --- a/src/mame/drivers/pinkiri8.cpp +++ b/src/mame/drivers/pinkiri8.cpp @@ -96,6 +96,7 @@ public: void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void pinkiri8(machine_config &config); }; @@ -1087,7 +1088,7 @@ static GFXDECODE_START( pinkiri8 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 0x100 ) GFXDECODE_END -static MACHINE_CONFIG_START( pinkiri8 ) +MACHINE_CONFIG_START(pinkiri8_state::pinkiri8) MCFG_CPU_ADD("maincpu",Z180,XTAL_32MHz/2) MCFG_CPU_PROGRAM_MAP(pinkiri8_map) MCFG_CPU_IO_MAP(pinkiri8_io) diff --git a/src/mame/drivers/pipbug.cpp b/src/mame/drivers/pipbug.cpp index 15d82290cb6..8602fa6518f 100644 --- a/src/mame/drivers/pipbug.cpp +++ b/src/mame/drivers/pipbug.cpp @@ -58,6 +58,7 @@ public: required_device m_rs232; required_device m_maincpu; DECLARE_QUICKLOAD_LOAD_MEMBER( pipbug ); + void pipbug(machine_config &config); }; WRITE8_MEMBER( pipbug_state::pipbug_ctrl_w ) @@ -153,7 +154,7 @@ QUICKLOAD_LOAD_MEMBER( pipbug_state, pipbug ) return result; } -static MACHINE_CONFIG_START( pipbug ) +MACHINE_CONFIG_START(pipbug_state::pipbug) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, XTAL_1MHz) MCFG_CPU_PROGRAM_MAP(pipbug_mem) diff --git a/src/mame/drivers/pipedrm.cpp b/src/mame/drivers/pipedrm.cpp index 8dcdf17f17a..3a87206e82b 100644 --- a/src/mame/drivers/pipedrm.cpp +++ b/src/mame/drivers/pipedrm.cpp @@ -189,6 +189,8 @@ public: DECLARE_WRITE8_MEMBER( pipedrm_bankswitch_w ); DECLARE_WRITE8_MEMBER( sound_bankswitch_w ); DECLARE_READ8_MEMBER( pending_command_r ); + void pipedrm(machine_config &config); + void hatris(machine_config &config); }; @@ -564,7 +566,7 @@ MACHINE_RESET_MEMBER(pipedrm_state,pipedrm) m_flipscreen = 0; } -static MACHINE_CONFIG_START( pipedrm ) +MACHINE_CONFIG_START(pipedrm_state::pipedrm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/2) @@ -619,7 +621,7 @@ static MACHINE_CONFIG_START( pipedrm ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hatris ) +MACHINE_CONFIG_START(pipedrm_state::hatris) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/2) diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp index 3d66525a7be..7b31a322c50 100644 --- a/src/mame/drivers/pipeline.cpp +++ b/src/mame/drivers/pipeline.cpp @@ -112,6 +112,7 @@ public: TIMER_CALLBACK_MEMBER(protection_deferred_w); + void pipeline(machine_config &config); protected: required_device m_maincpu; required_device m_mcu; @@ -349,7 +350,7 @@ PALETTE_INIT_MEMBER(pipeline_state, pipeline) } } -static MACHINE_CONFIG_START( pipeline ) +MACHINE_CONFIG_START(pipeline_state::pipeline) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 7372800/2) diff --git a/src/mame/drivers/pirates.cpp b/src/mame/drivers/pirates.cpp index 43aa00820a7..21e81a2c769 100644 --- a/src/mame/drivers/pirates.cpp +++ b/src/mame/drivers/pirates.cpp @@ -251,7 +251,7 @@ GFXDECODE_END /* Machine Driver + Related bits */ -static MACHINE_CONFIG_START( pirates ) +MACHINE_CONFIG_START(pirates_state::pirates) MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16mhz */ MCFG_CPU_PROGRAM_MAP(pirates_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", pirates_state, irq1_line_hold) diff --git a/src/mame/drivers/piratesh.cpp b/src/mame/drivers/piratesh.cpp index 5c06f8e3418..f069b20575e 100644 --- a/src/mame/drivers/piratesh.cpp +++ b/src/mame/drivers/piratesh.cpp @@ -103,6 +103,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(piratesh_interrupt); K056832_CB_MEMBER(piratesh_tile_callback); K055673_CB_MEMBER(piratesh_sprite_callback); + void piratesh(machine_config &config); }; @@ -580,7 +581,7 @@ MACHINE_RESET_MEMBER(piratesh_state,piratesh) } -static MACHINE_CONFIG_START( piratesh ) +MACHINE_CONFIG_START(piratesh_state::piratesh) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) diff --git a/src/mame/drivers/pitagjr.cpp b/src/mame/drivers/pitagjr.cpp index 5e2458b58c3..3a67725ccde 100644 --- a/src/mame/drivers/pitagjr.cpp +++ b/src/mame/drivers/pitagjr.cpp @@ -172,6 +172,7 @@ public: virtual void machine_start() override; DECLARE_PALETTE_INIT(pitagjr); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void pitajr(machine_config &config); }; @@ -202,7 +203,7 @@ uint32_t pitagjr_state::screen_update(screen_device &screen, bitmap_ind16 &bitma return 0; } -static MACHINE_CONFIG_START( pitajr ) +MACHINE_CONFIG_START(pitagjr_state::pitajr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD63705, XTAL_2MHz) // probably a m6805-based MCU with internal boot ROM MCFG_CPU_PROGRAM_MAP(pitajr_mem) diff --git a/src/mame/drivers/pitnrun.cpp b/src/mame/drivers/pitnrun.cpp index a50a41acebd..941f76ee391 100644 --- a/src/mame/drivers/pitnrun.cpp +++ b/src/mame/drivers/pitnrun.cpp @@ -274,7 +274,7 @@ static GFXDECODE_START( pitnrun ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 4 ) GFXDECODE_END -static MACHINE_CONFIG_START( pitnrun ) +MACHINE_CONFIG_START(pitnrun_state::pitnrun) MCFG_CPU_ADD("maincpu", Z80,XTAL_18_432MHz/6) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(pitnrun_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", pitnrun_state, nmi_source) @@ -327,7 +327,7 @@ static MACHINE_CONFIG_START( pitnrun ) MCFG_DEVICE_ADD("noiselatch", LS259, 0) // 1J MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pitnrun_mcu, pitnrun ) +MACHINE_CONFIG_DERIVED(pitnrun_state::pitnrun_mcu, pitnrun) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pitnrun_map_mcu) diff --git a/src/mame/drivers/pk8000.cpp b/src/mame/drivers/pk8000.cpp index 64377184e73..937c7fe0f69 100644 --- a/src/mame/drivers/pk8000.cpp +++ b/src/mame/drivers/pk8000.cpp @@ -65,6 +65,7 @@ public: INTERRUPT_GEN_MEMBER(interrupt); IRQ_CALLBACK_MEMBER(irq_callback); + void pk8000(machine_config &config); protected: required_device m_maincpu; required_device m_cassette; @@ -355,7 +356,7 @@ uint32_t pk8000_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap return video_update(screen, bitmap, cliprect, m_ram->pointer()); } -static MACHINE_CONFIG_START( pk8000 ) +MACHINE_CONFIG_START(pk8000_state::pk8000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, 1780000) MCFG_CPU_PROGRAM_MAP(pk8000_mem) diff --git a/src/mame/drivers/pk8020.cpp b/src/mame/drivers/pk8020.cpp index d572a64de26..4f4de13f8ce 100644 --- a/src/mame/drivers/pk8020.cpp +++ b/src/mame/drivers/pk8020.cpp @@ -175,7 +175,7 @@ SLOT_INTERFACE_END /* Machine driver */ -static MACHINE_CONFIG_START( pk8020 ) +MACHINE_CONFIG_START(pk8020_state::pk8020) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_20MHz / 8) MCFG_CPU_PROGRAM_MAP(pk8020_mem) diff --git a/src/mame/drivers/pkscram.cpp b/src/mame/drivers/pkscram.cpp index 25ce47d0e4d..93a2aa8f18a 100644 --- a/src/mame/drivers/pkscram.cpp +++ b/src/mame/drivers/pkscram.cpp @@ -58,6 +58,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_screen; + void pkscramble(machine_config &config); }; @@ -300,7 +301,7 @@ void pkscram_state::machine_reset() scanline_timer->adjust(m_screen->time_until_pos(interrupt_scanline), interrupt_scanline); } -static MACHINE_CONFIG_START( pkscramble ) +MACHINE_CONFIG_START(pkscram_state::pkscramble) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000 ) MCFG_CPU_PROGRAM_MAP(pkscramble_map) diff --git a/src/mame/drivers/pktgaldx.cpp b/src/mame/drivers/pktgaldx.cpp index a5c082eb3ac..b3c5b5a6f8c 100644 --- a/src/mame/drivers/pktgaldx.cpp +++ b/src/mame/drivers/pktgaldx.cpp @@ -333,7 +333,7 @@ void pktgaldx_state::machine_start() { } -static MACHINE_CONFIG_START( pktgaldx ) +MACHINE_CONFIG_START(pktgaldx_state::pktgaldx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14000000) @@ -396,7 +396,7 @@ static MACHINE_CONFIG_START( pktgaldx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pktgaldb ) +MACHINE_CONFIG_START(pktgaldx_state::pktgaldb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) diff --git a/src/mame/drivers/plan80.cpp b/src/mame/drivers/plan80.cpp index 932cacc12dc..90297852859 100644 --- a/src/mame/drivers/plan80.cpp +++ b/src/mame/drivers/plan80.cpp @@ -48,6 +48,7 @@ public: DECLARE_DRIVER_INIT(plan80); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void plan80(machine_config &config); private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; uint8_t m_kbd_row; @@ -224,7 +225,7 @@ static GFXDECODE_START( plan80 ) GFXDECODE_END -static MACHINE_CONFIG_START( plan80 ) +MACHINE_CONFIG_START(plan80_state::plan80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, 2048000) MCFG_CPU_PROGRAM_MAP(plan80_mem) diff --git a/src/mame/drivers/play_1.cpp b/src/mame/drivers/play_1.cpp index 6558297548c..8f54d9a1bd6 100644 --- a/src/mame/drivers/play_1.cpp +++ b/src/mame/drivers/play_1.cpp @@ -54,6 +54,8 @@ public: DECLARE_READ_LINE_MEMBER(ef4_r); DECLARE_WRITE_LINE_MEMBER(clock_w); + void chance(machine_config &config); + void play_1(machine_config &config); private: uint16_t m_resetcnt; uint16_t m_clockcnt; @@ -457,7 +459,7 @@ WRITE_LINE_MEMBER( play_1_state::clock_w ) } } -static MACHINE_CONFIG_START( play_1 ) +MACHINE_CONFIG_START(play_1_state::play_1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", CDP1802, 400000) // 2 gates, 1 cap, 1 resistor oscillating somewhere between 350 to 450 kHz MCFG_CPU_PROGRAM_MAP(play_1_map) @@ -485,7 +487,7 @@ static MACHINE_CONFIG_START( play_1 ) MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( chance, play_1 ) +MACHINE_CONFIG_DERIVED(play_1_state::chance, play_1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(chance_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/play_2.cpp b/src/mame/drivers/play_2.cpp index a63f90002aa..dc7cbb270c7 100644 --- a/src/mame/drivers/play_2.cpp +++ b/src/mame/drivers/play_2.cpp @@ -79,6 +79,8 @@ public: DECLARE_READ8_MEMBER(sound_in_r); DECLARE_DRIVER_INIT(zira); + void play_2(machine_config &config); + void zira(machine_config &config); private: uint16_t m_clockcnt; uint16_t m_resetcnt; @@ -351,7 +353,7 @@ WRITE8_MEMBER( play_2_state::psg_w ) } // **************** Machine ***************************** -static MACHINE_CONFIG_START( play_2 ) +MACHINE_CONFIG_START(play_2_state::play_2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", CDP1802, XTAL_2_95MHz) MCFG_CPU_PROGRAM_MAP(play_2_map) @@ -390,7 +392,7 @@ static MACHINE_CONFIG_START( play_2 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zira, play_2 ) +MACHINE_CONFIG_DERIVED(play_2_state::zira, play_2) MCFG_CPU_ADD("cop402", COP402, XTAL_2MHz) MCFG_CPU_PROGRAM_MAP(zira_sound_map) MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false ) diff --git a/src/mame/drivers/play_3.cpp b/src/mame/drivers/play_3.cpp index d455e2b9700..7136e8ca853 100644 --- a/src/mame/drivers/play_3.cpp +++ b/src/mame/drivers/play_3.cpp @@ -91,6 +91,9 @@ public: DECLARE_READ8_MEMBER(port02_a_r); DECLARE_READ_LINE_MEMBER(clear_a_r); + void sklflite(machine_config &config); + void play_3(machine_config &config); + void megaaton(machine_config &config); private: u16 m_clockcnt; u16 m_resetcnt; @@ -455,7 +458,7 @@ WRITE_LINE_MEMBER( play_3_state::q4013a_w ) m_clockcnt = 0; } -static MACHINE_CONFIG_START( play_3 ) +MACHINE_CONFIG_START(play_3_state::play_3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", CDP1802, XTAL_3_579545MHz) MCFG_CPU_PROGRAM_MAP(play_3_map) @@ -503,7 +506,7 @@ static MACHINE_CONFIG_START( play_3 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( megaaton, play_3 ) +MACHINE_CONFIG_DERIVED(play_3_state::megaaton, play_3) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(XTAL_2_95MHz) MCFG_CPU_IO_MAP(megaaton_io) @@ -512,7 +515,7 @@ static MACHINE_CONFIG_DERIVED( megaaton, play_3 ) MCFG_DEVICE_CLOCK(XTAL_2_95MHz / 8) // TPB line from CPU MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sklflite, play_3 ) +MACHINE_CONFIG_DERIVED(play_3_state::sklflite, play_3) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(sklflite_io) diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp index 3d7ae0183b1..4f018c76736 100644 --- a/src/mame/drivers/playch10.cpp +++ b/src/mame/drivers/playch10.cpp @@ -640,7 +640,7 @@ INTERRUPT_GEN_MEMBER(playch10_state::playch10_interrupt){ device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( playch10 ) +MACHINE_CONFIG_START(playch10_state::playch10) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, 8000000/2) // 4 MHz MCFG_CPU_PROGRAM_MAP(bios_map) @@ -696,11 +696,11 @@ static MACHINE_CONFIG_START( playch10 ) MCFG_RP5H01_ADD("rp5h01") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( playchnv, playch10 ) +MACHINE_CONFIG_DERIVED(playch10_state::playchnv, playch10) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( playch10_hboard, playch10 ) +MACHINE_CONFIG_DERIVED(playch10_state::playch10_hboard, playch10) MCFG_VIDEO_START_OVERRIDE(playch10_state,playch10_hboard) MCFG_MACHINE_START_OVERRIDE(playch10_state,playch10_hboard) MACHINE_CONFIG_END diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp index 722837bbf10..2eba0fb28ba 100644 --- a/src/mame/drivers/playmark.cpp +++ b/src/mame/drivers/playmark.cpp @@ -1033,7 +1033,7 @@ MACHINE_RESET_MEMBER(playmark_state,playmark) m_dispenser_latch = 0; } -static MACHINE_CONFIG_START( bigtwin ) +MACHINE_CONFIG_START(playmark_state::bigtwin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */ @@ -1073,7 +1073,7 @@ static MACHINE_CONFIG_START( bigtwin ) MCFG_DEVICE_ADDRESS_MAP(0, oki_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bigtwinb ) +MACHINE_CONFIG_START(playmark_state::bigtwinb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) @@ -1113,7 +1113,7 @@ static MACHINE_CONFIG_START( bigtwinb ) MCFG_DEVICE_ADDRESS_MAP(0, oki_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wbeachvl ) +MACHINE_CONFIG_START(playmark_state::wbeachvl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */ @@ -1157,7 +1157,7 @@ static MACHINE_CONFIG_START( wbeachvl ) MCFG_DEVICE_ADDRESS_MAP(0, oki_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( excelsr ) +MACHINE_CONFIG_START(playmark_state::excelsr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ @@ -1197,7 +1197,7 @@ static MACHINE_CONFIG_START( excelsr ) MCFG_DEVICE_ADDRESS_MAP(0, oki_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hrdtimes ) +MACHINE_CONFIG_START(playmark_state::hrdtimes) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */ @@ -1238,7 +1238,7 @@ static MACHINE_CONFIG_START( hrdtimes ) MCFG_DEVICE_ADDRESS_MAP(0, oki_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hotmind ) +MACHINE_CONFIG_START(playmark_state::hotmind) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */ @@ -1284,7 +1284,7 @@ static MACHINE_CONFIG_START( hotmind ) MCFG_DEVICE_ADDRESS_MAP(0, oki_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( luckboomh ) +MACHINE_CONFIG_START(playmark_state::luckboomh) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */ diff --git a/src/mame/drivers/plus4.cpp b/src/mame/drivers/plus4.cpp index 2b8977f3ee0..81d7fcd2224 100644 --- a/src/mame/drivers/plus4.cpp +++ b/src/mame/drivers/plus4.cpp @@ -154,6 +154,8 @@ public: // keyboard state uint8_t m_kb; + + void plus4(machine_config &config); }; @@ -165,6 +167,12 @@ public: { } DECLARE_READ8_MEMBER( cpu_r ); + void v364(machine_config &config); + void c16n(machine_config &config); + void c16p(machine_config &config); + void c232(machine_config &config); + void plus4p(machine_config &config); + void plus4n(machine_config &config); }; @@ -884,7 +892,7 @@ void plus4_state::machine_reset() // MACHINE_CONFIG( plus4 ) //------------------------------------------------- -static MACHINE_CONFIG_START( plus4 ) +MACHINE_CONFIG_START(plus4_state::plus4) // basic machine hardware MCFG_CPU_ADD(MOS7501_TAG, M7501, 0) MCFG_CPU_PROGRAM_MAP(plus4_mem) @@ -968,7 +976,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( plus4p ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( plus4p, plus4 ) +MACHINE_CONFIG_DERIVED(c16_state::plus4p, plus4) MCFG_DEVICE_MODIFY(MOS7501_TAG) MCFG_DEVICE_CLOCK(XTAL_17_73447MHz/20) @@ -989,7 +997,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( plus4n ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( plus4n, plus4 ) +MACHINE_CONFIG_DERIVED(c16_state::plus4n, plus4) MCFG_DEVICE_MODIFY(MOS7501_TAG) MCFG_DEVICE_CLOCK(XTAL_14_31818MHz/16) @@ -1010,7 +1018,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( c16n ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( c16n, plus4n ) +MACHINE_CONFIG_DERIVED(c16_state::c16n, plus4n) MCFG_CPU_MODIFY(MOS7501_TAG) MCFG_M7501_PORT_CALLBACKS(READ8(c16_state, cpu_r), WRITE8(plus4_state, cpu_w)) MCFG_M7501_PORT_PULLS(0x00, 0xc0) @@ -1032,7 +1040,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( c16p ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( c16p, plus4p ) +MACHINE_CONFIG_DERIVED(c16_state::c16p, plus4p) MCFG_CPU_MODIFY(MOS7501_TAG) MCFG_M7501_PORT_CALLBACKS(READ8(c16_state, cpu_r), WRITE8(plus4_state, cpu_w)) MCFG_M7501_PORT_PULLS(0x00, 0xc0) @@ -1054,7 +1062,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( c232 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( c232, c16p ) +MACHINE_CONFIG_DERIVED(c16_state::c232, c16p) MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("32K") MACHINE_CONFIG_END @@ -1064,7 +1072,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( v364 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( v364, plus4n ) +MACHINE_CONFIG_DERIVED(c16_state::v364, plus4n) MCFG_SOUND_ADD(T6721A_TAG, T6721A, XTAL_640kHz) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) diff --git a/src/mame/drivers/pluto5.cpp b/src/mame/drivers/pluto5.cpp index 3be60c827ca..f5a8cb56dc8 100644 --- a/src/mame/drivers/pluto5.cpp +++ b/src/mame/drivers/pluto5.cpp @@ -195,6 +195,7 @@ public: DECLARE_READ32_MEMBER(pluto5_mem_r); DECLARE_WRITE32_MEMBER(pluto5_mem_w); + void pluto5(machine_config &config); protected: // devices @@ -251,7 +252,7 @@ void pluto5_state::machine_start() } -static MACHINE_CONFIG_START( pluto5 ) +MACHINE_CONFIG_START(pluto5_state::pluto5) MCFG_CPU_ADD("maincpu", M68340, 16000000) MCFG_CPU_PROGRAM_MAP(pluto5_map) diff --git a/src/mame/drivers/plygonet.cpp b/src/mame/drivers/plygonet.cpp index 2e025dbca6f..2ceca9699e4 100644 --- a/src/mame/drivers/plygonet.cpp +++ b/src/mame/drivers/plygonet.cpp @@ -603,7 +603,7 @@ WRITE_LINE_MEMBER(polygonet_state::k054539_nmi_gen) m_sound_intck = state; } -static MACHINE_CONFIG_START( plygonet ) +MACHINE_CONFIG_START(polygonet_state::plygonet) MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/pm68k.cpp b/src/mame/drivers/pm68k.cpp index aa8068c0822..8a00421992c 100644 --- a/src/mame/drivers/pm68k.cpp +++ b/src/mame/drivers/pm68k.cpp @@ -26,6 +26,7 @@ public: , m_maincpu(*this, "maincpu") { } + void pm68k(machine_config &config); private: virtual void machine_reset() override; required_shared_ptr m_p_base; @@ -55,7 +56,7 @@ void pm68k_state::machine_reset() m_maincpu->reset(); } -static MACHINE_CONFIG_START( pm68k ) +MACHINE_CONFIG_START(pm68k_state::pm68k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) MCFG_CPU_PROGRAM_MAP(pm68k_mem) diff --git a/src/mame/drivers/pmd85.cpp b/src/mame/drivers/pmd85.cpp index cf1ffbbbf89..c4ee70f3a40 100644 --- a/src/mame/drivers/pmd85.cpp +++ b/src/mame/drivers/pmd85.cpp @@ -572,7 +572,7 @@ static const struct CassetteOptions pmd85_cassette_options = }; /* machine definition */ -static MACHINE_CONFIG_START( pmd85 ) +MACHINE_CONFIG_START(pmd85_state::pmd85) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, 2000000) /* 2.048MHz ??? */ MCFG_CPU_PROGRAM_MAP(pmd85_mem) @@ -640,7 +640,7 @@ static MACHINE_CONFIG_START( pmd85 ) MCFG_RAM_DEFAULT_SIZE("64K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pmd851, pmd85 ) +MACHINE_CONFIG_DERIVED(pmd85_state::pmd851, pmd85) MCFG_DEVICE_ADD("ppi8255_0", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(pmd85_state, pmd85_ppi_0_porta_r)) @@ -675,17 +675,17 @@ static MACHINE_CONFIG_DERIVED( pmd851, pmd85 ) MCFG_I8255_OUT_PORTC_CB(WRITE8(pmd85_state, pmd85_ppi_3_portc_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pmd852a, pmd851 ) +MACHINE_CONFIG_DERIVED(pmd85_state::pmd852a, pmd851) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pmd852a_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pmd853, pmd851 ) +MACHINE_CONFIG_DERIVED(pmd85_state::pmd853, pmd851) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pmd853_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( alfa, pmd85 ) +MACHINE_CONFIG_DERIVED(pmd85_state::alfa, pmd85) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(alfa_mem) @@ -714,7 +714,7 @@ static MACHINE_CONFIG_DERIVED( alfa, pmd85 ) MCFG_I8255_OUT_PORTC_CB(WRITE8(pmd85_state, pmd85_ppi_2_portc_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mato, pmd85 ) +MACHINE_CONFIG_DERIVED(pmd85_state::mato, pmd85) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mato_mem) MCFG_CPU_IO_MAP(mato_io_map) @@ -731,7 +731,7 @@ static MACHINE_CONFIG_DERIVED( mato, pmd85 ) MCFG_DEVICE_REMOVE("uart") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( c2717, pmd851 ) +MACHINE_CONFIG_DERIVED(pmd85_state::c2717, pmd851) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(c2717_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pmi80.cpp b/src/mame/drivers/pmi80.cpp index 0816086760c..3b0cf8f9f37 100644 --- a/src/mame/drivers/pmi80.cpp +++ b/src/mame/drivers/pmi80.cpp @@ -49,6 +49,7 @@ public: DECLARE_READ8_MEMBER(keyboard_r); DECLARE_WRITE8_MEMBER(keyboard_w); DECLARE_WRITE8_MEMBER(leds_w); + void pmi80(machine_config &config); private: uint8_t m_keyrow; bool m_ledready; @@ -152,7 +153,7 @@ void pmi80_state::machine_reset() } -static MACHINE_CONFIG_START( pmi80 ) +MACHINE_CONFIG_START(pmi80_state::pmi80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, XTAL_1MHz) MCFG_CPU_PROGRAM_MAP(pmi80_mem) diff --git a/src/mame/drivers/pntnpuzl.cpp b/src/mame/drivers/pntnpuzl.cpp index ba9047a2eac..769a3b99c50 100644 --- a/src/mame/drivers/pntnpuzl.cpp +++ b/src/mame/drivers/pntnpuzl.cpp @@ -172,6 +172,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); DECLARE_DRIVER_INIT(pip); required_device m_via; + void pntnpuzl(machine_config &config); }; @@ -344,7 +345,7 @@ static INPUT_PORTS_START( pntnpuzl ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D) INPUT_PORTS_END -static MACHINE_CONFIG_START( pntnpuzl ) +MACHINE_CONFIG_START(pntnpuzl_state::pntnpuzl) MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(pntnpuzl_map) @@ -362,7 +363,12 @@ static MACHINE_CONFIG_START( pntnpuzl ) MCFG_CPU_PROGRAM_MAP(mcu_map) // FIXME: this is all internal /* video hardware */ - MCFG_FRAGMENT_ADD( pcvideo_vga ) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update) + + MCFG_PALETTE_ADD("palette", 0x100) + MCFG_DEVICE_ADD("vga", VGA, 0) MACHINE_CONFIG_END ROM_START( pntnpuzl ) diff --git a/src/mame/drivers/pockchal.cpp b/src/mame/drivers/pockchal.cpp index 40ed4c2aff2..2298a7db909 100644 --- a/src/mame/drivers/pockchal.cpp +++ b/src/mame/drivers/pockchal.cpp @@ -48,6 +48,7 @@ public: required_device m_cart; uint32_t m_rom_size; DECLARE_DEVICE_IMAGE_LOAD_MEMBER(pockchalv1_cart); + void pockchalv1(machine_config &config); }; @@ -91,7 +92,7 @@ void pockchalv1_state::machine_reset() } -static MACHINE_CONFIG_START( pockchalv1 ) +MACHINE_CONFIG_START(pockchalv1_state::pockchalv1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMP90845,8000000) /* ? MHz */ diff --git a/src/mame/drivers/pocketc.cpp b/src/mame/drivers/pocketc.cpp index 688be28d2d8..b305a1ba7ee 100644 --- a/src/mame/drivers/pocketc.cpp +++ b/src/mame/drivers/pocketc.cpp @@ -712,7 +712,7 @@ static GFXDECODE_START( pc1251 ) GFXDECODE_ENTRY( "gfx1", 0x0000, pc1251_charlayout, 0, 8 ) GFXDECODE_END -static MACHINE_CONFIG_START( pocketc ) +MACHINE_CONFIG_START(pocketc_state::pocketc) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_NVRAM_ADD_0FILL("cpu_nvram") @@ -739,7 +739,7 @@ static MACHINE_CONFIG_START( pocketc ) MCFG_PALETTE_INIT_OWNER( pocketc_state, pocketc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc1401, pocketc ) +MACHINE_CONFIG_DERIVED(pc1401_state::pc1401, pocketc) MCFG_CPU_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */ MCFG_CPU_PROGRAM_MAP(pc1401_mem) MCFG_SC61860_READ_RESET_HANDLER(READLINE(pc1401_state,pc1401_reset)) @@ -755,12 +755,12 @@ static MACHINE_CONFIG_DERIVED( pc1401, pocketc ) MCFG_SCREEN_UPDATE_DRIVER(pc1401_state, screen_update_pc1401) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc1402, pc1401 ) +MACHINE_CONFIG_DERIVED(pc1401_state::pc1402, pc1401) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( pc1402_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc1250, pocketc ) +MACHINE_CONFIG_DERIVED(pc1251_state::pc1250, pocketc) MCFG_CPU_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */ MCFG_CPU_PROGRAM_MAP( pc1250_mem) MCFG_SC61860_READ_RESET_HANDLER(NOOP) @@ -780,29 +780,29 @@ static MACHINE_CONFIG_DERIVED( pc1250, pocketc ) MCFG_GFXDECODE_MODIFY("gfxdecode", pc1251 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc1251, pc1250 ) +MACHINE_CONFIG_DERIVED(pc1251_state::pc1251, pc1250) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( pc1251_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc1255, pc1250 ) +MACHINE_CONFIG_DERIVED(pc1251_state::pc1255, pc1250) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( pc1255_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc1260, pc1250 ) +MACHINE_CONFIG_DERIVED(pc1251_state::pc1260, pc1250) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( pc1260_mem) MCFG_MACHINE_START_OVERRIDE(pc1251_state, pc1260 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc1261, pc1260 ) +MACHINE_CONFIG_DERIVED(pc1251_state::pc1261, pc1260) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( pc1261_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc1350, pocketc ) +MACHINE_CONFIG_DERIVED(pc1350_state::pc1350, pocketc) MCFG_CPU_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */ MCFG_CPU_PROGRAM_MAP( pc1350_mem) MCFG_SC61860_READ_RESET_HANDLER(NOOP) @@ -830,7 +830,7 @@ static MACHINE_CONFIG_DERIVED( pc1350, pocketc ) MCFG_RAM_EXTRA_OPTIONS("12K,20K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc1403, pocketc ) +MACHINE_CONFIG_DERIVED(pc1403_state::pc1403, pocketc) MCFG_CPU_ADD( "maincpu", SC61860, 256000 ) MCFG_CPU_PROGRAM_MAP( pc1403_mem) MCFG_SC61860_READ_RESET_HANDLER(NOOP) @@ -855,7 +855,7 @@ static MACHINE_CONFIG_DERIVED( pc1403, pocketc ) MCFG_SCREEN_UPDATE_DRIVER(pc1403_state, screen_update_pc1403) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc1403h, pc1403 ) +MACHINE_CONFIG_DERIVED(pc1403_state::pc1403h, pc1403) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( pc1403h_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pockstat.cpp b/src/mame/drivers/pockstat.cpp index a1edb66638f..852adb537ba 100644 --- a/src/mame/drivers/pockstat.cpp +++ b/src/mame/drivers/pockstat.cpp @@ -154,6 +154,7 @@ public: uint32_t ps_intc_get_interrupt_line(uint32_t line); void ps_intc_set_interrupt_line(uint32_t line, int state); void ps_timer_start(int index); + void pockstat(machine_config &config); }; @@ -972,7 +973,7 @@ DEVICE_IMAGE_LOAD_MEMBER( pockstat_state, pockstat_flash ) return image_init_result::PASS; } -static MACHINE_CONFIG_START( pockstat ) +MACHINE_CONFIG_START(pockstat_state::pockstat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM7, DEFAULT_CLOCK) MCFG_CPU_PROGRAM_MAP(pockstat_mem) diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp index f24f6402bd7..3ab9f24d727 100644 --- a/src/mame/drivers/pofo.cpp +++ b/src/mame/drivers/pofo.cpp @@ -159,6 +159,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(counter_tick); DECLARE_READ8_MEMBER(hd61830_rd_r); IRQ_CALLBACK_MEMBER(portfolio_int_ack); + void portfolio(machine_config &config); }; @@ -1005,7 +1006,7 @@ void portfolio_state::machine_reset() // MACHINE_CONFIG( portfolio ) //------------------------------------------------- -static MACHINE_CONFIG_START( portfolio ) +MACHINE_CONFIG_START(portfolio_state::portfolio) // basic machine hardware MCFG_CPU_ADD(M80C88A_TAG, I8088, XTAL_4_9152MHz) MCFG_CPU_PROGRAM_MAP(portfolio_mem) diff --git a/src/mame/drivers/poisk1.cpp b/src/mame/drivers/poisk1.cpp index e3bfb0e2ce7..7ddebbc2cb2 100644 --- a/src/mame/drivers/poisk1.cpp +++ b/src/mame/drivers/poisk1.cpp @@ -136,6 +136,7 @@ public: DECLARE_WRITE8_MEMBER(p1_ppi2_portb_w); DECLARE_READ8_MEMBER(p1_ppi2_portc_r); const char *m_cputag; + void poisk1(machine_config &config); }; /* @@ -631,7 +632,7 @@ static INPUT_PORTS_START( poisk1 ) PORT_INCLUDE( poisk1_keyboard_v91 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( poisk1 ) +MACHINE_CONFIG_START(p1_state::poisk1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, 5000000) MCFG_CPU_PROGRAM_MAP(poisk1_map) diff --git a/src/mame/drivers/pokechmp.cpp b/src/mame/drivers/pokechmp.cpp index 7e2ce89565e..154fe8b0d6c 100644 --- a/src/mame/drivers/pokechmp.cpp +++ b/src/mame/drivers/pokechmp.cpp @@ -216,7 +216,7 @@ OKI M6295 (an AD65 on this board, note pin 7 is low): 1.5mhz */ -static MACHINE_CONFIG_START( pokechmp ) +MACHINE_CONFIG_START(pokechmp_state::pokechmp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_4MHz/4) diff --git a/src/mame/drivers/pokemini.cpp b/src/mame/drivers/pokemini.cpp index 1860588bef6..bea8657d8ee 100644 --- a/src/mame/drivers/pokemini.cpp +++ b/src/mame/drivers/pokemini.cpp @@ -77,6 +77,7 @@ public: DECLARE_READ8_MEMBER(rom_r); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(pokemini_cart); + void pokemini(machine_config &config); protected: enum { @@ -1753,7 +1754,7 @@ uint32_t pokemini_state::screen_update(screen_device &screen, bitmap_ind16 &bitm } -static MACHINE_CONFIG_START( pokemini ) +MACHINE_CONFIG_START(pokemini_state::pokemini) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MINX, 4000000) MCFG_CPU_PROGRAM_MAP(pokemini_mem_map) diff --git a/src/mame/drivers/poker72.cpp b/src/mame/drivers/poker72.cpp index d0dc35d5e17..4816ba7ecda 100644 --- a/src/mame/drivers/poker72.cpp +++ b/src/mame/drivers/poker72.cpp @@ -50,6 +50,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void poker72(machine_config &config); }; @@ -363,7 +364,7 @@ void poker72_state::machine_reset() membank("bank1")->set_entry(0); } -static MACHINE_CONFIG_START( poker72 ) +MACHINE_CONFIG_START(poker72_state::poker72) /* basic machine hardware */ diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp index 332788b5c26..f752100d180 100644 --- a/src/mame/drivers/polepos.cpp +++ b/src/mame/drivers/polepos.cpp @@ -848,7 +848,7 @@ GFXDECODE_END * Machine driver *********************************************************************/ -static MACHINE_CONFIG_START( polepos ) +MACHINE_CONFIG_START(polepos_state::polepos) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */ @@ -979,7 +979,7 @@ static ADDRESS_MAP_START( sound_z80_bootleg_iomap, AS_IO, 8, polepos_state ) AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("tms", tms5220_device, status_r, data_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START( topracern ) +MACHINE_CONFIG_START(polepos_state::topracern) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */ @@ -1058,7 +1058,7 @@ static MACHINE_CONFIG_START( topracern ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( polepos2bi, topracern ) +MACHINE_CONFIG_DERIVED(polepos_state::polepos2bi, topracern) MCFG_CPU_ADD("soundz80bl", Z80, MASTER_CLOCK/8) /*? MHz */ MCFG_CPU_PROGRAM_MAP(sound_z80_bootleg_map) diff --git a/src/mame/drivers/polgar.cpp b/src/mame/drivers/polgar.cpp index 681f69ddfaf..c63fa5263b7 100644 --- a/src/mame/drivers/polgar.cpp +++ b/src/mame/drivers/polgar.cpp @@ -35,6 +35,8 @@ public: DECLARE_WRITE8_MEMBER(polgar_led_w); DECLARE_READ8_MEMBER(polgar_keys_r); + void polgar10(machine_config &config); + void polgar(machine_config &config); protected: optional_ioport m_keys; }; @@ -56,6 +58,7 @@ public: DECLARE_READ8_MEMBER(latch1_r); DECLARE_READ32_MEMBER(disable_boot_rom_r); + void mrisc(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -85,6 +88,7 @@ public: DECLARE_WRITE8_MEMBER(milano_led_w); DECLARE_WRITE8_MEMBER(milano_io_w); + void milano(machine_config &config); protected: virtual void machine_reset() override; virtual void machine_start() override; @@ -112,6 +116,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(nmi_on) { m_maincpu->set_input_line(M6502_NMI_LINE, ASSERT_LINE); } TIMER_DEVICE_CALLBACK_MEMBER(nmi_off) { m_maincpu->set_input_line(M6502_NMI_LINE, CLEAR_LINE); } + void modena(machine_config &config); protected: virtual void machine_reset() override; virtual void machine_start() override; @@ -139,6 +144,7 @@ public: DECLARE_WRITE8_MEMBER(academy_led_w); DECLARE_READ8_MEMBER(academy_input_r); + void academy(machine_config &config); protected: virtual void machine_reset() override; @@ -460,7 +466,7 @@ void mephisto_academy_state::machine_reset() m_enable_nmi = true; } -static MACHINE_CONFIG_START( polgar ) +MACHINE_CONFIG_START(mephisto_polgar_state::polgar) MCFG_CPU_ADD("maincpu", M65C02, XTAL_4_9152MHz) MCFG_CPU_PROGRAM_MAP(polgar_mem) MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_polgar_state, nmi_line_pulse, XTAL_4_9152MHz / (1 << 13)) @@ -472,12 +478,12 @@ static MACHINE_CONFIG_START( polgar ) MCFG_DEFAULT_LAYOUT(layout_mephisto_lcd) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( polgar10, polgar ) +MACHINE_CONFIG_DERIVED(mephisto_polgar_state::polgar10, polgar) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK( XTAL_10MHz ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mrisc ) +MACHINE_CONFIG_START(mephisto_risc_state::mrisc) MCFG_CPU_ADD("maincpu", M65C02, XTAL_10MHz / 4) // G65SC02 MCFG_CPU_PROGRAM_MAP(mrisc_mem) MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_risc_state, irq0_line_hold, (double)XTAL_10MHz / (1 << 14)) @@ -498,7 +504,7 @@ static MACHINE_CONFIG_START( mrisc ) MCFG_DEFAULT_LAYOUT(layout_mephisto_lcd) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( milano, polgar ) +MACHINE_CONFIG_DERIVED(mephisto_milano_state::milano, polgar) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(milano_mem) @@ -508,14 +514,14 @@ static MACHINE_CONFIG_DERIVED( milano, polgar ) MCFG_DEFAULT_LAYOUT(layout_mephisto_milano) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( academy, polgar ) +MACHINE_CONFIG_DERIVED(mephisto_academy_state::academy, polgar) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(academy_mem) MCFG_DEFAULT_LAYOUT(layout_mephisto_academy) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( modena, milano ) +MACHINE_CONFIG_DERIVED(mephisto_modena_state::modena, polgar) MCFG_CPU_MODIFY("maincpu") // W65C02SP MCFG_CPU_CLOCK(XTAL_4_194304Mhz) MCFG_CPU_PROGRAM_MAP(modena_mem) @@ -524,7 +530,10 @@ static MACHINE_CONFIG_DERIVED( modena, milano ) MCFG_TIMER_START_DELAY(attotime::from_hz((double)XTAL_4_194304Mhz / (1 << 13)) - attotime::from_usec(975)) // active for 975us MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_off", mephisto_modena_state, nmi_off, attotime::from_hz((double)XTAL_4_194304Mhz / (1 << 13))) + MCFG_DEVICE_REMOVE("board") MCFG_DEVICE_REMOVE("display") + MCFG_MEPHISTO_BUTTONS_BOARD_ADD("board") + MCFG_MEPHISTO_BOARD_DISABLE_LEDS(true) MCFG_DEFAULT_LAYOUT(layout_mephisto_modena) /* sound hardware */ diff --git a/src/mame/drivers/policetr.cpp b/src/mame/drivers/policetr.cpp index 32d0866105b..95f3dec346e 100644 --- a/src/mame/drivers/policetr.cpp +++ b/src/mame/drivers/policetr.cpp @@ -397,7 +397,7 @@ void policetr_state::machine_start() * *************************************/ -static MACHINE_CONFIG_START( policetr ) +MACHINE_CONFIG_START(policetr_state::policetr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R3041, MASTER_CLOCK/2) @@ -428,7 +428,7 @@ static MACHINE_CONFIG_START( policetr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sshooter, policetr ) +MACHINE_CONFIG_DERIVED(policetr_state::sshooter, policetr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/poly.cpp b/src/mame/drivers/poly.cpp index 6a8adcc1bb5..d852ccea6dd 100644 --- a/src/mame/drivers/poly.cpp +++ b/src/mame/drivers/poly.cpp @@ -65,6 +65,7 @@ public: DECLARE_WRITE_LINE_MEMBER( ptm_o3_callback ); DECLARE_WRITE8_MEMBER(baud_rate_w); + void poly(machine_config &config); protected: virtual void machine_reset() override; @@ -150,7 +151,7 @@ WRITE8_MEMBER(poly_state::baud_rate_w) m_acia_clock->set_clock_scale((selector <= 5) ? 1.0 / (1 << selector) : 0.0); } -static MACHINE_CONFIG_START( poly ) +MACHINE_CONFIG_START(poly_state::poly) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_12_0576MHz / 3) // nominally 4 MHz MCFG_CPU_PROGRAM_MAP(poly_mem) diff --git a/src/mame/drivers/poly88.cpp b/src/mame/drivers/poly88.cpp index af60dced0a5..d53f023eb1c 100644 --- a/src/mame/drivers/poly88.cpp +++ b/src/mame/drivers/poly88.cpp @@ -191,7 +191,7 @@ static GFXDECODE_START( poly88 ) GFXDECODE_ENTRY( "chargen", 0x0000, poly88_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( poly88 ) +MACHINE_CONFIG_START(poly88_state::poly88) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080A, XTAL_16_5888MHz / 9) // uses 8224 clock generator MCFG_CPU_PROGRAM_MAP(poly88_mem) @@ -231,7 +231,7 @@ static MACHINE_CONFIG_START( poly88 ) MCFG_SNAPSHOT_ADD("snapshot", poly88_state, poly88, "img", 2) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( poly8813, poly88 ) +MACHINE_CONFIG_DERIVED(poly88_state::poly8813, poly88) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(poly8813_mem) MCFG_CPU_IO_MAP(poly8813_io) diff --git a/src/mame/drivers/poly880.cpp b/src/mame/drivers/poly880.cpp index cddaf752477..24e5330cb88 100644 --- a/src/mame/drivers/poly880.cpp +++ b/src/mame/drivers/poly880.cpp @@ -242,7 +242,7 @@ void poly880_state::machine_start() /* Machine Driver */ -static MACHINE_CONFIG_START( poly880 ) +MACHINE_CONFIG_START(poly880_state::poly880) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_7_3728MHz/8) MCFG_CPU_PROGRAM_MAP(poly880_mem) diff --git a/src/mame/drivers/polyplay.cpp b/src/mame/drivers/polyplay.cpp index 4b1b37e89eb..3359d232fea 100644 --- a/src/mame/drivers/polyplay.cpp +++ b/src/mame/drivers/polyplay.cpp @@ -308,7 +308,7 @@ GFXDECODE_END /* the machine driver */ -static MACHINE_CONFIG_START( polyplay_zre ) +MACHINE_CONFIG_START(polyplay_state::polyplay_zre) /* basic machine hardware */ MCFG_CPU_ADD(Z80CPU_TAG, Z80, POLYPLAY_MAIN_CLOCK / 4) /* UB880D */ MCFG_Z80_DAISY_CHAIN(daisy_chain_zre) @@ -350,7 +350,7 @@ static MACHINE_CONFIG_START( polyplay_zre ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( polyplay_zrepp ) +MACHINE_CONFIG_START(polyplay_state::polyplay_zrepp) MCFG_FRAGMENT_ADD( polyplay_zre ) /* basic machine hardware */ diff --git a/src/mame/drivers/pong.cpp b/src/mame/drivers/pong.cpp index 9834d60bfde..9b8de923d86 100644 --- a/src/mame/drivers/pong.cpp +++ b/src/mame/drivers/pong.cpp @@ -181,6 +181,9 @@ public: DECLARE_INPUT_CHANGED_MEMBER(input_changed); + void pongd(machine_config &config); + void pong(machine_config &config); + void pongf(machine_config &config); protected: // driver_device overrides @@ -245,6 +248,7 @@ public: m_sw1_4->write((newval>>3) & 1); } + void breakout(machine_config &config); protected: // driver_device overrides @@ -371,7 +375,7 @@ static INPUT_PORTS_START( breakout ) INPUT_PORTS_END -static MACHINE_CONFIG_START( pong ) +MACHINE_CONFIG_START(pong_state::pong) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) @@ -406,7 +410,7 @@ static MACHINE_CONFIG_START( pong ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( breakout ) +MACHINE_CONFIG_START(breakout_state::breakout) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) @@ -459,7 +463,7 @@ static MACHINE_CONFIG_START( breakout ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pongf, pong ) +MACHINE_CONFIG_DERIVED(pong_state::pongf, pong) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") @@ -467,7 +471,7 @@ static MACHINE_CONFIG_DERIVED( pongf, pong ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pongd ) +MACHINE_CONFIG_START(pong_state::pongd) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/poolshrk.cpp b/src/mame/drivers/poolshrk.cpp index 9634ae8544f..b0c4400f78c 100644 --- a/src/mame/drivers/poolshrk.cpp +++ b/src/mame/drivers/poolshrk.cpp @@ -215,7 +215,7 @@ PALETTE_INIT_MEMBER(poolshrk_state, poolshrk) } -static MACHINE_CONFIG_START( poolshrk ) +MACHINE_CONFIG_START(poolshrk_state::poolshrk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 11055000 / 8) /* ? */ diff --git a/src/mame/drivers/pooyan.cpp b/src/mame/drivers/pooyan.cpp index faa5493408f..a7c3550867f 100644 --- a/src/mame/drivers/pooyan.cpp +++ b/src/mame/drivers/pooyan.cpp @@ -20,6 +20,7 @@ #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_18_432MHz @@ -191,8 +192,18 @@ void pooyan_state::machine_start() save_item(NAME(m_irq_enable)); } +static ADDRESS_MAP_START( timeplt_sound_map, AS_PROGRAM, 8, timeplt_audio_device ) + AM_RANGE(0x0000, 0x2fff) AM_ROM + AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM + AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay1", ay8910_device, data_r, data_w) + AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay1", ay8910_device, address_w) + AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay2", ay8910_device, data_r, data_w) + AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay2", ay8910_device, address_w) + AM_RANGE(0x8000, 0xffff) AM_DEVWRITE("timeplt_audio", timeplt_audio_device, filter_w) +ADDRESS_MAP_END + -static MACHINE_CONFIG_START( pooyan ) +MACHINE_CONFIG_START(pooyan_state::pooyan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) @@ -227,7 +238,40 @@ static MACHINE_CONFIG_START( pooyan ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_FRAGMENT_ADD(timeplt_sound) + /* basic machine hardware */ + MCFG_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8) + MCFG_CPU_PROGRAM_MAP(timeplt_sound_map) + + /* sound hardware */ + MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0) + + MCFG_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/8) + MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) + MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("timeplt_audio", timeplt_audio_device, portB_r)) + MCFG_SOUND_ROUTE(0, "filter.0.0", 0.60) + MCFG_SOUND_ROUTE(1, "filter.0.1", 0.60) + MCFG_SOUND_ROUTE(2, "filter.0.2", 0.60) + + MCFG_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/8) + MCFG_SOUND_ROUTE(0, "filter.1.0", 0.60) + MCFG_SOUND_ROUTE(1, "filter.1.1", 0.60) + MCFG_SOUND_ROUTE(2, "filter.1.2", 0.60) + + MCFG_FILTER_RC_ADD("filter.0.0", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FILTER_RC_ADD("filter.0.1", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FILTER_RC_ADD("filter.0.2", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + + MCFG_FILTER_RC_ADD("filter.1.0", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FILTER_RC_ADD("filter.1.1", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FILTER_RC_ADD("filter.1.2", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/popeye.cpp b/src/mame/drivers/popeye.cpp index 0cc8f8db31c..8908c821295 100644 --- a/src/mame/drivers/popeye.cpp +++ b/src/mame/drivers/popeye.cpp @@ -445,7 +445,7 @@ WRITE8_MEMBER(popeye_state::popeye_portB_w) m_dswbit = (data & 0x0e) >> 1; } -static MACHINE_CONFIG_START( tnx1 ) +MACHINE_CONFIG_START(popeye_state::tnx1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* 4 MHz */ MCFG_CPU_PROGRAM_MAP(tnx1_map) @@ -474,14 +474,14 @@ static MACHINE_CONFIG_START( tnx1 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tpp1, tnx1 ) +MACHINE_CONFIG_DERIVED(popeye_state::tpp1, tnx1) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(popeye_state,tpp1) MCFG_VIDEO_START_OVERRIDE(popeye_state,tpp1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tpp2, tpp1 ) +MACHINE_CONFIG_DERIVED(popeye_state::tpp2, tpp1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tpp2_map) @@ -510,7 +510,7 @@ static MACHINE_CONFIG_DERIVED( tpp2, tpp1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( popeyebl, tpp1 ) +MACHINE_CONFIG_DERIVED(popeye_state::popeyebl, tpp1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(popeyebl_map) diff --git a/src/mame/drivers/popobear.cpp b/src/mame/drivers/popobear.cpp index 27983bdc3fa..6a9372fe5b1 100644 --- a/src/mame/drivers/popobear.cpp +++ b/src/mame/drivers/popobear.cpp @@ -131,6 +131,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(irq); void postload(); + void popobear(machine_config &config); }; @@ -635,7 +636,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(popobear_state::irq) m_maincpu->set_input_line(2, ASSERT_LINE); } -static MACHINE_CONFIG_START( popobear ) +MACHINE_CONFIG_START(popobear_state::popobear) MCFG_CPU_ADD("maincpu", M68000, XTAL_42MHz/4) // XTAL CORRECT, DIVISOR GUESSED MCFG_CPU_PROGRAM_MAP(popobear_mem) // levels 2,3,5 look interesting diff --git a/src/mame/drivers/popper.cpp b/src/mame/drivers/popper.cpp index 3b129a95c25..fdc14405b3a 100644 --- a/src/mame/drivers/popper.cpp +++ b/src/mame/drivers/popper.cpp @@ -85,6 +85,7 @@ public: DECLARE_READ8_MEMBER(watchdog_clear_r); DECLARE_READ8_MEMBER(inputs_r); + void popper(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -526,7 +527,7 @@ void popper_state::machine_reset() // MACHINE DEFINTIONS //************************************************************************** -static MACHINE_CONFIG_START( popper ) +MACHINE_CONFIG_START(popper_state::popper) MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/3/2) MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/portrait.cpp b/src/mame/drivers/portrait.cpp index 3ab82b776da..e027b88fc06 100644 --- a/src/mame/drivers/portrait.cpp +++ b/src/mame/drivers/portrait.cpp @@ -247,7 +247,7 @@ static GFXDECODE_START( portrait ) GFXDECODE_END -static MACHINE_CONFIG_START( portrait ) +MACHINE_CONFIG_START(portrait_state::portrait) MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */ MCFG_CPU_PROGRAM_MAP(portrait_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", portrait_state, irq0_line_hold) diff --git a/src/mame/drivers/potgoldu.cpp b/src/mame/drivers/potgoldu.cpp index 8d5b3a54887..e324bf5efcb 100644 --- a/src/mame/drivers/potgoldu.cpp +++ b/src/mame/drivers/potgoldu.cpp @@ -37,6 +37,7 @@ public: virtual void video_start() override; TMS340X0_SCANLINE_RGB32_CB_MEMBER(scanline_update); + void potgold(machine_config &config); }; @@ -71,7 +72,7 @@ static INPUT_PORTS_START( potgold ) INPUT_PORTS_END -static MACHINE_CONFIG_START( potgold ) +MACHINE_CONFIG_START(potgold_state::potgold) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz) diff --git a/src/mame/drivers/powerbal.cpp b/src/mame/drivers/powerbal.cpp index 6b1cdbd3496..5f9054eb2a4 100644 --- a/src/mame/drivers/powerbal.cpp +++ b/src/mame/drivers/powerbal.cpp @@ -51,6 +51,8 @@ public: DECLARE_WRITE16_MEMBER(magicstk_bgvideoram_w); DECLARE_WRITE16_MEMBER(tile_banking_w); DECLARE_WRITE16_MEMBER(oki_banking); + void magicstk(machine_config &config); + void powerbal(machine_config &config); }; @@ -491,7 +493,7 @@ MACHINE_RESET_MEMBER(powerbal_state,powerbal) configure_oki_banks(); } -static MACHINE_CONFIG_START( powerbal ) +MACHINE_CONFIG_START(powerbal_state::powerbal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */ @@ -524,7 +526,7 @@ static MACHINE_CONFIG_START( powerbal ) MCFG_DEVICE_ADDRESS_MAP(0, oki_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( magicstk ) +MACHINE_CONFIG_START(powerbal_state::magicstk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */ diff --git a/src/mame/drivers/powerins.cpp b/src/mame/drivers/powerins.cpp index db8a051c7ce..fa1ea6c623d 100644 --- a/src/mame/drivers/powerins.cpp +++ b/src/mame/drivers/powerins.cpp @@ -295,7 +295,7 @@ MACHINE_START_MEMBER(powerins_state, powerinsa) membank("okibank")->configure_entries(0, 5, memregion("oki1")->base() + 0x30000, 0x10000); } -static MACHINE_CONFIG_START( powerins ) +MACHINE_CONFIG_START(powerins_state::powerins) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12MHz */ @@ -341,7 +341,7 @@ static MACHINE_CONFIG_START( powerins ) MCFG_NMK112_ROM1("oki2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( powerinsa, powerins ) +MACHINE_CONFIG_DERIVED(powerins_state::powerinsa, powerins) /* basic machine hardware */ @@ -364,7 +364,7 @@ static MACHINE_CONFIG_DERIVED( powerinsa, powerins ) MCFG_DEVICE_REMOVE("nmk112") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( powerinsb, powerins ) +MACHINE_CONFIG_DERIVED(powerins_state::powerinsb, powerins) /* basic machine hardware */ diff --git a/src/mame/drivers/powerstack.cpp b/src/mame/drivers/powerstack.cpp index c565df94322..0eb12ceec61 100644 --- a/src/mame/drivers/powerstack.cpp +++ b/src/mame/drivers/powerstack.cpp @@ -19,6 +19,7 @@ public: // , m_maincpu(*this, "maincpu") { } +void powerstack(machine_config &config); private: // required_device m_maincpu; }; @@ -30,7 +31,7 @@ private: static INPUT_PORTS_START( powerstack ) INPUT_PORTS_END -static MACHINE_CONFIG_START( powerstack ) +MACHINE_CONFIG_START(powerstack_state::powerstack) // MCFG_CPU_ADD("maincpu", PPC604, 300'000'000) // PPC604E @ 300MHz // MCFG_CPU_PROGRAM_MAP(mem_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pp01.cpp b/src/mame/drivers/pp01.cpp index 02f20b09d15..5f6f54ce880 100644 --- a/src/mame/drivers/pp01.cpp +++ b/src/mame/drivers/pp01.cpp @@ -198,7 +198,7 @@ static INPUT_PORTS_START( pp01 ) INPUT_PORTS_END /* Machine driver */ -static MACHINE_CONFIG_START( pp01 ) +MACHINE_CONFIG_START(pp01_state::pp01) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, 2000000) MCFG_CPU_PROGRAM_MAP(pp01_mem) diff --git a/src/mame/drivers/ppmast93.cpp b/src/mame/drivers/ppmast93.cpp index 17b319e10ec..77f32e8edd5 100644 --- a/src/mame/drivers/ppmast93.cpp +++ b/src/mame/drivers/ppmast93.cpp @@ -171,6 +171,7 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void ppmast93(machine_config &config); }; @@ -360,7 +361,7 @@ uint32_t ppmast93_state::screen_update(screen_device &screen, bitmap_ind16 &bitm return 0; } -static MACHINE_CONFIG_START( ppmast93 ) +MACHINE_CONFIG_START(ppmast93_state::ppmast93) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,5000000) /* 5 MHz */ MCFG_CPU_PROGRAM_MAP(ppmast93_cpu1_map) diff --git a/src/mame/drivers/prehisle.cpp b/src/mame/drivers/prehisle.cpp index 835b7f1b046..0eaa858905e 100644 --- a/src/mame/drivers/prehisle.cpp +++ b/src/mame/drivers/prehisle.cpp @@ -196,7 +196,7 @@ GFXDECODE_END /******************************************************************************/ -static MACHINE_CONFIG_START( prehisle ) +MACHINE_CONFIG_START(prehisle_state::prehisle) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_18MHz/2) /* verified on pcb */ diff --git a/src/mame/drivers/prestige.cpp b/src/mame/drivers/prestige.cpp index 6c166a56065..cd232915a82 100644 --- a/src/mame/drivers/prestige.cpp +++ b/src/mame/drivers/prestige.cpp @@ -153,6 +153,15 @@ public: DECLARE_PALETTE_INIT(glcolor); TIMER_DEVICE_CALLBACK_MEMBER(irq_timer); IRQ_CALLBACK_MEMBER(prestige_int_ack); + void prestige_base(machine_config &config); + void princ(machine_config &config); + void gl6000sl(machine_config &config); + void gjmovie(machine_config &config); + void snotec(machine_config &config); + void glmcolor(machine_config &config); + void glcolor(machine_config &config); + void prestige(machine_config &config); + void gl7007sl(machine_config &config); }; @@ -723,7 +732,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(prestige_state::irq_timer) m_maincpu->set_input_line(0, ASSERT_LINE); } -static MACHINE_CONFIG_START( prestige_base ) +MACHINE_CONFIG_START(prestige_state::prestige_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz) // Z84C008 MCFG_CPU_PROGRAM_MAP(prestige_mem) @@ -755,7 +764,7 @@ static MACHINE_CONFIG_START( prestige_base ) MCFG_RAM_EXTRA_OPTIONS("64K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( glcolor, prestige_base ) +MACHINE_CONFIG_DERIVED(prestige_state::glcolor, prestige_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(glcolor_io) @@ -773,41 +782,41 @@ static MACHINE_CONFIG_DERIVED( glcolor, prestige_base ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("snotec_cart", "snotec") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( glmcolor, glcolor ) +MACHINE_CONFIG_DERIVED(prestige_state::glmcolor, glcolor) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(prestige_io) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( snotec, glcolor ) +MACHINE_CONFIG_DERIVED(prestige_state::snotec, glcolor) MCFG_SOFTWARE_LIST_REMOVE("cart_list") MCFG_SOFTWARE_LIST_REMOVE("snotec_cart") MCFG_SOFTWARE_LIST_ADD("cart_list", "snotec") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("glcolor_cart", "glcolor") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( prestige, prestige_base ) +MACHINE_CONFIG_DERIVED(prestige_state::prestige, prestige_base) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("gl6000sl_cart", "gl6000sl") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("misterx_cart", "misterx") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("gl2000_cart", "gl2000") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gl6000sl, prestige_base ) +MACHINE_CONFIG_DERIVED(prestige_state::gl6000sl, prestige_base) MCFG_SOFTWARE_LIST_ADD("cart_list", "gl6000sl") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("misterx_cart", "misterx") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("gl2000_cart", "gl2000") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gl7007sl, prestige_base ) +MACHINE_CONFIG_DERIVED(prestige_state::gl7007sl, prestige_base) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("gl6000sl_cart", "gl6000sl") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("gl2000_cart", "gl2000") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("misterx_cart", "misterx") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gjmovie, prestige_base ) +MACHINE_CONFIG_DERIVED(prestige_state::gjmovie, prestige_base) MCFG_SOFTWARE_LIST_ADD("cart_list", "gjmovie") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( princ, prestige_base ) +MACHINE_CONFIG_DERIVED(prestige_state::princ, prestige_base) MCFG_DEVICE_REMOVE("cartslot") MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "princ_cart") MCFG_SOFTWARE_LIST_ADD("cart_list", "princ") diff --git a/src/mame/drivers/primo.cpp b/src/mame/drivers/primo.cpp index 56fe2044328..7bfd2747ddb 100644 --- a/src/mame/drivers/primo.cpp +++ b/src/mame/drivers/primo.cpp @@ -240,7 +240,7 @@ static const struct CassetteOptions primo_cassette_options = { 22050 /* sample frequency */ }; -static MACHINE_CONFIG_START( primoa32 ) +MACHINE_CONFIG_START(primo_state::primoa32) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", Z80, 2500000 ) MCFG_CPU_PROGRAM_MAP( primo32_mem) @@ -284,38 +284,38 @@ static MACHINE_CONFIG_START( primoa32 ) MCFG_GENERIC_EXTENSIONS("bin,rom") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( primoa48, primoa32 ) +MACHINE_CONFIG_DERIVED(primo_state::primoa48, primoa32) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(primo48_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( primoa64, primoa32 ) +MACHINE_CONFIG_DERIVED(primo_state::primoa64, primoa32) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(primo64_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( primob32, primoa32 ) +MACHINE_CONFIG_DERIVED(primo_state::primob32, primoa32) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(primob_port) MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( primob48, primoa48 ) +MACHINE_CONFIG_DERIVED(primo_state::primob48, primoa48) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(primob_port) MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( primob64, primoa64 ) +MACHINE_CONFIG_DERIVED(primo_state::primob64, primoa64) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(primob_port) MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( primoc64, primoa64 ) +MACHINE_CONFIG_DERIVED(primo_state::primoc64, primoa64) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(primob_port) diff --git a/src/mame/drivers/pro80.cpp b/src/mame/drivers/pro80.cpp index e9b0cb2dafd..36250e9a82b 100644 --- a/src/mame/drivers/pro80.cpp +++ b/src/mame/drivers/pro80.cpp @@ -45,6 +45,7 @@ public: DECLARE_READ8_MEMBER(kp_r); TIMER_DEVICE_CALLBACK_MEMBER(timer_p); + void pro80(machine_config &config); private: uint8_t m_digit_sel; uint8_t m_cass_in; @@ -165,7 +166,7 @@ void pro80_state::machine_reset() m_cass_in = 0; } -static MACHINE_CONFIG_START( pro80 ) +MACHINE_CONFIG_START(pro80_state::pro80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz / 2) MCFG_CPU_PROGRAM_MAP(pro80_mem) diff --git a/src/mame/drivers/proconn.cpp b/src/mame/drivers/proconn.cpp index 9b0ab46570c..a4e5bdbd582 100644 --- a/src/mame/drivers/proconn.cpp +++ b/src/mame/drivers/proconn.cpp @@ -179,6 +179,7 @@ public: DECLARE_WRITE8_MEMBER(pio_5_m_out_pb_w) { logerror("pio_5_m_out_pb_w %02x (LAMPS1)\n", data); } DECLARE_WRITE_LINE_MEMBER(pio_5_m_out_brdy_w) { logerror("pio_5_m_out_brdy_w %02x\n", state); } + void proconn(machine_config &config); protected: // devices @@ -318,7 +319,7 @@ void proconn_state::machine_reset() m_vfd->reset(); // reset display1 } -static MACHINE_CONFIG_START( proconn ) +MACHINE_CONFIG_START(proconn_state::proconn) MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ?? Mhz */ MCFG_Z80_DAISY_CHAIN(z80_daisy_chain) MCFG_CPU_PROGRAM_MAP(proconn_map) diff --git a/src/mame/drivers/prodigy.cpp b/src/mame/drivers/prodigy.cpp index 862d94ac18b..230becb4a89 100644 --- a/src/mame/drivers/prodigy.cpp +++ b/src/mame/drivers/prodigy.cpp @@ -164,6 +164,7 @@ public: DECLARE_WRITE_LINE_MEMBER(via_cb2_w); DECLARE_WRITE_LINE_MEMBER(irq_handler); + void prodigy(machine_config &config); private: required_device m_maincpu; required_device m_74145; @@ -629,7 +630,7 @@ static INPUT_PORTS_START( prodigy ) PORT_BIT(0xc00, 0x00, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( prodigy ) +MACHINE_CONFIG_START(prodigy_state::prodigy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_2MHz) MCFG_CPU_PROGRAM_MAP(maincpu_map) diff --git a/src/mame/drivers/prof180x.cpp b/src/mame/drivers/prof180x.cpp index 60dd5623a5a..053f7020895 100644 --- a/src/mame/drivers/prof180x.cpp +++ b/src/mame/drivers/prof180x.cpp @@ -234,7 +234,7 @@ void prof180x_state::machine_reset() } } -static MACHINE_CONFIG_START( prof180x ) +MACHINE_CONFIG_START(prof180x_state::prof180x) /* basic machine hardware */ MCFG_CPU_ADD(HD64180_TAG, Z80, XTAL_9_216MHz) MCFG_CPU_PROGRAM_MAP(prof180x_mem) diff --git a/src/mame/drivers/prof80.cpp b/src/mame/drivers/prof80.cpp index b1b55ea40f0..d856aee5f88 100644 --- a/src/mame/drivers/prof80.cpp +++ b/src/mame/drivers/prof80.cpp @@ -443,7 +443,7 @@ void prof80_state::machine_start() // MACHINE_CONFIG( prof80 ) //------------------------------------------------- -static MACHINE_CONFIG_START( prof80 ) +MACHINE_CONFIG_START(prof80_state::prof80) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_6MHz) MCFG_CPU_PROGRAM_MAP(prof80_mem) diff --git a/src/mame/drivers/progolf.cpp b/src/mame/drivers/progolf.cpp index e62a9f66337..f5e48dded71 100644 --- a/src/mame/drivers/progolf.cpp +++ b/src/mame/drivers/progolf.cpp @@ -105,6 +105,8 @@ public: DECLARE_PALETTE_INIT(progolf); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void progolfa(machine_config &config); + void progolf(machine_config &config); }; @@ -409,7 +411,7 @@ PALETTE_INIT_MEMBER(progolf_state, progolf) } } -static MACHINE_CONFIG_START( progolf ) +MACHINE_CONFIG_START(progolf_state::progolf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", DECO_222, 3000000/2) /* guess, 3 Mhz makes the game to behave worse? */ MCFG_CPU_PROGRAM_MAP(main_cpu) @@ -450,7 +452,7 @@ static MACHINE_CONFIG_START( progolf ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( progolfa, progolf ) +MACHINE_CONFIG_DERIVED(progolf_state::progolfa, progolf) MCFG_DEVICE_REMOVE("maincpu") /* different encrypted cpu to progolf */ MCFG_CPU_ADD("maincpu", DECO_CPU6, 3000000/2) /* guess, 3 Mhz makes the game to behave worse? */ MCFG_CPU_PROGRAM_MAP(main_cpu) diff --git a/src/mame/drivers/prophet600.cpp b/src/mame/drivers/prophet600.cpp index 6eb4f7f888c..e5c9b031a6d 100644 --- a/src/mame/drivers/prophet600.cpp +++ b/src/mame/drivers/prophet600.cpp @@ -105,6 +105,7 @@ public: DECLARE_WRITE8_MEMBER(cv_w); DECLARE_WRITE8_MEMBER(gate_w); + void prophet600(machine_config &config); private: uint16_t m_dac; uint8_t m_scanrow; @@ -260,7 +261,7 @@ DRIVER_INIT_MEMBER(prophet600_state, prophet600) } // master crystal is 8 MHz, all clocks derived from there -static MACHINE_CONFIG_START( prophet600 ) +MACHINE_CONFIG_START(prophet600_state::prophet600) MCFG_CPU_ADD(MAINCPU_TAG, Z80, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(cpu_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp index 99caab87a81..e94b7d4d897 100644 --- a/src/mame/drivers/proteus3.cpp +++ b/src/mame/drivers/proteus3.cpp @@ -105,6 +105,7 @@ public: DECLARE_WRITE_LINE_MEMBER (write_f14_clock){ write_acia_clocks(mc14411_device::TIMER_F14, state); } DECLARE_WRITE_LINE_MEMBER (write_f15_clock){ write_acia_clocks(mc14411_device::TIMER_F15, state); } + void proteus3(machine_config &config); private: uint8_t m_video_data; uint8_t m_flashcnt; @@ -374,7 +375,7 @@ void proteus3_state::machine_reset() Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( proteus3 ) +MACHINE_CONFIG_START(proteus3_state::proteus3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_3_579545MHz) /* Divided by 4 internally */ MCFG_CPU_PROGRAM_MAP(proteus3_mem) diff --git a/src/mame/drivers/ps2.cpp b/src/mame/drivers/ps2.cpp index bdc22c86a48..2d54930bb8a 100644 --- a/src/mame/drivers/ps2.cpp +++ b/src/mame/drivers/ps2.cpp @@ -8,6 +8,7 @@ #include "machine/ram.h" #include "bus/isa/isa_cards.h" #include "bus/pc_kbd/keyboards.h" +#include "softlist_dev.h" class ps2_state : public driver_device { @@ -22,10 +23,20 @@ public: required_device m_mb; required_device m_ram; + void ps2m30286(machine_config &config); + void ps2386(machine_config &config); + void at_softlists(machine_config &config); protected: void machine_start() override; }; +MACHINE_CONFIG_START(ps2_state::at_softlists) + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") + MCFG_SOFTWARE_LIST_ADD("at_disk_list","ibm5170") + MCFG_SOFTWARE_LIST_ADD("at_cdrom_list","ibm5170_cdrom") +MACHINE_CONFIG_END + static ADDRESS_MAP_START( ps2_16_map, AS_PROGRAM, 16, ps2_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x000000, 0x09ffff) AM_RAMBANK("bank10") @@ -66,7 +77,7 @@ void ps2_state::machine_start() } } -static MACHINE_CONFIG_START( ps2m30286 ) +MACHINE_CONFIG_START(ps2_state::ps2m30286) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80286, 10000000) MCFG_CPU_PROGRAM_MAP(ps2_16_map) @@ -90,7 +101,7 @@ static MACHINE_CONFIG_START( ps2m30286 ) MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,15M") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ps2386 ) +MACHINE_CONFIG_START(ps2_state::ps2386) MCFG_CPU_ADD("maincpu", I386, 12000000) MCFG_CPU_PROGRAM_MAP(ps2_32_map) MCFG_CPU_IO_MAP(ps2_32_io) diff --git a/src/mame/drivers/ps2sony.cpp b/src/mame/drivers/ps2sony.cpp index 0a94dc03084..84ce178c0db 100644 --- a/src/mame/drivers/ps2sony.cpp +++ b/src/mame/drivers/ps2sony.cpp @@ -171,6 +171,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void ps2sony(machine_config &config); private: virtual void video_start() override; required_device m_maincpu; @@ -194,7 +195,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( ps2sony ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ps2sony ) +MACHINE_CONFIG_START(ps2sony_state::ps2sony) MCFG_CPU_ADD("maincpu", R5000LE, 294'912'000) // actually R5900 MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) diff --git a/src/mame/drivers/pse.cpp b/src/mame/drivers/pse.cpp index 00a064f0a47..0d74c168cd4 100644 --- a/src/mame/drivers/pse.cpp +++ b/src/mame/drivers/pse.cpp @@ -58,6 +58,7 @@ public: required_device m_maincpu; required_device m_video; + void pse(machine_config &config); protected: // driver_device overrides @@ -98,7 +99,7 @@ void pse_state::video_start() { } -static MACHINE_CONFIG_START( pse ) +MACHINE_CONFIG_START(pse_state::pse) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/psikyo.cpp b/src/mame/drivers/psikyo.cpp index 04b34e70b04..5bc667174fd 100644 --- a/src/mame/drivers/psikyo.cpp +++ b/src/mame/drivers/psikyo.cpp @@ -999,7 +999,7 @@ void psikyo_state::machine_reset() ***************************************************************************/ -static MACHINE_CONFIG_START( sngkace ) +MACHINE_CONFIG_START(psikyo_state::sngkace) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* verified on pcb */ @@ -1046,7 +1046,7 @@ MACHINE_CONFIG_END ***************************************************************************/ -static MACHINE_CONFIG_START( gunbird ) +MACHINE_CONFIG_START(psikyo_state::gunbird) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, 16000000) @@ -1086,12 +1086,12 @@ static MACHINE_CONFIG_START( gunbird ) MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( s1945jn, gunbird ) +MACHINE_CONFIG_DERIVED(psikyo_state::s1945jn, gunbird) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(s1945jn_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( s1945bl ) /* Bootleg hardware based on the unprotected Japanese Strikers 1945 set */ +MACHINE_CONFIG_START(psikyo_state::s1945bl) /* Bootleg hardware based on the unprotected Japanese Strikers 1945 set */ /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, 16000000) @@ -1130,7 +1130,7 @@ MACHINE_CONFIG_END ***************************************************************************/ -static MACHINE_CONFIG_START( s1945 ) +MACHINE_CONFIG_START(psikyo_state::s1945) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, 16000000) diff --git a/src/mame/drivers/psikyo4.cpp b/src/mame/drivers/psikyo4.cpp index bc569aab382..5ceb450053b 100644 --- a/src/mame/drivers/psikyo4.cpp +++ b/src/mame/drivers/psikyo4.cpp @@ -652,7 +652,7 @@ void psikyo4_state::machine_reset() m_oldbrt2 = -1; } -static MACHINE_CONFIG_START( ps4big ) +MACHINE_CONFIG_START(psikyo4_state::ps4big) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK/2) @@ -698,7 +698,7 @@ static MACHINE_CONFIG_START( ps4big ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ps4small, ps4big ) +MACHINE_CONFIG_DERIVED(psikyo4_state::ps4small, ps4big) /* basic machine hardware */ diff --git a/src/mame/drivers/psikyosh.cpp b/src/mame/drivers/psikyosh.cpp index 4eea4a38d41..3b400ee7921 100644 --- a/src/mame/drivers/psikyosh.cpp +++ b/src/mame/drivers/psikyosh.cpp @@ -775,7 +775,7 @@ void psikyosh_state::machine_start() } -static MACHINE_CONFIG_START( psikyo3v1 ) +MACHINE_CONFIG_START(psikyosh_state::psikyo3v1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK/2) @@ -810,7 +810,7 @@ static MACHINE_CONFIG_START( psikyo3v1 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psikyo5, psikyo3v1 ) +MACHINE_CONFIG_DERIVED(psikyosh_state::psikyo5, psikyo3v1) /* basic machine hardware */ @@ -818,7 +818,7 @@ static MACHINE_CONFIG_DERIVED( psikyo5, psikyo3v1 ) MCFG_CPU_PROGRAM_MAP(ps5_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psikyo5_240, psikyo3v1 ) +MACHINE_CONFIG_DERIVED(psikyosh_state::psikyo5_240, psikyo3v1) /* basic machine hardware */ diff --git a/src/mame/drivers/psion.cpp b/src/mame/drivers/psion.cpp index b3a4da91915..8ac66d8c13f 100644 --- a/src/mame/drivers/psion.cpp +++ b/src/mame/drivers/psion.cpp @@ -564,7 +564,7 @@ static GFXDECODE_START( psion ) GFXDECODE_END /* basic configuration for 2 lines display */ -static MACHINE_CONFIG_START( psion_2lines ) +MACHINE_CONFIG_START(psion_state::psion_2lines) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD63701, 980000) // should be HD6303 at 0.98MHz @@ -604,7 +604,7 @@ static MACHINE_CONFIG_START( psion_2lines ) MACHINE_CONFIG_END /* basic configuration for 4 lines display */ -static MACHINE_CONFIG_DERIVED( psion_4lines, psion_2lines ) +MACHINE_CONFIG_DERIVED(psion_state::psion_4lines, psion_2lines) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(6*20, 9*4) @@ -615,7 +615,7 @@ static MACHINE_CONFIG_DERIVED( psion_4lines, psion_2lines ) MCFG_HD44780_PIXEL_UPDATE_CB(psion_state,lz_pixel_update) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psion1, psion_2lines ) +MACHINE_CONFIG_DERIVED(psion1_state::psion1, psion_2lines) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(psion1_mem) @@ -635,25 +635,25 @@ static MACHINE_CONFIG_DERIVED( psion1, psion_2lines ) MCFG_SOFTWARE_LIST_ADD("pack_list", "psion1") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psioncm, psion_2lines ) +MACHINE_CONFIG_DERIVED(psion_state::psioncm, psion_2lines) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(psioncm_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psionla, psion_2lines ) +MACHINE_CONFIG_DERIVED(psion_state::psionla, psion_2lines) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(psionla_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psionlam, psion_2lines ) +MACHINE_CONFIG_DERIVED(psion_state::psionlam, psion_2lines) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(psionlam_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psionp350, psion_2lines ) +MACHINE_CONFIG_DERIVED(psion_state::psionp350, psion_2lines) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(psionp350_mem) @@ -661,7 +661,7 @@ static MACHINE_CONFIG_DERIVED( psionp350, psion_2lines ) MCFG_NVRAM_ADD_0FILL("nvram3") // paged RAM MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psionlz, psion_4lines ) +MACHINE_CONFIG_DERIVED(psion_state::psionlz, psion_4lines) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(psionlz_mem) diff --git a/src/mame/drivers/psx.cpp b/src/mame/drivers/psx.cpp index 5931ba93d59..f099e593144 100644 --- a/src/mame/drivers/psx.cpp +++ b/src/mame/drivers/psx.cpp @@ -63,6 +63,9 @@ public: void cd_dma_write( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); required_device m_maincpu; required_device m_ram; + void pse(machine_config &config); + void psu(machine_config &config); + void psj(machine_config &config); }; @@ -488,7 +491,7 @@ static ADDRESS_MAP_START( subcpu_map, AS_PROGRAM, 8, psx1_state ) AM_RANGE(0x0000, 0xffff) AM_ROM ADDRESS_MAP_END -static MACHINE_CONFIG_START( psj ) +MACHINE_CONFIG_START(psx1_state::psj) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz ) MCFG_CPU_PROGRAM_MAP( psx_map ) @@ -526,16 +529,16 @@ static MACHINE_CONFIG_START( psj ) MCFG_PSXCD_ADD(PSXCD_TAG, "cdrom") MCFG_PSXCD_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin2)) - MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psxdma_device::read_delegate(&psx1_state::cd_dma_read, (psx1_state *) owner ) ) - MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psxdma_device::write_delegate(&psx1_state::cd_dma_write, (psx1_state *) owner ) ) + MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psxdma_device::read_delegate(&psx1_state::cd_dma_read, this ) ) + MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psxdma_device::write_delegate(&psx1_state::cd_dma_write, this ) ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psu, psj ) +MACHINE_CONFIG_DERIVED(psx1_state::psu, psj) MCFG_CPU_ADD( "subcpu", HD63705, 4166667 ) // MC68HC05G6 MCFG_CPU_PROGRAM_MAP( subcpu_map ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pse ) +MACHINE_CONFIG_START(psx1_state::pse) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", CXD8530AQ, XTAL_67_7376MHz ) MCFG_CPU_PROGRAM_MAP( psx_map) @@ -574,8 +577,8 @@ static MACHINE_CONFIG_START( pse ) MCFG_PSXCD_ADD(PSXCD_TAG, "cdrom") MCFG_PSXCD_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin2)) - MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psxdma_device::read_delegate(&psx1_state::cd_dma_read, (psx1_state *) owner ) ) - MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psxdma_device::write_delegate(&psx1_state::cd_dma_write, (psx1_state *) owner ) ) + MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psxdma_device::read_delegate(&psx1_state::cd_dma_read, this ) ) + MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psxdma_device::write_delegate(&psx1_state::cd_dma_write, this ) ) MACHINE_CONFIG_END ROM_START( psj ) diff --git a/src/mame/drivers/psychic5.cpp b/src/mame/drivers/psychic5.cpp index c359fdbc64e..d7dcf017c52 100644 --- a/src/mame/drivers/psychic5.cpp +++ b/src/mame/drivers/psychic5.cpp @@ -712,7 +712,7 @@ static GFXDECODE_START( bombsa ) GFXDECODE_END -static MACHINE_CONFIG_START( psychic5 ) +MACHINE_CONFIG_START(psychic5_state::psychic5) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) @@ -766,7 +766,7 @@ static MACHINE_CONFIG_START( psychic5 ) MCFG_SOUND_ROUTE(3, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bombsa ) +MACHINE_CONFIG_START(psychic5_state::bombsa) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2 ) /* 6 MHz */ diff --git a/src/mame/drivers/pt68k4.cpp b/src/mame/drivers/pt68k4.cpp index e7385ce6fb7..ce8b2ae3d61 100644 --- a/src/mame/drivers/pt68k4.cpp +++ b/src/mame/drivers/pt68k4.cpp @@ -124,6 +124,8 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); + void pt68k2(machine_config &config); + void pt68k4(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -394,7 +396,7 @@ SLOT_INTERFACE_START( pt68k4_isa8_cards ) SLOT_INTERFACE("xtide", ISA8_XTIDE) // Monk only SLOT_INTERFACE_END -static MACHINE_CONFIG_START( pt68k2 ) +MACHINE_CONFIG_START(pt68k4_state::pt68k2) /* basic machine hardware */ MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_16MHz/2) // 68k2 came in 8, 10, and 12 MHz versions MCFG_CPU_PROGRAM_MAP(pt68k2_mem) @@ -434,7 +436,7 @@ static MACHINE_CONFIG_START( pt68k2 ) MCFG_SOFTWARE_LIST_ADD("flop525_list", "pt68k2") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pt68k4 ) +MACHINE_CONFIG_START(pt68k4_state::pt68k4) /* basic machine hardware */ MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(pt68k4_mem) diff --git a/src/mame/drivers/ptcsol.cpp b/src/mame/drivers/ptcsol.cpp index c17cd0490ed..4b732614bf5 100644 --- a/src/mame/drivers/ptcsol.cpp +++ b/src/mame/drivers/ptcsol.cpp @@ -186,6 +186,7 @@ public: TIMER_CALLBACK_MEMBER(sol20_boot); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void sol20(machine_config &config); private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; uint8_t m_sol20_fa; @@ -732,7 +733,7 @@ void sol20_state::kbd_put(u8 data) } } -static MACHINE_CONFIG_START( sol20 ) +MACHINE_CONFIG_START(sol20_state::sol20) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, XTAL_14_31818MHz / 7) // divider selectable as 5, 6 or 7 through jumpers MCFG_CPU_PROGRAM_MAP(sol20_mem) diff --git a/src/mame/drivers/pturn.cpp b/src/mame/drivers/pturn.cpp index 4d411dcd36d..2f7061193e7 100644 --- a/src/mame/drivers/pturn.cpp +++ b/src/mame/drivers/pturn.cpp @@ -143,6 +143,7 @@ public: INTERRUPT_GEN_MEMBER(sub_intgen); INTERRUPT_GEN_MEMBER(main_intgen); + void pturn(machine_config &config); }; @@ -507,7 +508,7 @@ void pturn_state::machine_reset() m_nmi_sub = false; } -static MACHINE_CONFIG_START( pturn ) +MACHINE_CONFIG_START(pturn_state::pturn) MCFG_CPU_ADD("maincpu", Z80, 12000000/3) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", pturn_state, main_intgen) diff --git a/src/mame/drivers/puckpkmn.cpp b/src/mame/drivers/puckpkmn.cpp index 3fe426789bc..09e7cffa5f7 100644 --- a/src/mame/drivers/puckpkmn.cpp +++ b/src/mame/drivers/puckpkmn.cpp @@ -275,7 +275,7 @@ static ADDRESS_MAP_START( puckpkmna_map, AS_PROGRAM, 16, md_boot_state ) AM_RANGE(0x70001c, 0x70001d) AM_READ(puckpkmna_70001c_r) ADDRESS_MAP_END -static MACHINE_CONFIG_START( puckpkmn ) +MACHINE_CONFIG_START(md_boot_state::puckpkmn) MCFG_FRAGMENT_ADD(md_ntsc) MCFG_CPU_MODIFY("maincpu") @@ -290,14 +290,14 @@ static MACHINE_CONFIG_START( puckpkmn ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( puckpkmna, puckpkmn ) +MACHINE_CONFIG_DERIVED(md_boot_state::puckpkmna, puckpkmn) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(puckpkmna_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jzth, puckpkmn ) +MACHINE_CONFIG_DERIVED(md_boot_state::jzth, puckpkmn) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(jzth_map) diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp index c65bc3b09fb..55957f90222 100644 --- a/src/mame/drivers/pulsar.cpp +++ b/src/mame/drivers/pulsar.cpp @@ -68,6 +68,7 @@ public: DECLARE_WRITE8_MEMBER(ppi_pc_w); DECLARE_READ8_MEMBER(ppi_pc_r); + void pulsar(machine_config &config); private: floppy_image_device *m_floppy; required_device m_maincpu; @@ -205,7 +206,7 @@ DRIVER_INIT_MEMBER( pulsar_state, pulsar ) membank("bankw1")->configure_entry(0, &main[0xf800]); } -static MACHINE_CONFIG_START( pulsar ) +MACHINE_CONFIG_START(pulsar_state::pulsar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(pulsar_mem) diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp index 670ff18cf5c..845cb972a60 100644 --- a/src/mame/drivers/punchout.cpp +++ b/src/mame/drivers/punchout.cpp @@ -614,7 +614,7 @@ MACHINE_RESET_MEMBER(punchout_state, spnchout) } -static MACHINE_CONFIG_START( punchout ) +MACHINE_CONFIG_START(punchout_state::punchout) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) @@ -671,7 +671,7 @@ static MACHINE_CONFIG_START( punchout ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spnchout, punchout ) +MACHINE_CONFIG_DERIVED(punchout_state::spnchout, punchout) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -685,7 +685,7 @@ static MACHINE_CONFIG_DERIVED( spnchout, punchout ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( armwrest, punchout ) +MACHINE_CONFIG_DERIVED(punchout_state::armwrest, punchout) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/pv1000.cpp b/src/mame/drivers/pv1000.cpp index af677db56ac..fb5bdcc7086 100644 --- a/src/mame/drivers/pv1000.cpp +++ b/src/mame/drivers/pv1000.cpp @@ -173,6 +173,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void pv1000(machine_config &config); }; @@ -432,7 +433,7 @@ static GFXDECODE_START( pv1000 ) GFXDECODE_END -static MACHINE_CONFIG_START( pv1000 ) +MACHINE_CONFIG_START(pv1000_state::pv1000) MCFG_CPU_ADD( "maincpu", Z80, 17897725/5 ) MCFG_CPU_PROGRAM_MAP( pv1000 ) diff --git a/src/mame/drivers/pv2000.cpp b/src/mame/drivers/pv2000.cpp index 6c88b76550d..ca9502548a9 100644 --- a/src/mame/drivers/pv2000.cpp +++ b/src/mame/drivers/pv2000.cpp @@ -70,6 +70,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; DECLARE_DEVICE_IMAGE_LOAD_MEMBER(pv2000_cart); + void pv2000(machine_config &config); }; @@ -379,7 +380,7 @@ DEVICE_IMAGE_LOAD_MEMBER( pv2000_state, pv2000_cart ) } /* Machine Drivers */ -static MACHINE_CONFIG_START( pv2000 ) +MACHINE_CONFIG_START(pv2000_state::pv2000) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, XTAL_7_15909MHz/2) // 3.579545 MHz diff --git a/src/mame/drivers/pv9234.cpp b/src/mame/drivers/pv9234.cpp index 8924492d27d..80b2c474763 100644 --- a/src/mame/drivers/pv9234.cpp +++ b/src/mame/drivers/pv9234.cpp @@ -41,6 +41,7 @@ public: uint32_t screen_update_pv9234(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void pv9234(machine_config &config); protected: virtual void machine_reset() override; virtual void video_start() override; @@ -143,7 +144,7 @@ uint32_t pv9234_state::screen_update_pv9234(screen_device &screen, bitmap_ind16 return 0; } -static MACHINE_CONFIG_START( pv9234 ) +MACHINE_CONFIG_START(pv9234_state::pv9234) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM7, 4915000) //probably a more powerful clone. MCFG_CPU_PROGRAM_MAP(pv9234_map) diff --git a/src/mame/drivers/pve500.cpp b/src/mame/drivers/pve500.cpp index 08b28bd9f70..820a3e9b075 100644 --- a/src/mame/drivers/pve500.cpp +++ b/src/mame/drivers/pve500.cpp @@ -86,6 +86,7 @@ public: DECLARE_WRITE8_MEMBER(eeprom_w); DECLARE_READ8_MEMBER(eeprom_r); DECLARE_DRIVER_INIT(pve500); + void pve500(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -330,7 +331,7 @@ WRITE8_MEMBER(pve500_state::io_sel_w) } } -static MACHINE_CONFIG_START( pve500 ) +MACHINE_CONFIG_START(pve500_state::pve500) /* Main CPU */ MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL_12MHz / 2) /* TMPZ84C015BF-6 */ MCFG_CPU_PROGRAM_MAP(maincpu_prg) diff --git a/src/mame/drivers/pwrview.cpp b/src/mame/drivers/pwrview.cpp index 413823f8831..f20bebead87 100644 --- a/src/mame/drivers/pwrview.cpp +++ b/src/mame/drivers/pwrview.cpp @@ -53,6 +53,7 @@ public: DECLARE_READ8_MEMBER(err_r); MC6845_UPDATE_ROW(update_row); + void pwrview(machine_config &config); protected: virtual void device_start() override; virtual void device_reset() override; @@ -347,7 +348,7 @@ static SLOT_INTERFACE_START(pwrview_floppies) SLOT_INTERFACE("525dd", FLOPPY_525_DD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( pwrview ) +MACHINE_CONFIG_START(pwrview_state::pwrview) MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(pwrview_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(pwrview_fetch_map) diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp index bea1adc7140..c9607da0484 100644 --- a/src/mame/drivers/px4.cpp +++ b/src/mame/drivers/px4.cpp @@ -133,6 +133,7 @@ public: DECLARE_WRITE_LINE_MEMBER( centronics_busy_w ) { m_centronics_busy = state; } DECLARE_WRITE_LINE_MEMBER( centronics_perror_w ) { m_centronics_perror = state; } + void px4(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -266,6 +267,7 @@ public: DECLARE_WRITE8_MEMBER( ramdisk_data_w ); DECLARE_READ8_MEMBER( ramdisk_control_r ); + void px4p(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -1472,7 +1474,7 @@ PALETTE_INIT_MEMBER( px4p_state, px4p ) // MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( px4 ) +MACHINE_CONFIG_START(px4_state::px4) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, XTAL_7_3728MHz / 2) // uPD70008 MCFG_CPU_PROGRAM_MAP(px4_mem) @@ -1538,7 +1540,7 @@ static MACHINE_CONFIG_START( px4 ) MCFG_SOFTWARE_LIST_ADD("epson_cpm_list", "epson_cpm") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( px4p, px4 ) +MACHINE_CONFIG_DERIVED(px4p_state::px4p, px4) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(px4p_io) diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp index 8d5adb53abe..056d816cdf8 100644 --- a/src/mame/drivers/px8.cpp +++ b/src/mame/drivers/px8.cpp @@ -743,7 +743,7 @@ void px8_state::machine_reset() MACHINE DRIVERS ***************************************************************************/ -static MACHINE_CONFIG_START( px8 ) +MACHINE_CONFIG_START(px8_state::px8) /* main cpu (uPD70008) */ MCFG_CPU_ADD(UPD70008_TAG, Z80, XTAL_CR1 / 4) /* 2.45 MHz */ MCFG_CPU_PROGRAM_MAP(px8_mem) diff --git a/src/mame/drivers/pyl601.cpp b/src/mame/drivers/pyl601.cpp index d99b9ea2cce..ee0092b49f1 100644 --- a/src/mame/drivers/pyl601.cpp +++ b/src/mame/drivers/pyl601.cpp @@ -96,6 +96,8 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); required_device m_maincpu; required_device m_palette; + void pyl601(machine_config &config); + void pyl601a(machine_config &config); }; @@ -529,7 +531,7 @@ static GFXDECODE_START( pyl601a ) GFXDECODE_ENTRY( "chargen", 0x0000, pyl601a_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( pyl601 ) +MACHINE_CONFIG_START(pyl601_state::pyl601) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6800, XTAL_1MHz) MCFG_CPU_PROGRAM_MAP(pyl601_mem) @@ -566,7 +568,7 @@ static MACHINE_CONFIG_START( pyl601 ) MCFG_RAM_DEFAULT_SIZE("576K") // 64 + 512 MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pyl601a, pyl601 ) +MACHINE_CONFIG_DERIVED(pyl601_state::pyl601a, pyl601) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK( XTAL_2MHz) diff --git a/src/mame/drivers/pyson.cpp b/src/mame/drivers/pyson.cpp index 22ad241f134..04ec583b22a 100644 --- a/src/mame/drivers/pyson.cpp +++ b/src/mame/drivers/pyson.cpp @@ -166,6 +166,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void pyson(machine_config &config); protected: // devices @@ -193,7 +194,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( pyson ) INPUT_PORTS_END -static MACHINE_CONFIG_START( pyson ) +MACHINE_CONFIG_START(pyson_state::pyson) MCFG_CPU_ADD("maincpu", R5000LE, 294000000) // imported from namcops2.c driver MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) diff --git a/src/mame/drivers/pzletime.cpp b/src/mame/drivers/pzletime.cpp index 37edec843bd..cad6eccc838 100644 --- a/src/mame/drivers/pzletime.cpp +++ b/src/mame/drivers/pzletime.cpp @@ -76,6 +76,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void pzletime(machine_config &config); }; @@ -328,7 +329,7 @@ void pzletime_state::machine_reset() m_ticket = 0; } -static MACHINE_CONFIG_START( pzletime ) +MACHINE_CONFIG_START(pzletime_state::pzletime) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,10000000) diff --git a/src/mame/drivers/qdrmfgp.cpp b/src/mame/drivers/qdrmfgp.cpp index 5a3ee0c0d04..d9875679ec9 100644 --- a/src/mame/drivers/qdrmfgp.cpp +++ b/src/mame/drivers/qdrmfgp.cpp @@ -574,7 +574,7 @@ void qdrmfgp_state::machine_reset() * Machine driver * *************************************/ -static MACHINE_CONFIG_START( qdrmfgp ) +MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16.000 MHz */ @@ -618,7 +618,7 @@ static MACHINE_CONFIG_START( qdrmfgp ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( qdrmfgp2 ) +MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16.000 MHz */ diff --git a/src/mame/drivers/qix.cpp b/src/mame/drivers/qix.cpp index eea7cf401aa..ae4705a60e2 100644 --- a/src/mame/drivers/qix.cpp +++ b/src/mame/drivers/qix.cpp @@ -598,7 +598,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( qix_base ) +MACHINE_CONFIG_START(qix_state::qix_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */ @@ -627,11 +627,11 @@ static MACHINE_CONFIG_START( qix_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( qix, qix_base ) +MACHINE_CONFIG_DERIVED(qix_state::qix, qix_base) MCFG_FRAGMENT_ADD(qix_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kram3, qix ) +MACHINE_CONFIG_DERIVED(qix_state::kram3, qix) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(kram3_main_map) MCFG_MC6809E_LIC_CB(WRITELINE(qix_state, kram3_lic_maincpu_changed)) @@ -646,7 +646,7 @@ MACHINE_CONFIG_END ***************************************************************************/ -static MACHINE_CONFIG_DERIVED( mcu, qix ) +MACHINE_CONFIG_DERIVED(qix_state::mcu, qix) /* basic machine hardware */ @@ -667,7 +667,7 @@ static MACHINE_CONFIG_DERIVED( mcu, qix ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zookeep, mcu ) +MACHINE_CONFIG_DERIVED(qix_state::zookeep, mcu) /* basic machine hardware */ @@ -687,7 +687,7 @@ MACHINE_CONFIG_END ***************************************************************************/ -static MACHINE_CONFIG_DERIVED( slither, qix_base ) +MACHINE_CONFIG_DERIVED(qix_state::slither, qix_base) /* basic machine hardware */ diff --git a/src/mame/drivers/ql.cpp b/src/mame/drivers/ql.cpp index cb86b6267f8..afa5c3c42e3 100644 --- a/src/mame/drivers/ql.cpp +++ b/src/mame/drivers/ql.cpp @@ -194,6 +194,9 @@ public: // QIMI bool m_qimi_enabled; int m_qimi_extint; + void ql_ntsc(machine_config &config); + void opd(machine_config &config); + void ql(machine_config &config); }; @@ -888,7 +891,7 @@ void ql_state::machine_reset() // MACHINE_CONFIG( ql ) //------------------------------------------------- -static MACHINE_CONFIG_START( ql ) +MACHINE_CONFIG_START(ql_state::ql) // basic machine hardware MCFG_CPU_ADD(M68008_TAG, M68008, X1/2) MCFG_CPU_PROGRAM_MAP(ql_mem) @@ -972,7 +975,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( ql_ntsc ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( ql_ntsc, ql ) +MACHINE_CONFIG_DERIVED(ql_state::ql_ntsc, ql) // video hardware MCFG_SCREEN_MODIFY(SCREEN_TAG) MCFG_SCREEN_REFRESH_RATE(60) @@ -985,7 +988,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( opd ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( opd, ql ) +MACHINE_CONFIG_DERIVED(ql_state::opd, ql) // internal ram MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("128K") diff --git a/src/mame/drivers/qtsbc.cpp b/src/mame/drivers/qtsbc.cpp index 988bcfeee41..85213a6e3a2 100644 --- a/src/mame/drivers/qtsbc.cpp +++ b/src/mame/drivers/qtsbc.cpp @@ -52,6 +52,7 @@ public: DECLARE_READ8_MEMBER( qtsbc_43_r ); + void qtsbc(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -98,7 +99,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( qtsbc ) +MACHINE_CONFIG_START(qtsbc_state::qtsbc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) // Mostek MK3880 MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/quakeat.cpp b/src/mame/drivers/quakeat.cpp index c9c72cc2171..eba72a4008c 100644 --- a/src/mame/drivers/quakeat.cpp +++ b/src/mame/drivers/quakeat.cpp @@ -76,6 +76,7 @@ public: virtual void machine_start() override; virtual void video_start() override; uint32_t screen_update_quake(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void quake(machine_config &config); }; @@ -116,7 +117,7 @@ void quakeat_state::machine_start() } /*************************************************************/ -static MACHINE_CONFIG_START( quake ) +MACHINE_CONFIG_START(quakeat_state::quake) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM2, 233000000) /* Pentium II, 233MHz */ MCFG_CPU_PROGRAM_MAP(quake_map) diff --git a/src/mame/drivers/quantum.cpp b/src/mame/drivers/quantum.cpp index eba48b2e37d..bf618ef3c6b 100644 --- a/src/mame/drivers/quantum.cpp +++ b/src/mame/drivers/quantum.cpp @@ -74,6 +74,7 @@ public: DECLARE_READ8_MEMBER(input_2_r); required_device m_maincpu; required_device m_avg; + void quantum(machine_config &config); }; @@ -264,7 +265,7 @@ DISCRETE_SOUND_END * *************************************/ -static MACHINE_CONFIG_START( quantum ) +MACHINE_CONFIG_START(quantum_state::quantum) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2) diff --git a/src/mame/drivers/quasar.cpp b/src/mame/drivers/quasar.cpp index 44c3da2218b..d05c46c57a1 100644 --- a/src/mame/drivers/quasar.cpp +++ b/src/mame/drivers/quasar.cpp @@ -293,7 +293,7 @@ MACHINE_RESET_MEMBER(quasar_state,quasar) m_io_page = 8; } -static MACHINE_CONFIG_START( quasar ) +MACHINE_CONFIG_START(quasar_state::quasar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 14318000/4) /* 14 mhz crystal divide by 4 on board */ diff --git a/src/mame/drivers/queen.cpp b/src/mame/drivers/queen.cpp index 2c697434347..b8033634a07 100644 --- a/src/mame/drivers/queen.cpp +++ b/src/mame/drivers/queen.cpp @@ -54,6 +54,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; void intel82439tx_init(); + void queen(machine_config &config); }; @@ -270,7 +271,7 @@ void queen_state::machine_reset() -static MACHINE_CONFIG_START( queen ) +MACHINE_CONFIG_START(queen_state::queen) MCFG_CPU_ADD("maincpu", PENTIUM3, 533000000/16) // Celeron or Pentium 3, 533 Mhz MCFG_CPU_PROGRAM_MAP(queen_map) MCFG_CPU_IO_MAP(queen_io) diff --git a/src/mame/drivers/quickpick5.cpp b/src/mame/drivers/quickpick5.cpp index 248dfaa3419..c3a2b8cb5a5 100644 --- a/src/mame/drivers/quickpick5.cpp +++ b/src/mame/drivers/quickpick5.cpp @@ -79,6 +79,7 @@ public: DECLARE_READ8_MEMBER(vram_r); DECLARE_WRITE8_MEMBER(vram_w); + void quickpick5(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -395,7 +396,7 @@ void quickpick5_state::machine_reset() { } -static MACHINE_CONFIG_START( quickpick5 ) +MACHINE_CONFIG_START(quickpick5_state::quickpick5) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_32MHz/4) // z84c0008pec 8mhz part, 32Mhz xtal verified on PCB, divisor unknown MCFG_CPU_PROGRAM_MAP(quickpick5_main) diff --git a/src/mame/drivers/quizdna.cpp b/src/mame/drivers/quizdna.cpp index e1cacaf7621..0081aa00b48 100644 --- a/src/mame/drivers/quizdna.cpp +++ b/src/mame/drivers/quizdna.cpp @@ -435,7 +435,7 @@ void quizdna_state::machine_start() } -static MACHINE_CONFIG_START( quizdna ) +MACHINE_CONFIG_START(quizdna_state::quizdna) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */ @@ -471,7 +471,7 @@ static MACHINE_CONFIG_START( quizdna ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gakupara, quizdna ) +MACHINE_CONFIG_DERIVED(quizdna_state::gakupara, quizdna) /* basic machine hardware */ @@ -480,7 +480,7 @@ static MACHINE_CONFIG_DERIVED( gakupara, quizdna ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gekiretu, quizdna ) +MACHINE_CONFIG_DERIVED(quizdna_state::gekiretu, quizdna) /* basic machine hardware */ diff --git a/src/mame/drivers/quizo.cpp b/src/mame/drivers/quizo.cpp index 2c55d8e82fc..90d6835b66c 100644 --- a/src/mame/drivers/quizo.cpp +++ b/src/mame/drivers/quizo.cpp @@ -53,6 +53,7 @@ public: DECLARE_PALETTE_INIT(quizo); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void quizo(machine_config &config); }; @@ -210,7 +211,7 @@ static INPUT_PORTS_START( quizo ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) INPUT_PORTS_END -static MACHINE_CONFIG_START( quizo ) +MACHINE_CONFIG_START(quizo_state::quizo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,XTAL1/2) MCFG_CPU_PROGRAM_MAP(memmap) diff --git a/src/mame/drivers/quizpani.cpp b/src/mame/drivers/quizpani.cpp index 91cdf6ae4c6..d2c9d946d81 100644 --- a/src/mame/drivers/quizpani.cpp +++ b/src/mame/drivers/quizpani.cpp @@ -193,7 +193,7 @@ static GFXDECODE_START( quizpani ) GFXDECODE_END -static MACHINE_CONFIG_START( quizpani ) +MACHINE_CONFIG_START(quizpani_state::quizpani) MCFG_CPU_ADD("maincpu", M68000, 10000000) MCFG_CPU_PROGRAM_MAP(quizpani_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", quizpani_state, irq4_line_hold) diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp index 75a8dabf440..d8632d08c2b 100644 --- a/src/mame/drivers/quizpun2.cpp +++ b/src/mame/drivers/quizpun2.cpp @@ -163,6 +163,8 @@ public: bool m_mcu_pending; bool m_mcu_written; bool m_mcu_repeat; + void quizpun(machine_config &config); + void quizpun2(machine_config &config); }; /*************************************************************************** @@ -558,7 +560,7 @@ GFXDECODE_END Machine Drivers ***************************************************************************/ -static MACHINE_CONFIG_START( quizpun2 ) +MACHINE_CONFIG_START(quizpun2_state::quizpun2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) // 4 MHz MCFG_CPU_PROGRAM_MAP(quizpun2_map) @@ -607,7 +609,7 @@ static MACHINE_CONFIG_START( quizpun2 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quizpun, quizpun2 ) +MACHINE_CONFIG_DERIVED(quizpun2_state::quizpun, quizpun2) MCFG_DEVICE_REMOVE("cop") MCFG_CPU_ADD("mcu", M68705P5, XTAL_4MHz) // xtal is 4MHz, divided by 4 internally diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp index 663cae3db26..133a82358e2 100644 --- a/src/mame/drivers/quizshow.cpp +++ b/src/mame/drivers/quizshow.cpp @@ -79,6 +79,7 @@ public: DECLARE_PALETTE_INIT(quizshow); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(clock_timer_cb); + void quizshow(machine_config &config); }; @@ -378,7 +379,7 @@ void quizshow_state::machine_reset() m_tape_head_pos = 0; } -static MACHINE_CONFIG_START( quizshow ) +MACHINE_CONFIG_START(quizshow_state::quizshow) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK / 16) // divider guessed diff --git a/src/mame/drivers/qvt103.cpp b/src/mame/drivers/qvt103.cpp index 012632fa23b..42f6d2d521a 100644 --- a/src/mame/drivers/qvt103.cpp +++ b/src/mame/drivers/qvt103.cpp @@ -26,6 +26,7 @@ public: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void qvt103(machine_config &config); private: required_device m_maincpu; required_region_ptr m_p_chargen; @@ -60,7 +61,7 @@ static const z80_daisy_config daisy_chain[] = { nullptr } }; -static MACHINE_CONFIG_START( qvt103 ) +MACHINE_CONFIG_START(qvt103_state::qvt103) MCFG_CPU_ADD("maincpu", Z80, XTAL_29_376MHz / 9) // divider guessed MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/qvt201.cpp b/src/mame/drivers/qvt201.cpp index 531eea42e42..4b12e236a9d 100644 --- a/src/mame/drivers/qvt201.cpp +++ b/src/mame/drivers/qvt201.cpp @@ -27,6 +27,7 @@ public: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void qvt201(machine_config &config); private: required_device m_maincpu; required_device m_screen; @@ -53,7 +54,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( qvt201 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( qvt201 ) +MACHINE_CONFIG_START(qvt201_state::qvt201) MCFG_CPU_ADD("maincpu", Z80, XTAL_3_6864MHz) MCFG_CPU_PROGRAM_MAP(mem_map) // IORQ is not used at all diff --git a/src/mame/drivers/qvt6800.cpp b/src/mame/drivers/qvt6800.cpp index c5b11cf3893..b4cd241ded6 100644 --- a/src/mame/drivers/qvt6800.cpp +++ b/src/mame/drivers/qvt6800.cpp @@ -28,6 +28,8 @@ public: MC6845_UPDATE_ROW(update_row); + void qvt190(machine_config &config); + void qvt102(machine_config &config); private: required_device m_maincpu; required_region_ptr m_p_chargen; @@ -61,7 +63,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( qvt6800 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( qvt102 ) +MACHINE_CONFIG_START(qvt6800_state::qvt102) MCFG_CPU_ADD("maincpu", M6800, XTAL_16_6698MHz / 18) MCFG_CPU_PROGRAM_MAP(qvt102_mem_map) @@ -91,7 +93,7 @@ static MACHINE_CONFIG_START( qvt102 ) MCFG_CPU_ADD("kbdmcu", I8748, XTAL_6MHz) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( qvt190 ) +MACHINE_CONFIG_START(qvt6800_state::qvt190) MCFG_CPU_ADD("maincpu", M6800, XTAL_16_6698MHz / 9) MCFG_CPU_PROGRAM_MAP(qvt190_mem_map) diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp index e387c51d5fa..5843eb1c1fa 100644 --- a/src/mame/drivers/qx10.cpp +++ b/src/mame/drivers/qx10.cpp @@ -156,6 +156,7 @@ public: required_device m_palette; UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); + void qx10(machine_config &config); }; UPD7220_DISPLAY_PIXELS_MEMBER( qx10_state::hgdc_display_pixels ) @@ -665,7 +666,7 @@ static SLOT_INTERFACE_START(keyboard) SLOT_INTERFACE("qx10", QX10_KEYBOARD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( qx10 ) +MACHINE_CONFIG_START(qx10_state::qx10) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, MAIN_CLK / 4) MCFG_CPU_PROGRAM_MAP(qx10_mem) diff --git a/src/mame/drivers/r2dtank.cpp b/src/mame/drivers/r2dtank.cpp index 7e311688e2f..33cf11d72ab 100644 --- a/src/mame/drivers/r2dtank.cpp +++ b/src/mame/drivers/r2dtank.cpp @@ -92,6 +92,7 @@ public: required_device m_audiocpu; required_device m_soundlatch; required_device m_soundlatch2; + void r2dtank(machine_config &config); }; @@ -435,7 +436,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( r2dtank ) +MACHINE_CONFIG_START(r2dtank_state::r2dtank) MCFG_CPU_ADD("maincpu", M6809,3000000) /* ?? too fast ? */ MCFG_CPU_PROGRAM_MAP(r2dtank_main_map) diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp index 4e86923b54d..64f03e4ebba 100644 --- a/src/mame/drivers/r2dx_v33.cpp +++ b/src/mame/drivers/r2dx_v33.cpp @@ -123,6 +123,9 @@ public: DECLARE_MACHINE_RESET(r2dx_v33); DECLARE_MACHINE_RESET(nzeroteam); + void nzerotea(machine_config &config); + void rdx_v33(machine_config &config); + void zerotm2k(machine_config &config); protected: virtual void machine_start() override; @@ -765,7 +768,7 @@ static ADDRESS_MAP_START( r2dx_oki_map, 0, 8, r2dx_v33_state ) AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("okibank") ADDRESS_MAP_END -static MACHINE_CONFIG_START( rdx_v33 ) +MACHINE_CONFIG_START(r2dx_v33_state::rdx_v33) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V33, 32000000/2 ) // ? @@ -802,7 +805,7 @@ static MACHINE_CONFIG_START( rdx_v33 ) MCFG_DEVICE_ADDRESS_MAP(0, r2dx_oki_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( nzerotea ) +MACHINE_CONFIG_START(r2dx_v33_state::nzerotea) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V33,XTAL_32MHz/2) /* verified on pcb */ @@ -849,7 +852,7 @@ static MACHINE_CONFIG_START( nzerotea ) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zerotm2k, nzerotea ) +MACHINE_CONFIG_DERIVED(r2dx_v33_state::zerotm2k, nzerotea) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(zerotm2k_map) diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp index 5d151f20d48..11537ffa291 100644 --- a/src/mame/drivers/r9751.cpp +++ b/src/mame/drivers/r9751.cpp @@ -101,6 +101,7 @@ public: DECLARE_DRIVER_INIT(r9751); + void r9751(machine_config &config); private: required_device m_maincpu; required_device m_pdc; @@ -567,7 +568,7 @@ INPUT_PORTS_END Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( r9751 ) +MACHINE_CONFIG_START(r9751_state::r9751) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68030, 20000000) MCFG_CPU_PROGRAM_MAP(r9751_mem) diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp index 8fa73b9ec36..b6895c66a6e 100644 --- a/src/mame/drivers/rabbit.cpp +++ b/src/mame/drivers/rabbit.cpp @@ -169,6 +169,7 @@ public: void drawtilemap( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int whichtilemap ); void do_blit(); + void rabbit(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -898,7 +899,7 @@ INTERRUPT_GEN_MEMBER(rabbit_state::vblank_interrupt) m_maincpu->set_input_line(m_vblirqlevel, HOLD_LINE); } -static MACHINE_CONFIG_START( rabbit ) +MACHINE_CONFIG_START(rabbit_state::rabbit) MCFG_CPU_ADD("maincpu", M68EC020, XTAL_24MHz) MCFG_CPU_PROGRAM_MAP(rabbit_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", rabbit_state, vblank_interrupt) diff --git a/src/mame/drivers/radicasi.cpp b/src/mame/drivers/radicasi.cpp index 5bb34123398..fdfa7b3b308 100644 --- a/src/mame/drivers/radicasi.cpp +++ b/src/mame/drivers/radicasi.cpp @@ -263,6 +263,7 @@ public: DECLARE_READ8_MEMBER(radicasi_nmi_vector_r); DECLARE_READ8_MEMBER(radicasi_irq_vector_r); + void radicasi(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -637,7 +638,7 @@ uint32_t radica_6502_state::screen_update(screen_device &screen, bitmap_ind16 &b uint16_t dat = m_palram[offs++] << 8; dat |= m_palram[offs++]; - // llll lsss ---h hhhh + // llll lsss ---h hhhh int l_raw = (dat & 0xf800) >> 11; int sl_raw = (dat & 0x0700) >> 8; int h_raw = (dat & 0x001f) >> 0; @@ -1403,7 +1404,7 @@ INTERRUPT_GEN_MEMBER(radica_6502_state::interrupt) */ } -static MACHINE_CONFIG_START( radicasi ) +MACHINE_CONFIG_START(radica_6502_state::radicasi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6502,XTAL_21_28137MHz/2) // Tetris has a XTAL_21_28137MHz, not confirmed on Space Invaders, actual CPU clock unknown. diff --git a/src/mame/drivers/radio86.cpp b/src/mame/drivers/radio86.cpp index f8fbcd0e112..68dadb327e5 100644 --- a/src/mame/drivers/radio86.cpp +++ b/src/mame/drivers/radio86.cpp @@ -343,7 +343,7 @@ GFXDECODE_END /* Machine driver */ -static MACHINE_CONFIG_START( radio86 ) +MACHINE_CONFIG_START(radio86_state::radio86) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, XTAL_16MHz / 9) MCFG_CPU_PROGRAM_MAP(radio86_mem) @@ -391,13 +391,13 @@ static MACHINE_CONFIG_START( radio86 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( radio16, radio86 ) +MACHINE_CONFIG_DERIVED(radio86_state::radio16, radio86) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(radio86_16_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( radiorom, radio86 ) +MACHINE_CONFIG_DERIVED(radio86_state::radiorom, radio86) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(radio86rom_mem) @@ -413,7 +413,7 @@ static MACHINE_CONFIG_DERIVED( radiorom, radio86 ) MCFG_SOFTWARE_LIST_ADD("cart_list", "radio86_cart") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( radioram, radio86 ) +MACHINE_CONFIG_DERIVED(radio86_state::radioram, radio86) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(radio86ram_mem) @@ -424,7 +424,7 @@ static MACHINE_CONFIG_DERIVED( radioram, radio86 ) MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_romdisk_portc_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rk7007, radio86 ) +MACHINE_CONFIG_DERIVED(radio86_state::rk7007, radio86) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(rk7007_io) @@ -436,7 +436,7 @@ static MACHINE_CONFIG_DERIVED( rk7007, radio86 ) MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rk700716, radio16 ) +MACHINE_CONFIG_DERIVED(radio86_state::rk700716, radio16) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(rk7007_io) @@ -448,13 +448,13 @@ static MACHINE_CONFIG_DERIVED( rk700716, radio16 ) MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mikron2, radio86 ) +MACHINE_CONFIG_DERIVED(radio86_state::mikron2, radio86) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mikron2_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( impuls03, radio86 ) +MACHINE_CONFIG_DERIVED(radio86_state::impuls03, radio86) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(impuls03_mem) diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp index 88196786470..0945bc87cfd 100644 --- a/src/mame/drivers/raiden.cpp +++ b/src/mame/drivers/raiden.cpp @@ -318,7 +318,7 @@ INTERRUPT_GEN_MEMBER(raiden_state::raiden_interrupt) device.execute().set_input_line_and_vector(0, HOLD_LINE, 0xc8/4); /* VBL */ } -static MACHINE_CONFIG_START( raiden ) +MACHINE_CONFIG_START(raiden_state::raiden) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ @@ -367,7 +367,7 @@ static MACHINE_CONFIG_START( raiden ) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( raidene, raiden ) +MACHINE_CONFIG_DERIVED(raiden_state::raidene, raiden) MCFG_DEVICE_MODIFY("audiocpu") MCFG_CPU_PROGRAM_MAP(raiden_sound_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(raiden_sound_decrypted_opcodes_map) @@ -376,7 +376,7 @@ static MACHINE_CONFIG_DERIVED( raidene, raiden ) MCFG_DEVICE_PROGRAM_MAP(sei80bu_encrypted_full_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( raidenu, raidene ) +MACHINE_CONFIG_DERIVED(raiden_state::raidenu, raidene) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -391,7 +391,7 @@ WRITE16_MEMBER( raiden_state::raidenb_layer_scroll_w ) COMBINE_DATA(&m_raidenb_scroll_ram[offset]); } -static MACHINE_CONFIG_DERIVED( raidenb, raiden ) +MACHINE_CONFIG_DERIVED(raiden_state::raidenb, raiden) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp index efb99396e8d..971bfe80df7 100644 --- a/src/mame/drivers/raiden2.cpp +++ b/src/mame/drivers/raiden2.cpp @@ -1406,7 +1406,7 @@ GFXDECODE_END /* MACHINE DRIVERS */ -static MACHINE_CONFIG_START( raiden2 ) +MACHINE_CONFIG_START(raiden2_state::raiden2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30,XTAL_32MHz/2) /* verified on pcb */ @@ -1458,7 +1458,7 @@ static MACHINE_CONFIG_START( raiden2 ) MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( xsedae, raiden2 ) +MACHINE_CONFIG_DERIVED(raiden2_state::xsedae, raiden2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(xsedae_mem) @@ -1469,7 +1469,7 @@ static MACHINE_CONFIG_DERIVED( xsedae, raiden2 ) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 32*8-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( raidendx, raiden2 ) +MACHINE_CONFIG_DERIVED(raiden2_state::raidendx, raiden2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(raidendx_mem) @@ -1477,7 +1477,7 @@ static MACHINE_CONFIG_DERIVED( raidendx, raiden2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( zeroteam ) +MACHINE_CONFIG_START(raiden2_state::zeroteam) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30,XTAL_32MHz/2) /* verified on pcb */ diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index 3dfe8083105..6cda8d8e8b6 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -622,6 +622,7 @@ public: DECLARE_WRITE16_MEMBER(vram_w); DECLARE_WRITE_LINE_MEMBER(GDC_vblank_irq); + void rainbow(machine_config &config); protected: virtual void machine_start() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -3182,7 +3183,7 @@ static ADDRESS_MAP_START( upd7220_map, 0, 16, rainbow_state) AM_RANGE(0x00000, 0x3ffff) AM_READWRITE(vram_r, vram_w) AM_SHARE("vram") ADDRESS_MAP_END -static MACHINE_CONFIG_START(rainbow) +MACHINE_CONFIG_START(rainbow_state::rainbow) MCFG_DEFAULT_LAYOUT(layout_rainbow) /* basic machine hardware */ diff --git a/src/mame/drivers/rallyx.cpp b/src/mame/drivers/rallyx.cpp index b1f950dddb0..2966971ab1a 100644 --- a/src/mame/drivers/rallyx.cpp +++ b/src/mame/drivers/rallyx.cpp @@ -815,7 +815,7 @@ INTERRUPT_GEN_MEMBER(rallyx_state::jungler_vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( rallyx ) +MACHINE_CONFIG_START(rallyx_state::rallyx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */ @@ -868,7 +868,7 @@ static MACHINE_CONFIG_START( rallyx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( jungler ) +MACHINE_CONFIG_START(rallyx_state::jungler) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */ @@ -909,11 +909,12 @@ static MACHINE_CONFIG_START( jungler ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") /* sound hardware */ - MCFG_FRAGMENT_ADD(locomotn_sound) + MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0) + downcast(device)->locomotn_sound(config); MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tactcian, jungler ) +MACHINE_CONFIG_DERIVED(rallyx_state::tactcian, jungler) /* basic machine hardware */ @@ -924,7 +925,7 @@ static MACHINE_CONFIG_DERIVED( tactcian, jungler ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( locomotn, jungler ) +MACHINE_CONFIG_DERIVED(rallyx_state::locomotn, jungler) /* basic machine hardware */ @@ -936,7 +937,7 @@ static MACHINE_CONFIG_DERIVED( locomotn, jungler ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( commsega, jungler ) +MACHINE_CONFIG_DERIVED(rallyx_state::commsega, jungler) /* basic machine hardware */ @@ -1149,7 +1150,7 @@ ROM_START( jungler ) ROM_LOAD( "jungr3", 0x2000, 0x1000, CRC(3dcc03da) SHA1(2c328a46511c4c9eec6515b9316a586de6503152) ) ROM_LOAD( "jungr4", 0x3000, 0x1000, CRC(f92e9940) SHA1(d72a4d0a0ab7c9a1dcbb7925eb8530052640a234) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "1b", 0x0000, 0x1000, CRC(f86999c3) SHA1(4660bd7826219b1bad7d9178918823196d4fd8d6) ) ROM_REGION( 0x1000, "gfx1", 0 ) @@ -1173,7 +1174,7 @@ ROM_START( junglers ) ROM_LOAD( "4d", 0x2000, 0x1000, CRC(557c7925) SHA1(84d8eb2fdb7ee9098805be9f457a37f51e4bc3b8) ) ROM_LOAD( "4c", 0x3000, 0x1000, CRC(51aac9a5) SHA1(2c8a24b4ce8cec96c6e09332f3f63bd7d25ae4c6) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "1b", 0x0000, 0x1000, CRC(f86999c3) SHA1(4660bd7826219b1bad7d9178918823196d4fd8d6) ) ROM_REGION( 0x1000, "gfx1", 0 ) @@ -1197,7 +1198,7 @@ ROM_START( jackler ) /* Board ID SL-HA-2061-21-B */ ROM_LOAD( "jungr3", 0x2000, 0x1000, CRC(3dcc03da) SHA1(2c328a46511c4c9eec6515b9316a586de6503152) ) // jackler_j2.r2 ROM_LOAD( "jungr4", 0x3000, 0x1000, CRC(f92e9940) SHA1(d72a4d0a0ab7c9a1dcbb7925eb8530052640a234) ) // jackler_j3.r3 - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "1b", 0x0000, 0x1000, CRC(f86999c3) SHA1(4660bd7826219b1bad7d9178918823196d4fd8d6) ) // jackler_j7_sound.1b ROM_REGION( 0x1800, "gfx1", 0 ) @@ -1221,7 +1222,7 @@ ROM_START( savanna ) ROM_LOAD( "sav3.bin", 0x2000, 0x1000, CRC(557c7925) SHA1(84d8eb2fdb7ee9098805be9f457a37f51e4bc3b8) ) ROM_LOAD( "sav4.bin", 0x3000, 0x1000, CRC(b38b6cbd) SHA1(76ab41097bceb3d73c95ab8a89df702e554ba403) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "1b", 0x0000, 0x1000, CRC(f86999c3) SHA1(4660bd7826219b1bad7d9178918823196d4fd8d6) ) ROM_REGION( 0x1000, "gfx1", 0 ) @@ -1247,7 +1248,7 @@ ROM_START( tactcian ) ROM_LOAD( "tacticia.005", 0x4000, 0x1000, CRC(76456106) SHA1(580428f3c8cf442ee5c0f56db973644229aa8093) ) ROM_LOAD( "tacticia.006", 0x5000, 0x1000, CRC(b33ca9ea) SHA1(0299c1cb9a3c6368bbbacb60c6f5c6854035a7bf) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "tacticia.s2", 0x0000, 0x1000, CRC(97d145a7) SHA1(7aee9004287590a25e153d45b95dfaac89fbe996) ) ROM_LOAD( "tacticia.s1", 0x1000, 0x1000, CRC(067f781b) SHA1(640bc7813c239e497644e53a080d81366fcd04df) ) @@ -1274,7 +1275,7 @@ ROM_START( tactcian2 ) ROM_LOAD( "tan5", 0x4000, 0x1000, CRC(1dae4c61) SHA1(70283b8412b0725f1c2acc281625c582a4fae39d) ) ROM_LOAD( "tan6", 0x5000, 0x1000, CRC(2b36a18d) SHA1(bea8f36ec98975438ab267509bd9d1d1eb605945) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) /* sound ROMs were missing - using the ones from the other set */ ROM_LOAD( "tacticia.s2", 0x0000, 0x1000, CRC(97d145a7) SHA1(7aee9004287590a25e153d45b95dfaac89fbe996) ) ROM_LOAD( "tacticia.s1", 0x1000, 0x1000, CRC(067f781b) SHA1(640bc7813c239e497644e53a080d81366fcd04df) ) @@ -1301,7 +1302,7 @@ ROM_START( locomotn ) ROM_LOAD( "4.cpu", 0x3000, 0x1000, CRC(caf6431c) SHA1(f013d8846fad9f64367b69febeb7512029a639c0) ) ROM_LOAD( "5.cpu", 0x4000, 0x1000, CRC(64cf8dd6) SHA1(8fa1b5c4a7f136cb74833425a565fa558eeee083) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "1b_s1.bin", 0x0000, 0x1000, CRC(a1105714) SHA1(6e2e264748ab90bc5e8e8167f17ff91677ef6ae7) ) ROM_REGION( 0x2000, "gfx1", 0 ) @@ -1326,7 +1327,7 @@ ROM_START( gutangtn ) ROM_LOAD( "3h_4.bin", 0x3000, 0x1000, CRC(aa258ddf) SHA1(0f01ac0d72d8bb5a55c91a6fba3e55ed1c038b86) ) ROM_LOAD( "3j_5.bin", 0x4000, 0x1000, CRC(52aec87e) SHA1(6516724c4e570972f070f6dab5b066ea92f56be0) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "1b_s1.bin", 0x0000, 0x1000, CRC(a1105714) SHA1(6e2e264748ab90bc5e8e8167f17ff91677ef6ae7) ) ROM_REGION( 0x2000, "gfx1", 0 ) @@ -1350,7 +1351,7 @@ ROM_START( cottong ) ROM_LOAD( "c3", 0x2000, 0x1000, CRC(01f909fe) SHA1(c80295e9f91ce25bfd28e72823b20ee6f6524a5c) ) ROM_LOAD( "c4", 0x3000, 0x1000, CRC(a89eb3e3) SHA1(058928ade909faba06f177750f914cf1dabaefc3) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "c7", 0x0000, 0x1000, CRC(3d83f6d3) SHA1(e10ed6b6ce7280697c1bc9dbe6c6e6018e1d8be4) ) ROM_LOAD( "c8", 0x1000, 0x1000, CRC(323e1937) SHA1(75499d6c8a9032fac090a13cd4f36bd350f52dab) ) @@ -1380,7 +1381,7 @@ ROM_START( locoboot ) and the program roms appear to be a hack of that */ - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "c7", 0x0000, 0x1000, CRC(3d83f6d3) SHA1(e10ed6b6ce7280697c1bc9dbe6c6e6018e1d8be4) ) ROM_LOAD( "c8", 0x1000, 0x1000, CRC(323e1937) SHA1(75499d6c8a9032fac090a13cd4f36bd350f52dab) ) @@ -1406,7 +1407,7 @@ ROM_START( commsega ) ROM_LOAD( "csega4", 0x3000, 0x1000, CRC(e0ac69b4) SHA1(3a52b2a6204b7310cfe321c582352b437de16660) ) ROM_LOAD( "csega5", 0x4000, 0x1000, CRC(bc56ebd0) SHA1(a178cd5ba381b107e720e18f3549247477037998) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "csega8", 0x0000, 0x1000, CRC(588b4210) SHA1(43bac1bdac721567e4b5d56e9e4488165872bd6a) ) ROM_REGION( 0x2000, "gfx1", 0 ) diff --git a/src/mame/drivers/rambo.cpp b/src/mame/drivers/rambo.cpp index 1f9c1f1d1ea..054ac390ab7 100644 --- a/src/mame/drivers/rambo.cpp +++ b/src/mame/drivers/rambo.cpp @@ -56,6 +56,7 @@ public: DECLARE_DRIVER_INIT(rambo); virtual void machine_start() override; virtual void machine_reset() override; + void rambo(machine_config &config); }; void rambo_state::machine_start() @@ -138,7 +139,7 @@ void rambo_state::machine_reset() m_port_l = 0; } -static MACHINE_CONFIG_START( rambo ) +MACHINE_CONFIG_START(rambo_state::rambo) MCFG_CPU_ADD("maincpu", ATMEGA2560, MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(rambo_prg_map) diff --git a/src/mame/drivers/rampart.cpp b/src/mame/drivers/rampart.cpp index dfd97239377..a8a64cb65f1 100644 --- a/src/mame/drivers/rampart.cpp +++ b/src/mame/drivers/rampart.cpp @@ -336,7 +336,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( rampart ) +MACHINE_CONFIG_START(rampart_state::rampart) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2) diff --git a/src/mame/drivers/ramtek.cpp b/src/mame/drivers/ramtek.cpp index 74f14a88032..ac93534a96b 100644 --- a/src/mame/drivers/ramtek.cpp +++ b/src/mame/drivers/ramtek.cpp @@ -72,6 +72,7 @@ public: required_device m_maincpu; required_device m_video; + void ramtek(machine_config &config); protected: // driver_device overrides @@ -112,7 +113,7 @@ void ramtek_state::video_start() { } -static MACHINE_CONFIG_START( ramtek ) +MACHINE_CONFIG_START(ramtek_state::ramtek) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/rastan.cpp b/src/mame/drivers/rastan.cpp index afea8c00a98..183b41c9a4e 100644 --- a/src/mame/drivers/rastan.cpp +++ b/src/mame/drivers/rastan.cpp @@ -362,7 +362,7 @@ void rastan_state::machine_reset() } -static MACHINE_CONFIG_START( rastan ) +MACHINE_CONFIG_START(rastan_state::rastan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */ diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp index 51437438170..f8376d67865 100644 --- a/src/mame/drivers/rastersp.cpp +++ b/src/mame/drivers/rastersp.cpp @@ -144,6 +144,8 @@ public: void update_irq(uint32_t which, uint32_t state); void upload_palette(uint32_t word1, uint32_t word2); IRQ_CALLBACK_MEMBER(irq_callback); + static void ncr53c700(device_t *device); + void rastersp(machine_config &config); protected: // driver_device overrides virtual void machine_reset() override; @@ -829,12 +831,15 @@ WRITE32_MEMBER(rastersp_state::ncr53c700_write) m_maincpu->space(AS_PROGRAM).write_dword(offset, data, mem_mask); } -static MACHINE_CONFIG_START( ncr53c700 ) +void rastersp_state::ncr53c700(device_t *device) +{ + devcb_base *devcb; + (void)devcb; MCFG_DEVICE_CLOCK(66000000) MCFG_NCR53C7XX_IRQ_HANDLER(DEVWRITELINE(":", rastersp_state, scsi_irq)) MCFG_NCR53C7XX_HOST_READ(DEVREAD32(":", rastersp_state, ncr53c700_read)) MCFG_NCR53C7XX_HOST_WRITE(DEVWRITE32(":", rastersp_state, ncr53c700_write)) -MACHINE_CONFIG_END +} static SLOT_INTERFACE_START( rastersp_scsi_devices ) SLOT_INTERFACE("harddisk", NSCSI_HARDDISK) @@ -848,7 +853,7 @@ SLOT_INTERFACE_END * *************************************/ -static MACHINE_CONFIG_START( rastersp ) +MACHINE_CONFIG_START(rastersp_state::rastersp) MCFG_CPU_ADD("maincpu", I486, 33330000) MCFG_CPU_PROGRAM_MAP(cpu_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp index 77344b925f1..07e6130c66c 100644 --- a/src/mame/drivers/ravens.cpp +++ b/src/mame/drivers/ravens.cpp @@ -103,6 +103,8 @@ public: DECLARE_WRITE_LINE_MEMBER(cass_w); DECLARE_QUICKLOAD_LOAD_MEMBER( ravens ); + void ravens(machine_config &config); + void ravens2(machine_config &config); private: uint8_t m_term_char; uint8_t m_term_data; @@ -325,7 +327,7 @@ QUICKLOAD_LOAD_MEMBER( ravens_state, ravens ) return result; } -static MACHINE_CONFIG_START( ravens ) +MACHINE_CONFIG_START(ravens_state::ravens) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz) // frequency is unknown MCFG_CPU_PROGRAM_MAP(ravens_mem) @@ -346,7 +348,7 @@ static MACHINE_CONFIG_START( ravens ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ravens2 ) +MACHINE_CONFIG_START(ravens_state::ravens2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz) // frequency is unknown MCFG_CPU_PROGRAM_MAP(ravens_mem) diff --git a/src/mame/drivers/rbisland.cpp b/src/mame/drivers/rbisland.cpp index 584fa49ac47..cf3dd68a38c 100644 --- a/src/mame/drivers/rbisland.cpp +++ b/src/mame/drivers/rbisland.cpp @@ -627,7 +627,7 @@ void rbisland_state::machine_start() { } -static MACHINE_CONFIG_START( rbisland ) +MACHINE_CONFIG_START(rbisland_state::rbisland) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */ @@ -679,7 +679,7 @@ MACHINE_CONFIG_END /* Jumping: The PCB has 2 Xtals, 18.432MHz and 24MHz */ -static MACHINE_CONFIG_START( jumping ) +MACHINE_CONFIG_START(rbisland_state::jumping) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_18_432MHz/2) /* verified on pcb */ @@ -723,7 +723,7 @@ static MACHINE_CONFIG_START( jumping ) MACHINE_CONFIG_END /* Imnoe PCB uses 16MHz CPU crystal instead of 18.432 for CPU */ -static MACHINE_CONFIG_DERIVED( jumpingi, jumping ) +MACHINE_CONFIG_DERIVED(rbisland_state::jumpingi, jumping) MCFG_CPU_REPLACE("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(jumping_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", rbisland_state, irq4_line_hold) diff --git a/src/mame/drivers/rbmk.cpp b/src/mame/drivers/rbmk.cpp index 8ba5edf9376..189e561ea35 100644 --- a/src/mame/drivers/rbmk.cpp +++ b/src/mame/drivers/rbmk.cpp @@ -91,6 +91,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(mcu_irq); + void rbmk(machine_config &config); + void rbspm(machine_config &config); protected: virtual void video_start() override; @@ -556,7 +558,7 @@ INTERRUPT_GEN_MEMBER(rbmk_state::mcu_irq) m_mcu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( rbmk ) +MACHINE_CONFIG_START(rbmk_state::rbmk) MCFG_CPU_ADD("maincpu", M68000, 22000000 /2) MCFG_CPU_PROGRAM_MAP(rbmk_mem) MCFG_CPU_VBLANK_INT_DRIVER("screen", rbmk_state, irq1_line_hold) @@ -593,7 +595,7 @@ static MACHINE_CONFIG_START( rbmk ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.60) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rbspm, rbmk ) +MACHINE_CONFIG_DERIVED(rbmk_state::rbspm, rbmk) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(rbspm_mem) diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp index 30739929caf..de90c6244c0 100644 --- a/src/mame/drivers/rc702.cpp +++ b/src/mame/drivers/rc702.cpp @@ -74,6 +74,7 @@ public: I8275_DRAW_CHARACTER_MEMBER(display_pixels); void kbd_put(u8 data); + void rc702(machine_config &config); private: bool m_q_state; bool m_qbar_state; @@ -321,7 +322,7 @@ static SLOT_INTERFACE_START( floppies ) SLOT_INTERFACE( "525qd", FLOPPY_525_QD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( rc702 ) +MACHINE_CONFIG_START(rc702_state::rc702) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(rc702_mem) diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp index ed5da3f0d0c..405449cecdb 100644 --- a/src/mame/drivers/rc759.cpp +++ b/src/mame/drivers/rc759.cpp @@ -104,6 +104,7 @@ public: DECLARE_WRITE8_MEMBER(rtc_w); DECLARE_READ8_MEMBER(irq_callback); + void rc759(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -524,7 +525,7 @@ static SLOT_INTERFACE_START( rc759_floppies ) SLOT_INTERFACE("hd", FLOPPY_525_HD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( rc759 ) +MACHINE_CONFIG_START(rc759_state::rc759) MCFG_CPU_ADD("maincpu", I80186, 6000000) MCFG_CPU_PROGRAM_MAP(rc759_map) MCFG_CPU_IO_MAP(rc759_io) diff --git a/src/mame/drivers/rcorsair.cpp b/src/mame/drivers/rcorsair.cpp index 7d30c73d118..01f55af0571 100644 --- a/src/mame/drivers/rcorsair.cpp +++ b/src/mame/drivers/rcorsair.cpp @@ -72,6 +72,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void rcorsair(machine_config &config); protected: // devices @@ -147,7 +148,7 @@ uint32_t rcorsair_state::screen_update(screen_device &screen, bitmap_ind16 &bitm return 0; } -static MACHINE_CONFIG_START( rcorsair ) +MACHINE_CONFIG_START(rcorsair_state::rcorsair) /* Main CPU is probably inside Custom Block with program code, unknown type */ diff --git a/src/mame/drivers/rd100.cpp b/src/mame/drivers/rd100.cpp index 24988fdd62b..a3405eb0a02 100644 --- a/src/mame/drivers/rd100.cpp +++ b/src/mame/drivers/rd100.cpp @@ -36,6 +36,7 @@ public: DECLARE_MACHINE_RESET(rd100); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void rd100(machine_config &config); private: required_device m_maincpu; }; @@ -94,7 +95,7 @@ MACHINE_RESET_MEMBER( rd100_state, rd100 ) { } -static MACHINE_CONFIG_START( rd100 ) +MACHINE_CONFIG_START(rd100_state::rd100) // basic machine hardware MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz) // MC6809P??? MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/rd110.cpp b/src/mame/drivers/rd110.cpp index cfb2a4c500d..20add8cd046 100644 --- a/src/mame/drivers/rd110.cpp +++ b/src/mame/drivers/rd110.cpp @@ -73,6 +73,7 @@ public: DECLARE_PALETTE_INIT(d110); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void d110(machine_config &config); private: uint8_t m_lcd_data_buffer[256]; @@ -230,7 +231,7 @@ static ADDRESS_MAP_START( d110_io, AS_IO, 16, d110_state ) AM_RANGE(i8x9x_device::P0, i8x9x_device::P0) AM_READ(port0_r) ADDRESS_MAP_END -static MACHINE_CONFIG_START( d110 ) +MACHINE_CONFIG_START(d110_state::d110) MCFG_CPU_ADD( "maincpu", P8098, XTAL_12MHz ) MCFG_CPU_PROGRAM_MAP( d110_map ) MCFG_CPU_IO_MAP( d110_io ) diff --git a/src/mame/drivers/re900.cpp b/src/mame/drivers/re900.cpp index 897bae20c77..7827cef5bd9 100644 --- a/src/mame/drivers/re900.cpp +++ b/src/mame/drivers/re900.cpp @@ -120,6 +120,8 @@ public: DECLARE_WRITE8_MEMBER(re_mux_port_B_w); DECLARE_DRIVER_INIT(re900); + void re900(machine_config &config); + void bs94(machine_config &config); }; @@ -377,7 +379,7 @@ INPUT_PORTS_END * Machine Driver * ***************************/ -static MACHINE_CONFIG_START( re900 ) +MACHINE_CONFIG_START(re900_state::re900) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8051, MAIN_CLOCK) @@ -403,7 +405,7 @@ static MACHINE_CONFIG_START( re900 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bs94, re900 ) +MACHINE_CONFIG_DERIVED(re900_state::bs94, re900) /* sound hardware */ MCFG_SOUND_MODIFY("ay_re900") diff --git a/src/mame/drivers/realbrk.cpp b/src/mame/drivers/realbrk.cpp index 6e73751509d..ee3dad318f4 100644 --- a/src/mame/drivers/realbrk.cpp +++ b/src/mame/drivers/realbrk.cpp @@ -754,7 +754,7 @@ INTERRUPT_GEN_MEMBER(realbrk_state::interrupt) m_tmp68301->external_interrupt_1(); } -static MACHINE_CONFIG_START( realbrk ) +MACHINE_CONFIG_START(realbrk_state::realbrk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000, XTAL_32MHz / 2) /* !! TMP68301 !! */ @@ -791,7 +791,7 @@ static MACHINE_CONFIG_START( realbrk ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pkgnsh, realbrk ) +MACHINE_CONFIG_DERIVED(realbrk_state::pkgnsh, realbrk) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pkgnsh_mem) @@ -799,12 +799,12 @@ static MACHINE_CONFIG_DERIVED( pkgnsh, realbrk ) MCFG_TMP68301_OUT_PARALLEL_CB(NOOP) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pkgnshdx, pkgnsh ) +MACHINE_CONFIG_DERIVED(realbrk_state::pkgnshdx, pkgnsh) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pkgnshdx_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dai2kaku, realbrk ) +MACHINE_CONFIG_DERIVED(realbrk_state::dai2kaku, realbrk) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(dai2kaku_mem) diff --git a/src/mame/drivers/redalert.cpp b/src/mame/drivers/redalert.cpp index 21cef47ecfe..54b01be5bfa 100644 --- a/src/mame/drivers/redalert.cpp +++ b/src/mame/drivers/redalert.cpp @@ -387,7 +387,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( redalert ) +MACHINE_CONFIG_START(redalert_state::redalert) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK) @@ -401,7 +401,7 @@ static MACHINE_CONFIG_START( redalert ) MCFG_FRAGMENT_ADD(redalert_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ww3 ) +MACHINE_CONFIG_START(redalert_state::ww3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK) @@ -415,7 +415,7 @@ static MACHINE_CONFIG_START( ww3 ) MCFG_FRAGMENT_ADD(ww3_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( panther ) +MACHINE_CONFIG_START(redalert_state::panther) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK) @@ -429,7 +429,7 @@ static MACHINE_CONFIG_START( panther ) MCFG_FRAGMENT_ADD(ww3_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( demoneye ) +MACHINE_CONFIG_START(redalert_state::demoneye) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK) diff --git a/src/mame/drivers/redclash.cpp b/src/mame/drivers/redclash.cpp index e684fdc7df2..7f40a49565a 100644 --- a/src/mame/drivers/redclash.cpp +++ b/src/mame/drivers/redclash.cpp @@ -626,7 +626,7 @@ MACHINE_RESET_MEMBER(redclash_state,redclash) m_stars_count = 0; } -static MACHINE_CONFIG_START( zerohour ) +MACHINE_CONFIG_START(redclash_state::zerohour) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */ @@ -655,7 +655,7 @@ static MACHINE_CONFIG_START( zerohour ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( redclash ) +MACHINE_CONFIG_START(redclash_state::redclash) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */ @@ -683,7 +683,7 @@ static MACHINE_CONFIG_START( redclash ) /* sound hardware */ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sraider ) +MACHINE_CONFIG_START(redclash_state::sraider) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */ diff --git a/src/mame/drivers/relief.cpp b/src/mame/drivers/relief.cpp index 25f569d2017..34332eba111 100644 --- a/src/mame/drivers/relief.cpp +++ b/src/mame/drivers/relief.cpp @@ -267,7 +267,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( relief ) +MACHINE_CONFIG_START(relief_state::relief) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) diff --git a/src/mame/drivers/renegade.cpp b/src/mame/drivers/renegade.cpp index 50862e7c410..a09de8a663e 100644 --- a/src/mame/drivers/renegade.cpp +++ b/src/mame/drivers/renegade.cpp @@ -463,7 +463,7 @@ void renegade_state::machine_reset() } -static MACHINE_CONFIG_START( renegade ) +MACHINE_CONFIG_START(renegade_state::renegade) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 12000000/8) /* 1.5 MHz (measured) */ @@ -505,7 +505,7 @@ static MACHINE_CONFIG_START( renegade ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kuniokunb, renegade ) +MACHINE_CONFIG_DERIVED(renegade_state::kuniokunb, renegade) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(renegade_nomcu_map) diff --git a/src/mame/drivers/replicator.cpp b/src/mame/drivers/replicator.cpp index 094ffd191a4..69bbf55d92d 100644 --- a/src/mame/drivers/replicator.cpp +++ b/src/mame/drivers/replicator.cpp @@ -186,6 +186,7 @@ public: DECLARE_DRIVER_INIT(replicator); virtual void machine_reset() override; DECLARE_PALETTE_INIT(replicator); + void replicator(machine_config &config); }; void replicator_state::machine_start() @@ -599,7 +600,7 @@ static GFXDECODE_START( replicator ) GFXDECODE_ENTRY( "hd44780:cgrom", 0x0000, hd44780_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( replicator ) +MACHINE_CONFIG_START(replicator_state::replicator) MCFG_CPU_ADD("maincpu", ATMEGA1280, MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(replicator_prg_map) diff --git a/src/mame/drivers/retofinv.cpp b/src/mame/drivers/retofinv.cpp index df3ef376561..0eb47bd8b42 100644 --- a/src/mame/drivers/retofinv.cpp +++ b/src/mame/drivers/retofinv.cpp @@ -409,7 +409,7 @@ INTERRUPT_GEN_MEMBER(retofinv_state::sub_vblank_irq) } -static MACHINE_CONFIG_START( retofinv ) +MACHINE_CONFIG_START(retofinv_state::retofinv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* XTAL and divider verified, 3.072 MHz */ @@ -465,13 +465,13 @@ static MACHINE_CONFIG_START( retofinv ) MACHINE_CONFIG_END /* bootleg which has different palette clut */ -static MACHINE_CONFIG_DERIVED( retofinvb1, retofinv ) +MACHINE_CONFIG_DERIVED(retofinv_state::retofinvb1, retofinv) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(retofinv_state, retofinv_bl) MACHINE_CONFIG_END /* bootleg which has no mcu */ -static MACHINE_CONFIG_DERIVED( retofinvb_nomcu, retofinv ) +MACHINE_CONFIG_DERIVED(retofinv_state::retofinvb_nomcu, retofinv) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bootleg_map) @@ -482,7 +482,7 @@ static MACHINE_CONFIG_DERIVED( retofinvb_nomcu, retofinv ) MACHINE_CONFIG_END /* bootleg which has different pallete clut and also has no mcu */ -static MACHINE_CONFIG_DERIVED( retofinvb1_nomcu, retofinvb1 ) +MACHINE_CONFIG_DERIVED(retofinv_state::retofinvb1_nomcu, retofinvb1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bootleg_map) diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp index 5e1c6f53e28..2dec41b7c9c 100644 --- a/src/mame/drivers/rex6000.cpp +++ b/src/mame/drivers/rex6000.cpp @@ -123,6 +123,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(irq_timer2); TIMER_DEVICE_CALLBACK_MEMBER(sec_timer); DECLARE_QUICKLOAD_LOAD_MEMBER(rex6000); + void rex6000(machine_config &config); }; @@ -146,6 +147,7 @@ public: virtual void machine_reset() override; uint32_t screen_update_oz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void oz750(machine_config &config); private: int oz_wzd_extract_tag(const std::vector &data, const char *tag, char *dest_buf); @@ -871,7 +873,7 @@ static GFXDECODE_START( rex6000 ) GFXDECODE_END -static MACHINE_CONFIG_START( rex6000 ) +MACHINE_CONFIG_START(rex6000_state::rex6000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) //Toshiba microprocessor Z80 compatible at 4.3MHz MCFG_CPU_PROGRAM_MAP(rex6000_mem) @@ -948,7 +950,7 @@ static MACHINE_CONFIG_START( rex6000 ) MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( oz750 ) +MACHINE_CONFIG_START(oz750_state::oz750) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_9_8304MHz) //Toshiba microprocessor Z80 compatible at 9.8MHz MCFG_CPU_PROGRAM_MAP(rex6000_mem) diff --git a/src/mame/drivers/rgum.cpp b/src/mame/drivers/rgum.cpp index ab3649d29fe..7eedc0b2dc2 100644 --- a/src/mame/drivers/rgum.cpp +++ b/src/mame/drivers/rgum.cpp @@ -43,6 +43,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void rgum(machine_config &config); }; @@ -238,7 +239,7 @@ static GFXDECODE_START( rgum ) GFXDECODE_END -static MACHINE_CONFIG_START( rgum ) +MACHINE_CONFIG_START(rgum_state::rgum) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65C02,24000000/16) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(rgum_map) diff --git a/src/mame/drivers/risc2500.cpp b/src/mame/drivers/risc2500.cpp index 2a8ca42b5db..d764d319a10 100644 --- a/src/mame/drivers/risc2500.cpp +++ b/src/mame/drivers/risc2500.cpp @@ -47,6 +47,7 @@ public: void install_boot_rom(); void remove_boot_rom(); + void risc2500(machine_config &config); private: required_device m_maincpu; required_device m_ram; @@ -294,7 +295,7 @@ static ADDRESS_MAP_START(risc2500_mem, AS_PROGRAM, 32, risc2500_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( risc2500 ) +MACHINE_CONFIG_START(risc2500_state::risc2500) MCFG_CPU_ADD("maincpu", ARM, XTAL_28_322MHz / 2) // VY86C010 MCFG_CPU_PROGRAM_MAP(risc2500_mem) MCFG_ARM_COPRO(VL86C020) diff --git a/src/mame/drivers/riscpc.cpp b/src/mame/drivers/riscpc.cpp index 86f9f9a4e68..0e67ac0811a 100644 --- a/src/mame/drivers/riscpc.cpp +++ b/src/mame/drivers/riscpc.cpp @@ -67,6 +67,12 @@ public: TIMER_CALLBACK_MEMBER(IOMD_timer0_callback); TIMER_CALLBACK_MEMBER(IOMD_timer1_callback); TIMER_CALLBACK_MEMBER(flyback_timer_callback); + void rpc700(machine_config &config); + void rpc600(machine_config &config); + void sarpc(machine_config &config); + void sarpc_j233(machine_config &config); + void a7000(machine_config &config); + void a7000p(machine_config &config); }; @@ -799,7 +805,7 @@ void riscpc_state::machine_reset() m_flyback_timer->adjust( attotime::never); } -static MACHINE_CONFIG_START( rpc600 ) +MACHINE_CONFIG_START(riscpc_state::rpc600) /* Basic machine hardware */ MCFG_CPU_ADD( "maincpu", ARM7, XTAL_30MHz ) // ARM610 MCFG_CPU_PROGRAM_MAP(a7000_mem) @@ -814,7 +820,7 @@ static MACHINE_CONFIG_START( rpc600 ) MCFG_PALETTE_ADD("palette", 0x200) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rpc700 ) +MACHINE_CONFIG_START(riscpc_state::rpc700) /* Basic machine hardware */ MCFG_CPU_ADD( "maincpu", ARM7, XTAL_40MHz ) // ARM710 MCFG_CPU_PROGRAM_MAP(a7000_mem) @@ -829,7 +835,7 @@ static MACHINE_CONFIG_START( rpc700 ) MCFG_PALETTE_ADD("palette", 0x200) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( a7000 ) +MACHINE_CONFIG_START(riscpc_state::a7000) /* Basic machine hardware */ MCFG_CPU_ADD( "maincpu", ARM7, XTAL_32MHz ) // ARM7500 MCFG_CPU_PROGRAM_MAP(a7000_mem) @@ -844,12 +850,12 @@ static MACHINE_CONFIG_START( a7000 ) MCFG_PALETTE_ADD("palette", 0x200) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( a7000p, a7000 ) +MACHINE_CONFIG_DERIVED(riscpc_state::a7000p, a7000) MCFG_CPU_MODIFY("maincpu") // ARM7500FE MCFG_CPU_CLOCK(XTAL_48MHz) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sarpc ) +MACHINE_CONFIG_START(riscpc_state::sarpc) /* Basic machine hardware */ MCFG_CPU_ADD( "maincpu", ARM7, 202000000 ) // StrongARM MCFG_CPU_PROGRAM_MAP(a7000_mem) @@ -864,7 +870,7 @@ static MACHINE_CONFIG_START( sarpc ) MCFG_PALETTE_ADD("palette", 0x200) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sarpc_j233 ) +MACHINE_CONFIG_START(riscpc_state::sarpc_j233) /* Basic machine hardware */ MCFG_CPU_ADD( "maincpu", ARM7, 233000000 ) // StrongARM MCFG_CPU_PROGRAM_MAP(a7000_mem) diff --git a/src/mame/drivers/rltennis.cpp b/src/mame/drivers/rltennis.cpp index c61dc3b73fb..1fcacdec410 100644 --- a/src/mame/drivers/rltennis.cpp +++ b/src/mame/drivers/rltennis.cpp @@ -183,7 +183,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, rltennis_state ) AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb888_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START( rltennis ) +MACHINE_CONFIG_START(rltennis_state::rltennis) MCFG_CPU_ADD("maincpu", M68000, RLT_XTAL/2) /* 68000P8 ??? */ MCFG_CPU_PROGRAM_MAP(rltennis_main) diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp index 3263d9f6c86..967fd8d91cc 100644 --- a/src/mame/drivers/rm380z.cpp +++ b/src/mame/drivers/rm380z.cpp @@ -228,7 +228,7 @@ uint32_t rm380z_state::screen_update_rm380z(screen_device &screen, bitmap_ind16 return 0; } -static MACHINE_CONFIG_START( rm380z ) +MACHINE_CONFIG_START(rm380z_state::rm380z) /* basic machine hardware */ MCFG_CPU_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(rm380z_mem) @@ -268,7 +268,7 @@ static MACHINE_CONFIG_START( rm380z ) MCFG_GENERIC_KEYBOARD_CB(PUT(rm380z_state, keyboard_put)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rm480z ) +MACHINE_CONFIG_START(rm380z_state::rm480z) /* basic machine hardware */ MCFG_CPU_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(rm480z_mem) diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp index 58cb32a4c0e..cb29327b4bf 100644 --- a/src/mame/drivers/rmhaihai.cpp +++ b/src/mame/drivers/rmhaihai.cpp @@ -76,6 +76,9 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TILE_GET_INFO_MEMBER(get_bg_tile_info); + void themj(machine_config &config); + void rmhaisei(machine_config &config); + void rmhaihai(machine_config &config); }; @@ -471,7 +474,7 @@ static GFXDECODE_START( themj ) GFXDECODE_END -static MACHINE_CONFIG_START( rmhaihai ) +MACHINE_CONFIG_START(rmhaihai_state::rmhaihai) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,20000000/4) /* 5 MHz ??? */ @@ -507,7 +510,7 @@ static MACHINE_CONFIG_START( rmhaihai ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rmhaisei, rmhaihai ) +MACHINE_CONFIG_DERIVED(rmhaihai_state::rmhaisei, rmhaihai) /* basic machine hardware */ @@ -517,7 +520,7 @@ static MACHINE_CONFIG_DERIVED( rmhaisei, rmhaihai ) MCFG_PALETTE_ENTRIES(0x200) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( themj, rmhaihai ) +MACHINE_CONFIG_DERIVED(rmhaihai_state::themj, rmhaihai) /* basic machine hardware */ diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp index c7bd3504d30..81488b8d0cd 100644 --- a/src/mame/drivers/rmnimbus.cpp +++ b/src/mame/drivers/rmnimbus.cpp @@ -100,7 +100,7 @@ static ADDRESS_MAP_START( nimbus_iocpu_io , AS_IO, 8, rmnimbus_state ) AM_RANGE(0x20000, 0x20004) AM_READWRITE(nimbus_pc8031_port_r, nimbus_pc8031_port_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START( nimbus ) +MACHINE_CONFIG_START(rmnimbus_state::nimbus) /* basic machine hardware */ MCFG_CPU_ADD(MAINCPU_TAG, I80186, 16000000) // the cpu is a 10Mhz part but the serial clocks are wrong unless it runs at 8Mhz MCFG_CPU_PROGRAM_MAP(nimbus_mem) diff --git a/src/mame/drivers/rmt32.cpp b/src/mame/drivers/rmt32.cpp index de969a57732..bb865e07ef6 100644 --- a/src/mame/drivers/rmt32.cpp +++ b/src/mame/drivers/rmt32.cpp @@ -216,6 +216,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(midi_timer_cb); TIMER_DEVICE_CALLBACK_MEMBER(samples_timer_cb); + void mt32(machine_config &config); private: uint8_t lcd_data_buffer[256]; int lcd_data_buffer_pos; @@ -349,7 +350,7 @@ static ADDRESS_MAP_START( mt32_io, AS_IO, 16, mt32_state ) AM_RANGE(i8x9x_device::P0, i8x9x_device::P0) AM_READ(port0_r) ADDRESS_MAP_END -static MACHINE_CONFIG_START( mt32 ) +MACHINE_CONFIG_START(mt32_state::mt32) MCFG_CPU_ADD( "maincpu", P8098, XTAL_12MHz ) MCFG_CPU_PROGRAM_MAP( mt32_map ) MCFG_CPU_IO_MAP( mt32_io ) diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp index 6daf63ceecd..f5d18476fc4 100644 --- a/src/mame/drivers/rockrage.cpp +++ b/src/mame/drivers/rockrage.cpp @@ -245,7 +245,7 @@ void rockrage_state::machine_reset() m_vreg = 0; } -static MACHINE_CONFIG_START( rockrage ) +MACHINE_CONFIG_START(rockrage_state::rockrage) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD6309E, XTAL_24MHz / 8) diff --git a/src/mame/drivers/rocnrope.cpp b/src/mame/drivers/rocnrope.cpp index 1f5feb93edf..7019a5ecc9b 100644 --- a/src/mame/drivers/rocnrope.cpp +++ b/src/mame/drivers/rocnrope.cpp @@ -19,6 +19,7 @@ #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "screen.h" +#include "speaker.h" #define MASTER_CLOCK XTAL_18_432MHz @@ -205,8 +206,17 @@ INTERRUPT_GEN_MEMBER(rocnrope_state::vblank_irq) device.execute().set_input_line(0, ASSERT_LINE); } +static ADDRESS_MAP_START( timeplt_sound_map, AS_PROGRAM, 8, timeplt_audio_device ) + AM_RANGE(0x0000, 0x2fff) AM_ROM + AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM + AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay1", ay8910_device, data_r, data_w) + AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay1", ay8910_device, address_w) + AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay2", ay8910_device, data_r, data_w) + AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay2", ay8910_device, address_w) + AM_RANGE(0x8000, 0xffff) AM_DEVWRITE("timeplt_audio", timeplt_audio_device, filter_w) +ADDRESS_MAP_END -static MACHINE_CONFIG_START( rocnrope ) +MACHINE_CONFIG_START(rocnrope_state::rocnrope) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI1, MASTER_CLOCK / 3 / 4) /* Verified in schematics */ @@ -241,7 +251,40 @@ static MACHINE_CONFIG_START( rocnrope ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_FRAGMENT_ADD(timeplt_sound) + /* basic machine hardware */ + MCFG_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8) + MCFG_CPU_PROGRAM_MAP(timeplt_sound_map) + + /* sound hardware */ + MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0) + + MCFG_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/8) + MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) + MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("timeplt_audio", timeplt_audio_device, portB_r)) + MCFG_SOUND_ROUTE(0, "filter.0.0", 0.60) + MCFG_SOUND_ROUTE(1, "filter.0.1", 0.60) + MCFG_SOUND_ROUTE(2, "filter.0.2", 0.60) + + MCFG_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/8) + MCFG_SOUND_ROUTE(0, "filter.1.0", 0.60) + MCFG_SOUND_ROUTE(1, "filter.1.1", 0.60) + MCFG_SOUND_ROUTE(2, "filter.1.2", 0.60) + + MCFG_FILTER_RC_ADD("filter.0.0", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FILTER_RC_ADD("filter.0.1", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FILTER_RC_ADD("filter.0.2", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + + MCFG_FILTER_RC_ADD("filter.1.0", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FILTER_RC_ADD("filter.1.1", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FILTER_RC_ADD("filter.1.2", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END /************************************* diff --git a/src/mame/drivers/rohga.cpp b/src/mame/drivers/rohga.cpp index b58023bcf38..cd867048adb 100644 --- a/src/mame/drivers/rohga.cpp +++ b/src/mame/drivers/rohga.cpp @@ -908,7 +908,7 @@ DECOSPR_COLOUR_CB_MEMBER(rohga_state::schmeisr_col_callback) return colour; } -static MACHINE_CONFIG_START( rohga ) +MACHINE_CONFIG_START(rohga_state::rohga) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14000000) @@ -995,7 +995,7 @@ static MACHINE_CONFIG_START( rohga ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wizdfire ) +MACHINE_CONFIG_START(rohga_state::wizdfire) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14000000) @@ -1087,7 +1087,7 @@ static MACHINE_CONFIG_START( wizdfire ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( nitrobal ) +MACHINE_CONFIG_START(rohga_state::nitrobal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14000000) @@ -1180,7 +1180,7 @@ static MACHINE_CONFIG_START( nitrobal ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( schmeisr ) +MACHINE_CONFIG_START(rohga_state::schmeisr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14000000) @@ -1269,7 +1269,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hangzo, schmeisr ) +MACHINE_CONFIG_DERIVED(rohga_state::hangzo, schmeisr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/rollerg.cpp b/src/mame/drivers/rollerg.cpp index b79e41c4b5a..b17965bf3eb 100644 --- a/src/mame/drivers/rollerg.cpp +++ b/src/mame/drivers/rollerg.cpp @@ -242,7 +242,7 @@ WRITE8_MEMBER( rollerg_state::banking_callback ) } -static MACHINE_CONFIG_START( rollerg ) +MACHINE_CONFIG_START(rollerg_state::rollerg) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */ diff --git a/src/mame/drivers/rollext.cpp b/src/mame/drivers/rollext.cpp index d4e8753844f..4c0f546b3a8 100644 --- a/src/mame/drivers/rollext.cpp +++ b/src/mame/drivers/rollext.cpp @@ -311,6 +311,7 @@ public: virtual void video_start() override; void preprocess_texture_data(); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void rollext(machine_config &config); }; void rollext_state::preprocess_texture_data() @@ -537,7 +538,7 @@ void rollext_state::machine_start() } -static MACHINE_CONFIG_START(rollext) +MACHINE_CONFIG_START(rollext_state::rollext) MCFG_CPU_ADD("maincpu", TMS32082_MP, 60000000) MCFG_CPU_PROGRAM_MAP(memmap) //MCFG_CPU_VBLANK_INT_DRIVER("screen", rollext_state, vblank_interrupt) diff --git a/src/mame/drivers/rollrace.cpp b/src/mame/drivers/rollrace.cpp index 75f3dd4f9ee..3a1809c8c57 100644 --- a/src/mame/drivers/rollrace.cpp +++ b/src/mame/drivers/rollrace.cpp @@ -245,7 +245,7 @@ INTERRUPT_GEN_MEMBER(rollrace_state::sound_timer_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( rollrace ) +MACHINE_CONFIG_START(rollrace_state::rollrace) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,XTAL_24MHz/8) /* verified on pcb */ @@ -293,7 +293,7 @@ static MACHINE_CONFIG_START( rollrace ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rollace2, rollrace ) +MACHINE_CONFIG_DERIVED(rollrace_state::rollace2, rollrace) /* basic machine hardware */ diff --git a/src/mame/drivers/ron.cpp b/src/mame/drivers/ron.cpp index 6a0dbbf4228..793ce4495a0 100644 --- a/src/mame/drivers/ron.cpp +++ b/src/mame/drivers/ron.cpp @@ -66,6 +66,7 @@ public: DECLARE_READ_LINE_MEMBER(audio_T1_r); DECLARE_WRITE8_MEMBER(ay_pa_w); + void ron(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -472,7 +473,7 @@ WRITE8_MEMBER(ron_state::ay_pa_w) { } -static MACHINE_CONFIG_START( ron ) +MACHINE_CONFIG_START(ron_state::ron) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK) diff --git a/src/mame/drivers/rotaryf.cpp b/src/mame/drivers/rotaryf.cpp index 704ad4b028e..92e892c9ef6 100644 --- a/src/mame/drivers/rotaryf.cpp +++ b/src/mame/drivers/rotaryf.cpp @@ -57,6 +57,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(rotaryf_interrupt); + void rotaryf(machine_config &config); }; @@ -256,7 +257,7 @@ static INPUT_PORTS_START( rotaryf ) INPUT_PORTS_END -static MACHINE_CONFIG_START( rotaryf ) +MACHINE_CONFIG_START(rotaryf_state::rotaryf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A,4000000) /* ?? MHz */ diff --git a/src/mame/drivers/roul.cpp b/src/mame/drivers/roul.cpp index d62360d07e3..e75f009a375 100644 --- a/src/mame/drivers/roul.cpp +++ b/src/mame/drivers/roul.cpp @@ -99,6 +99,7 @@ public: DECLARE_PALETTE_INIT(roul); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void roul(machine_config &config); }; @@ -294,7 +295,7 @@ static INPUT_PORTS_START( roul ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END -static MACHINE_CONFIG_START( roul ) +MACHINE_CONFIG_START(roul_state::roul) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(roul_map) diff --git a/src/mame/drivers/route16.cpp b/src/mame/drivers/route16.cpp index 37a8670ac97..da1b8f7232b 100644 --- a/src/mame/drivers/route16.cpp +++ b/src/mame/drivers/route16.cpp @@ -603,7 +603,7 @@ DRIVER_INIT_MEMBER(route16_state, route16) save_item(NAME(m_protection_data)); } -static MACHINE_CONFIG_START( route16 ) +MACHINE_CONFIG_START(route16_state::route16) /* basic machine hardware */ MCFG_CPU_ADD("cpu1", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */ @@ -631,7 +631,7 @@ static MACHINE_CONFIG_START( route16 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( routex, route16 ) +MACHINE_CONFIG_DERIVED(route16_state::routex, route16) /* basic machine hardware */ MCFG_CPU_MODIFY("cpu1") @@ -639,7 +639,7 @@ static MACHINE_CONFIG_DERIVED( routex, route16 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( stratvox, route16 ) +MACHINE_CONFIG_DERIVED(route16_state::stratvox, route16) /* basic machine hardware */ MCFG_CPU_MODIFY("cpu1") @@ -679,7 +679,7 @@ static MACHINE_CONFIG_DERIVED( stratvox, route16 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( speakres, stratvox ) +MACHINE_CONFIG_DERIVED(route16_state::speakres, stratvox) /* basic machine hardware */ MCFG_CPU_MODIFY("cpu1") @@ -689,7 +689,7 @@ static MACHINE_CONFIG_DERIVED( speakres, stratvox ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spacecho, speakres ) +MACHINE_CONFIG_DERIVED(route16_state::spacecho, speakres) /* basic machine hardware */ MCFG_CPU_MODIFY("cpu2") @@ -697,7 +697,7 @@ static MACHINE_CONFIG_DERIVED( spacecho, speakres ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ttmahjng, route16 ) +MACHINE_CONFIG_DERIVED(route16_state::ttmahjng, route16) MCFG_CPU_MODIFY("cpu1") MCFG_CPU_PROGRAM_MAP(ttmahjng_cpu1_map) MCFG_CPU_IO_MAP(0) diff --git a/src/mame/drivers/rowamet.cpp b/src/mame/drivers/rowamet.cpp index 74f44a2ab5f..bbd5e17f330 100644 --- a/src/mame/drivers/rowamet.cpp +++ b/src/mame/drivers/rowamet.cpp @@ -49,6 +49,7 @@ public: DECLARE_READ8_MEMBER(io_r); DECLARE_WRITE8_MEMBER(io_w); TIMER_DEVICE_CALLBACK_MEMBER(timer_a); + void rowamet(machine_config &config); private: uint8_t m_out_offs; uint8_t m_sndcmd; @@ -210,7 +211,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( rowamet_state::timer_a ) output().set_digit_value(++digit, patterns[m_p_ram[m_out_offs++]&15]); } -static MACHINE_CONFIG_START( rowamet ) +MACHINE_CONFIG_START(rowamet_state::rowamet) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 1888888) MCFG_CPU_PROGRAM_MAP(rowamet_map) diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp index 16513c25fda..ff48865ac8a 100644 --- a/src/mame/drivers/royalmah.cpp +++ b/src/mame/drivers/royalmah.cpp @@ -220,6 +220,30 @@ public: INTERRUPT_GEN_MEMBER(suzume_irq); + void mjdiplob(machine_config &config); + void tahjong(machine_config &config); + void tontonb(machine_config &config); + void mjderngr(machine_config &config); + void mjyarou(machine_config &config); + void janoh(machine_config &config); + void mjtensin(machine_config &config); + void mjvegasa(machine_config &config); + void jansou(machine_config &config); + void cafetime(machine_config &config); + void seljan(machine_config &config); + void majs101b(machine_config &config); + void dondenmj(machine_config &config); + void daisyari(machine_config &config); + void mjdejavu(machine_config &config); + void mjapinky(machine_config &config); + void royalmah(machine_config &config); + void mjifb(machine_config &config); + void janptr96(machine_config &config); + void ippatsu(machine_config &config); + void suzume(machine_config &config); + void mjclub(machine_config &config); + void makaijan(machine_config &config); + void janyoup2(machine_config &config); protected: virtual void machine_start() override; @@ -3378,7 +3402,7 @@ static INPUT_PORTS_START( mjvegasa ) INPUT_PORTS_END -static MACHINE_CONFIG_START( royalmah ) +MACHINE_CONFIG_START(royalmah_state::royalmah) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ @@ -3410,7 +3434,7 @@ static MACHINE_CONFIG_START( royalmah ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( janoh, royalmah ) +MACHINE_CONFIG_DERIVED(royalmah_state::janoh, royalmah) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */ MCFG_CPU_PROGRAM_MAP(janoh_map) @@ -3421,7 +3445,7 @@ static MACHINE_CONFIG_DERIVED( janoh, royalmah ) MCFG_CPU_VBLANK_INT_DRIVER("screen", royalmah_state, irq0_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jansou, royalmah ) +MACHINE_CONFIG_DERIVED(royalmah_state::jansou, royalmah) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(jansou_map) @@ -3439,48 +3463,48 @@ static MACHINE_CONFIG_DERIVED( jansou, royalmah ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dondenmj, royalmah ) +MACHINE_CONFIG_DERIVED(royalmah_state::dondenmj, royalmah) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */ MCFG_CPU_IO_MAP(dondenmj_iomap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tahjong, royalmah ) +MACHINE_CONFIG_DERIVED(royalmah_state::tahjong, royalmah) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */ MCFG_CPU_PROGRAM_MAP(tahjong_map) MCFG_CPU_IO_MAP(tahjong_iomap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( makaijan, royalmah ) +MACHINE_CONFIG_DERIVED(royalmah_state::makaijan, royalmah) 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 ) +MACHINE_CONFIG_DERIVED(royalmah_state::daisyari, royalmah) 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 ) +MACHINE_CONFIG_DERIVED(royalmah_state::mjclub, royalmah) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */ MCFG_CPU_IO_MAP(mjclub_iomap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjyarou, royalmah ) +MACHINE_CONFIG_DERIVED(royalmah_state::mjyarou, royalmah) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(mjyarou_iomap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ippatsu, dondenmj ) +MACHINE_CONFIG_DERIVED(royalmah_state::ippatsu, dondenmj) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(ippatsu_iomap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( janyoup2, ippatsu ) +MACHINE_CONFIG_DERIVED(royalmah_state::janyoup2, ippatsu) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(XTAL_18_432MHz/4) // unknown divider MCFG_CPU_IO_MAP(janyoup2_iomap) @@ -3490,7 +3514,7 @@ static MACHINE_CONFIG_DERIVED( janyoup2, ippatsu ) MCFG_MC6845_CHAR_WIDTH(4) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( seljan, janyoup2 ) +MACHINE_CONFIG_DERIVED(royalmah_state::seljan, janyoup2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(seljan_map) MCFG_CPU_IO_MAP(seljan_iomap) @@ -3502,34 +3526,34 @@ INTERRUPT_GEN_MEMBER(royalmah_state::suzume_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_DERIVED( suzume, dondenmj ) +MACHINE_CONFIG_DERIVED(royalmah_state::suzume, dondenmj) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(suzume_iomap) MCFG_CPU_VBLANK_INT_DRIVER("screen", royalmah_state, suzume_irq) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tontonb, dondenmj ) +MACHINE_CONFIG_DERIVED(royalmah_state::tontonb, dondenmj) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(tontonb_iomap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjdiplob, dondenmj ) +MACHINE_CONFIG_DERIVED(royalmah_state::mjdiplob, dondenmj) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(mjdiplob_iomap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( majs101b, dondenmj ) +MACHINE_CONFIG_DERIVED(royalmah_state::majs101b, dondenmj) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(majs101b_iomap) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjapinky, dondenmj ) +MACHINE_CONFIG_DERIVED(royalmah_state::mjapinky, dondenmj) 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 ) +MACHINE_CONFIG_DERIVED(royalmah_state::mjderngr, dondenmj) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(mjderngr_iomap) @@ -3539,7 +3563,7 @@ static MACHINE_CONFIG_DERIVED( mjderngr, dondenmj ) MCFG_PALETTE_INIT_OWNER(royalmah_state,mjderngr) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( janptr96, mjderngr ) +MACHINE_CONFIG_DERIVED(royalmah_state::janptr96, mjderngr) MCFG_DEVICE_REMOVE("maincpu") MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL_16MHz/2) /* 8 MHz? */ @@ -3559,7 +3583,7 @@ static MACHINE_CONFIG_DERIVED( janptr96, mjderngr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjifb, mjderngr ) +MACHINE_CONFIG_DERIVED(royalmah_state::mjifb, mjderngr) MCFG_CPU_REPLACE("maincpu",TMP90841, 8000000) /* ? */ MCFG_CPU_PROGRAM_MAP(mjifb_map) MCFG_TLCS90_PORT_P3_READ_CB(READ8(royalmah_state, mjifb_p3_r)) @@ -3577,7 +3601,7 @@ static MACHINE_CONFIG_DERIVED( mjifb, mjderngr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjdejavu, mjderngr ) +MACHINE_CONFIG_DERIVED(royalmah_state::mjdejavu, mjderngr) MCFG_CPU_REPLACE("maincpu",TMP90841, 8000000) /* ? */ MCFG_CPU_PROGRAM_MAP(mjdejavu_map) MCFG_TLCS90_PORT_P3_READ_CB(READ8(royalmah_state, mjifb_p3_r)) @@ -3595,7 +3619,7 @@ static MACHINE_CONFIG_DERIVED( mjdejavu, mjderngr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjtensin, mjderngr ) +MACHINE_CONFIG_DERIVED(royalmah_state::mjtensin, mjderngr) MCFG_CPU_REPLACE("maincpu",TMP90841, 12000000) /* ? */ MCFG_CPU_PROGRAM_MAP(mjtensin_map) MCFG_TLCS90_PORT_P3_READ_CB(READ8(royalmah_state, mjtensin_p3_r)) @@ -3610,7 +3634,7 @@ static MACHINE_CONFIG_DERIVED( mjtensin, mjderngr ) MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ1)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cafetime, mjderngr ) +MACHINE_CONFIG_DERIVED(royalmah_state::cafetime, mjderngr) MCFG_CPU_REPLACE("maincpu",TMP90841, 12000000) /* ? */ MCFG_CPU_PROGRAM_MAP(cafetime_map) MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(royalmah_state, cafetime_p3_w)) @@ -3625,7 +3649,7 @@ static MACHINE_CONFIG_DERIVED( cafetime, mjderngr ) MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ1)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjvegasa, mjderngr ) +MACHINE_CONFIG_DERIVED(royalmah_state::mjvegasa, mjderngr) MCFG_CPU_REPLACE("maincpu",TMP90841, XTAL_8MHz) /* ? */ MCFG_CPU_PROGRAM_MAP(mjvegasa_map) MCFG_TLCS90_PORT_P3_READ_CB(READ8(royalmah_state, mjtensin_p3_r)) diff --git a/src/mame/drivers/rpunch.cpp b/src/mame/drivers/rpunch.cpp index c0144e388a1..c8ec4d15a78 100644 --- a/src/mame/drivers/rpunch.cpp +++ b/src/mame/drivers/rpunch.cpp @@ -455,7 +455,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( rpunch ) +MACHINE_CONFIG_START(rpunch_state::rpunch) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2) @@ -499,13 +499,13 @@ static MACHINE_CONFIG_START( rpunch ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( svolley, rpunch ) +MACHINE_CONFIG_DERIVED(rpunch_state::svolley, rpunch) MCFG_VIDEO_START_OVERRIDE(rpunch_state,svolley) MACHINE_CONFIG_END // c+p of above for now, bootleg hw, things need verifying -static MACHINE_CONFIG_START( svolleybl ) +MACHINE_CONFIG_START(rpunch_state::svolleybl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2) diff --git a/src/mame/drivers/rsc55.cpp b/src/mame/drivers/rsc55.cpp index ac8586e542f..a486bdec7fb 100644 --- a/src/mame/drivers/rsc55.cpp +++ b/src/mame/drivers/rsc55.cpp @@ -49,6 +49,7 @@ public: required_device m_maincpu; sc55_state(const machine_config &mconfig, device_type type, const char *tag); + void sc55(machine_config &config); }; sc55_state::sc55_state(const machine_config &mconfig, device_type type, const char *tag) : @@ -64,7 +65,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sc55_io, AS_IO, 16, sc55_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( sc55 ) +MACHINE_CONFIG_START(sc55_state::sc55) MCFG_CPU_ADD( "maincpu", P8098, XTAL_20MHz ) // probably not? MCFG_CPU_PROGRAM_MAP( sc55_map ) MCFG_CPU_IO_MAP( sc55_io ) diff --git a/src/mame/drivers/rt1715.cpp b/src/mame/drivers/rt1715.cpp index fc04e2392d1..f79333d0d7d 100644 --- a/src/mame/drivers/rt1715.cpp +++ b/src/mame/drivers/rt1715.cpp @@ -44,6 +44,8 @@ public: DECLARE_PALETTE_INIT(rt1715); I8275_DRAW_CHARACTER_MEMBER( crtc_display_pixels ); + void rt1715(machine_config &config); + void rt1715w(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -272,7 +274,7 @@ static const z80_daisy_config rt1715_daisy_chain[] = { nullptr } }; -static MACHINE_CONFIG_START( rt1715 ) +MACHINE_CONFIG_START(rt1715_state::rt1715) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_2_4576MHz) MCFG_CPU_PROGRAM_MAP(rt1715_mem) @@ -315,7 +317,7 @@ static MACHINE_CONFIG_START( rt1715 ) MCFG_RAM_DEFAULT_VALUE(0x00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rt1715w, rt1715 ) +MACHINE_CONFIG_DERIVED(rt1715_state::rt1715w, rt1715) MACHINE_CONFIG_END diff --git a/src/mame/drivers/runaway.cpp b/src/mame/drivers/runaway.cpp index dad1d26bba8..b3ae3ff0ca7 100644 --- a/src/mame/drivers/runaway.cpp +++ b/src/mame/drivers/runaway.cpp @@ -327,7 +327,7 @@ static GFXDECODE_START( qwak ) GFXDECODE_END -static MACHINE_CONFIG_START( runaway ) +MACHINE_CONFIG_START(runaway_state::runaway) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 12096000 / 8) /* ? */ @@ -368,7 +368,7 @@ static MACHINE_CONFIG_START( runaway ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( qwak, runaway ) +MACHINE_CONFIG_DERIVED(runaway_state::qwak, runaway) /* basic machine hardware */ diff --git a/src/mame/drivers/rungun.cpp b/src/mame/drivers/rungun.cpp index 737defe7ff4..86970bfe628 100644 --- a/src/mame/drivers/rungun.cpp +++ b/src/mame/drivers/rungun.cpp @@ -384,7 +384,7 @@ void rungun_state::machine_reset() m_sound_status = 0; } -static MACHINE_CONFIG_START( rng ) +MACHINE_CONFIG_START(rungun_state::rng) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) @@ -454,7 +454,7 @@ MACHINE_CONFIG_END // for dual-screen output Run and Gun requires the video de-multiplexer board connected to the Jamma output, this gives you 2 Jamma connectors, one for each screen. // this means when operated as a single dedicated cabinet the game runs at 60fps, and has smoother animations than when operated as a twin setup where each // screen only gets an update every other frame. -static MACHINE_CONFIG_DERIVED( rng_dual, rng ) +MACHINE_CONFIG_DERIVED(rungun_state::rng_dual, rng) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(rungun_state, screen_update_rng_dual_left) diff --git a/src/mame/drivers/rvoice.cpp b/src/mame/drivers/rvoice.cpp index aa6ee5b3e76..8ca56759d36 100644 --- a/src/mame/drivers/rvoice.cpp +++ b/src/mame/drivers/rvoice.cpp @@ -88,6 +88,7 @@ public: virtual void machine_reset() override; void null_kbd_put(u8 data); required_device m_maincpu; + void rvoicepc(machine_config &config); }; @@ -358,7 +359,7 @@ void rvoice_state::null_kbd_put(u8 data) { } -static MACHINE_CONFIG_START( rvoicepc ) +MACHINE_CONFIG_START(rvoice_state::rvoicepc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", HD63701, XTAL_7_3728MHz) MCFG_CPU_PROGRAM_MAP(hd63701_main_mem) diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp index 34790927f93..43f623b729d 100644 --- a/src/mame/drivers/rx78.cpp +++ b/src/mame/drivers/rx78.cpp @@ -99,6 +99,7 @@ public: DECLARE_DRIVER_INIT(rx78); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void rx78(machine_config &config); private: uint8_t m_vram_read_bank; uint8_t m_vram_write_bank; @@ -462,7 +463,7 @@ static GFXDECODE_START( rx78 ) GFXDECODE_END -static MACHINE_CONFIG_START( rx78 ) +MACHINE_CONFIG_START(rx78_state::rx78) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, MASTER_CLOCK/7) // unknown divider MCFG_CPU_PROGRAM_MAP(rx78_mem) diff --git a/src/mame/drivers/rzone.cpp b/src/mame/drivers/rzone.cpp index e4a91754e8c..9687e57232d 100644 --- a/src/mame/drivers/rzone.cpp +++ b/src/mame/drivers/rzone.cpp @@ -68,6 +68,8 @@ public: DECLARE_WRITE8_MEMBER(t2_write_r); DECLARE_WRITE8_MEMBER(t2_write_s); + void rzbatfor(machine_config &config); + void rzindy500(machine_config &config); protected: virtual void machine_start() override; }; @@ -238,7 +240,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( rzindy500 ) +MACHINE_CONFIG_START(rzone_state::rzindy500) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) // no external XTAL @@ -264,7 +266,7 @@ static MACHINE_CONFIG_START( rzindy500 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rzbatfor ) +MACHINE_CONFIG_START(rzone_state::rzbatfor) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SM512, XTAL_32_768kHz) // no external XTAL diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp index 0f9948eff13..31e632050bc 100644 --- a/src/mame/drivers/s11.cpp +++ b/src/mame/drivers/s11.cpp @@ -379,7 +379,7 @@ DRIVER_INIT_MEMBER( s11_state, s11 ) m_irq_active = false; } -static MACHINE_CONFIG_START( s11 ) +MACHINE_CONFIG_START(s11_state::s11) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(s11_main_map) diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp index 3d761646231..db25b29d2c2 100644 --- a/src/mame/drivers/s11a.cpp +++ b/src/mame/drivers/s11a.cpp @@ -171,7 +171,7 @@ DRIVER_INIT_MEMBER( s11a_state, s11a ) s11_state::init_s11(); } -static MACHINE_CONFIG_START( s11a ) +MACHINE_CONFIG_START(s11a_state::s11a) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(s11a_main_map) diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp index 08e8fe0d2ba..cb92189a93a 100644 --- a/src/mame/drivers/s11b.cpp +++ b/src/mame/drivers/s11b.cpp @@ -245,7 +245,7 @@ DRIVER_INIT_MEMBER( s11b_state, s11b_invert ) m_invert = true; } -static MACHINE_CONFIG_START( s11b ) +MACHINE_CONFIG_START(s11b_state::s11b) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(s11b_main_map) diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp index 099b749dd5b..4ea95a10c65 100644 --- a/src/mame/drivers/s11c.cpp +++ b/src/mame/drivers/s11c.cpp @@ -150,7 +150,7 @@ DRIVER_INIT_MEMBER(s11c_state,s11c) timer->adjust(attotime::from_ticks(S11_IRQ_CYCLES,E_CLOCK),1); } -static MACHINE_CONFIG_START( s11c ) +MACHINE_CONFIG_START(s11c_state::s11c) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(s11c_main_map) diff --git a/src/mame/drivers/s3.cpp b/src/mame/drivers/s3.cpp index 160af321308..1f985106785 100644 --- a/src/mame/drivers/s3.cpp +++ b/src/mame/drivers/s3.cpp @@ -89,6 +89,8 @@ public: DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); DECLARE_MACHINE_RESET(s3); DECLARE_MACHINE_RESET(s3a); + void s3a(machine_config &config); + void s3(machine_config &config); private: uint8_t m_t_c; uint8_t m_sound_data; @@ -424,7 +426,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( s3_state::irq ) m_t_c++; } -static MACHINE_CONFIG_START( s3 ) +MACHINE_CONFIG_START(s3_state::s3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 3580000) MCFG_CPU_PROGRAM_MAP(s3_main_map) @@ -476,7 +478,7 @@ static MACHINE_CONFIG_START( s3 ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( s3a, s3 ) +MACHINE_CONFIG_DERIVED(s3_state::s3a, s3) /* Add the soundcard */ MCFG_CPU_ADD("audiocpu", M6802, 3580000) MCFG_CPU_PROGRAM_MAP(s3_audio_map) diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp index 95d34752989..a1eeadde28a 100644 --- a/src/mame/drivers/s4.cpp +++ b/src/mame/drivers/s4.cpp @@ -83,6 +83,8 @@ public: DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); DECLARE_MACHINE_RESET(s4); DECLARE_MACHINE_RESET(s4a); + void s4(machine_config &config); + void s4a(machine_config &config); private: uint8_t m_t_c; uint8_t m_sound_data; @@ -418,7 +420,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( s4_state::irq ) m_t_c++; } -static MACHINE_CONFIG_START( s4 ) +MACHINE_CONFIG_START(s4_state::s4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 3580000) MCFG_CPU_PROGRAM_MAP(s4_main_map) @@ -470,7 +472,7 @@ static MACHINE_CONFIG_START( s4 ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( s4a, s4 ) +MACHINE_CONFIG_DERIVED(s4_state::s4a, s4) /* Add the soundcard */ MCFG_CPU_ADD("audiocpu", M6808, 3580000) MCFG_CPU_PROGRAM_MAP(s4_audio_map) diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp index c9f170625b3..cf6ec513d63 100644 --- a/src/mame/drivers/s6.cpp +++ b/src/mame/drivers/s6.cpp @@ -97,6 +97,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); DECLARE_MACHINE_RESET(s6); DECLARE_DRIVER_INIT(s6); + void s6(machine_config &config); private: uint8_t m_sound_data; uint8_t m_strobe; @@ -396,7 +397,7 @@ DRIVER_INIT_MEMBER( s6_state, s6 ) m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1); } -static MACHINE_CONFIG_START( s6 ) +MACHINE_CONFIG_START(s6_state::s6) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6808, 3580000) // 6802 or 6808 could be used here MCFG_CPU_PROGRAM_MAP(s6_main_map) diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp index 6e055c6b28e..652853dba28 100644 --- a/src/mame/drivers/s6a.cpp +++ b/src/mame/drivers/s6a.cpp @@ -90,6 +90,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); DECLARE_MACHINE_RESET(s6a); DECLARE_DRIVER_INIT(s6a); + void s6a(machine_config &config); private: uint8_t m_sound_data; uint8_t m_strobe; @@ -379,7 +380,7 @@ DRIVER_INIT_MEMBER( s6a_state, s6a ) m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1); } -static MACHINE_CONFIG_START( s6a ) +MACHINE_CONFIG_START(s6a_state::s6a) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6808, 3580000) MCFG_CPU_PROGRAM_MAP(s6a_main_map) diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp index 5bef3f1258e..745e26c6c94 100644 --- a/src/mame/drivers/s7.cpp +++ b/src/mame/drivers/s7.cpp @@ -116,6 +116,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(diag_coin); DECLARE_MACHINE_RESET(s7); DECLARE_DRIVER_INIT(s7); + void s7(machine_config &config); private: uint8_t m_sound_data; uint8_t m_strobe; @@ -422,7 +423,7 @@ DRIVER_INIT_MEMBER( s7_state, s7 ) m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1); } -static MACHINE_CONFIG_START( s7 ) +MACHINE_CONFIG_START(s7_state::s7) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6808, 3580000) MCFG_CPU_PROGRAM_MAP(s7_main_map) diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp index 5d664d0a067..68f8d697959 100644 --- a/src/mame/drivers/s8.cpp +++ b/src/mame/drivers/s8.cpp @@ -91,6 +91,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); DECLARE_MACHINE_RESET(s8); DECLARE_DRIVER_INIT(s8); + void s8(machine_config &config); private: uint8_t m_sound_data; uint8_t m_strobe; @@ -304,7 +305,7 @@ DRIVER_INIT_MEMBER( s8_state, s8 ) m_irq_timer->adjust(attotime::from_ticks(980,1e6),1); } -static MACHINE_CONFIG_START( s8 ) +MACHINE_CONFIG_START(s8_state::s8) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(s8_main_map) diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp index 22bd0234379..957fa70d69e 100644 --- a/src/mame/drivers/s8a.cpp +++ b/src/mame/drivers/s8a.cpp @@ -67,6 +67,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); DECLARE_MACHINE_RESET(s8a); DECLARE_DRIVER_INIT(s8a); + void s8a(machine_config &config); private: uint8_t m_sound_data; uint8_t m_strobe; @@ -276,7 +277,7 @@ DRIVER_INIT_MEMBER( s8a_state, s8a ) m_irq_timer->adjust(attotime::from_ticks(980,1e6),1); } -static MACHINE_CONFIG_START( s8a ) +MACHINE_CONFIG_START(s8a_state::s8a) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(s8a_main_map) diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp index 946cc3604be..5931509a22c 100644 --- a/src/mame/drivers/s9.cpp +++ b/src/mame/drivers/s9.cpp @@ -78,6 +78,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); DECLARE_MACHINE_RESET(s9); DECLARE_DRIVER_INIT(s9); + void s9(machine_config &config); private: uint8_t m_sound_data; uint8_t m_strobe; @@ -310,7 +311,7 @@ DRIVER_INIT_MEMBER( s9_state, s9 ) m_irq_timer->adjust(attotime::from_ticks(980,1e6),1); } -static MACHINE_CONFIG_START( s9 ) +MACHINE_CONFIG_START(s9_state::s9) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(s9_main_map) diff --git a/src/mame/drivers/sacstate.cpp b/src/mame/drivers/sacstate.cpp index 33db4bbf8f8..0586271a2e4 100644 --- a/src/mame/drivers/sacstate.cpp +++ b/src/mame/drivers/sacstate.cpp @@ -53,6 +53,7 @@ public: DECLARE_READ8_MEMBER(port04_r); DECLARE_WRITE8_MEMBER(port08_w); void kbd_put(u8 data); + void sacstate(machine_config &config); private: uint8_t m_term_data; uint8_t m_val; @@ -127,7 +128,7 @@ void sacstate_state::machine_reset() m_val = ioport("CONFIG")->read(); } -static MACHINE_CONFIG_START( sacstate ) +MACHINE_CONFIG_START(sacstate_state::sacstate) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8008, 800000) MCFG_CPU_PROGRAM_MAP(sacstate_mem) diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp index 6b0324440b1..7268db8d4e8 100644 --- a/src/mame/drivers/safarir.cpp +++ b/src/mame/drivers/safarir.cpp @@ -91,6 +91,8 @@ public: virtual void video_start() override; DECLARE_PALETTE_INIT(safarir); uint32_t screen_update_safarir(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void safarir(machine_config &config); + void safarir_audio(machine_config &config); }; @@ -300,7 +302,7 @@ static const char *const safarir_sample_names[] = }; -static MACHINE_CONFIG_START( safarir_audio ) +MACHINE_CONFIG_START(safarir_state::safarir_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(6) @@ -399,7 +401,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( safarir ) +MACHINE_CONFIG_START(safarir_state::safarir) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080A, XTAL_18MHz/12) /* 1.5 MHz ? */ diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp index 9b107799ccc..cc6be2193c5 100644 --- a/src/mame/drivers/sage2.cpp +++ b/src/mame/drivers/sage2.cpp @@ -407,7 +407,7 @@ READ16_MEMBER(sage2_state::rom_r) // MACHINE_CONFIG( sage2 ) //------------------------------------------------- -static MACHINE_CONFIG_START( sage2 ) +MACHINE_CONFIG_START(sage2_state::sage2) // basic machine hardware MCFG_CPU_ADD(M68000_TAG, M68000, XTAL_16MHz/2) MCFG_CPU_PROGRAM_MAP(sage2_mem) diff --git a/src/mame/drivers/sam.cpp b/src/mame/drivers/sam.cpp index be023855e72..c6510d8cb6f 100644 --- a/src/mame/drivers/sam.cpp +++ b/src/mame/drivers/sam.cpp @@ -10,6 +10,7 @@ public: sam_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } + void sam(machine_config &config); }; static ADDRESS_MAP_START( sam_map, AS_PROGRAM, 32, sam_state) @@ -20,7 +21,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( sam ) INPUT_PORTS_END -static MACHINE_CONFIG_START( sam ) +MACHINE_CONFIG_START(sam_state::sam) MCFG_CPU_ADD("maincpu", ARM7, XTAL_40MHz) // AT91R40008 MCFG_CPU_PROGRAM_MAP(sam_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp index 877a2db7912..ea4aba7f7f6 100644 --- a/src/mame/drivers/samcoupe.cpp +++ b/src/mame/drivers/samcoupe.cpp @@ -517,7 +517,7 @@ static SLOT_INTERFACE_START( samcoupe_floppies ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( samcoupe ) +MACHINE_CONFIG_START(samcoupe_state::samcoupe) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, SAMCOUPE_XTAL_X1 / 4) /* 6 MHz */ MCFG_CPU_PROGRAM_MAP(samcoupe_mem) diff --git a/src/mame/drivers/sandscrp.cpp b/src/mame/drivers/sandscrp.cpp index dda0cfc559b..2d04555db46 100644 --- a/src/mame/drivers/sandscrp.cpp +++ b/src/mame/drivers/sandscrp.cpp @@ -132,6 +132,7 @@ public: INTERRUPT_GEN_MEMBER(interrupt); void update_irq_state(); + void sandscrp(machine_config &config); }; @@ -470,7 +471,7 @@ GFXDECODE_END ***************************************************************************/ -static MACHINE_CONFIG_START( sandscrp ) +MACHINE_CONFIG_START(sandscrp_state::sandscrp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,12000000) /* TMP68HC000N-12 */ diff --git a/src/mame/drivers/sangho.cpp b/src/mame/drivers/sangho.cpp index afb334f4102..840d8e198e4 100644 --- a/src/mame/drivers/sangho.cpp +++ b/src/mame/drivers/sangho.cpp @@ -100,6 +100,8 @@ public: void sexyboom_map_bank(int bank); DECLARE_READ8_MEMBER(sec_slot_r); DECLARE_WRITE8_MEMBER(sec_slot_w); + void pzlestar(machine_config &config); + void sexyboom(machine_config &config); }; /* @@ -452,7 +454,7 @@ MACHINE_RESET_MEMBER(sangho_state,sexyboom) } -static MACHINE_CONFIG_START( pzlestar ) +MACHINE_CONFIG_START(sangho_state::pzlestar) MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) // ? MCFG_CPU_PROGRAM_MAP(sangho_map) @@ -471,7 +473,7 @@ static MACHINE_CONFIG_START( pzlestar ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sexyboom ) +MACHINE_CONFIG_START(sangho_state::sexyboom) MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) MCFG_CPU_PROGRAM_MAP(sangho_map) diff --git a/src/mame/drivers/sanremmg.cpp b/src/mame/drivers/sanremmg.cpp index 20b3ba00358..31c000f7b68 100644 --- a/src/mame/drivers/sanremmg.cpp +++ b/src/mame/drivers/sanremmg.cpp @@ -26,6 +26,7 @@ public: virtual void video_start() override; uint32_t screen_update_sanremmg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void sanremmg(machine_config &config); }; @@ -50,7 +51,7 @@ static INPUT_PORTS_START( sanremmg ) INPUT_PORTS_END -static MACHINE_CONFIG_START( sanremmg ) +MACHINE_CONFIG_START(sanremmg_state::sanremmg) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM7, 50000000) // ??? doesn't seem to be ARM, but what is it? diff --git a/src/mame/drivers/sanremo.cpp b/src/mame/drivers/sanremo.cpp index d013c9f6977..c7dd0ccdf3b 100644 --- a/src/mame/drivers/sanremo.cpp +++ b/src/mame/drivers/sanremo.cpp @@ -131,6 +131,7 @@ public: uint32_t screen_update_sanremo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void sanremo(machine_config &config); }; @@ -342,7 +343,7 @@ GFXDECODE_END * Machine Drivers * *********************************************/ -static MACHINE_CONFIG_START( sanremo ) +MACHINE_CONFIG_START(sanremo_state::sanremo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) diff --git a/src/mame/drivers/sansa_fuze.cpp b/src/mame/drivers/sansa_fuze.cpp index c44d79c565c..22cacc36725 100644 --- a/src/mame/drivers/sansa_fuze.cpp +++ b/src/mame/drivers/sansa_fuze.cpp @@ -22,6 +22,7 @@ public: { } required_device m_maincpu; + void sansa_fuze(machine_config &config); }; @@ -38,7 +39,7 @@ static INPUT_PORTS_START( sansa_fuze ) INPUT_PORTS_END -static MACHINE_CONFIG_START( sansa_fuze ) +MACHINE_CONFIG_START(sansa_fuze_state::sansa_fuze) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM7, 50000000) // arm based, speed unknown diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp index 7111f3ce420..75c825f4aae 100644 --- a/src/mame/drivers/sapi1.cpp +++ b/src/mame/drivers/sapi1.cpp @@ -84,6 +84,11 @@ public: MC6845_UPDATE_ROW(crtc_update_row); uint32_t screen_update_sapi1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_sapi3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void sapi3(machine_config &config); + void sapi1(machine_config &config); + void sapi2(machine_config &config); + void sapi3a(machine_config &config); + void sapi3b(machine_config &config); private: uint8_t m_term_data; uint8_t m_keyboard_mask; @@ -609,7 +614,7 @@ DRIVER_INIT_MEMBER( sapi1_state, sapizps3b ) /* Machine driver */ -static MACHINE_CONFIG_START( sapi1 ) +MACHINE_CONFIG_START(sapi1_state::sapi1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080A, XTAL_18MHz / 9) // Tesla MHB8080A + MHB8224 + MHB8228 MCFG_CPU_PROGRAM_MAP(sapi1_mem) @@ -631,7 +636,7 @@ static MACHINE_CONFIG_START( sapi1 ) MCFG_RAM_DEFAULT_SIZE("64K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sapi2, sapi1 ) +MACHINE_CONFIG_DERIVED(sapi1_state::sapi2, sapi1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sapi2_mem) @@ -639,7 +644,7 @@ static MACHINE_CONFIG_DERIVED( sapi2, sapi1 ) MCFG_GENERIC_KEYBOARD_CB(PUT(sapi1_state, kbd_put)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sapi3, sapi2 ) +MACHINE_CONFIG_DERIVED(sapi1_state::sapi3, sapi2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sapi3_mem) @@ -651,7 +656,7 @@ static MACHINE_CONFIG_DERIVED( sapi3, sapi2 ) MCFG_SCREEN_UPDATE_DRIVER(sapi1_state, screen_update_sapi3) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sapi3b, sapi3 ) +MACHINE_CONFIG_DERIVED(sapi1_state::sapi3b, sapi3) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sapi3b_mem) @@ -676,7 +681,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( sapi3a ) +MACHINE_CONFIG_START(sapi1_state::sapi3a) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080A, XTAL_18MHz / 9) // Tesla MHB8080A + MHB8224 + MHB8228 MCFG_CPU_PROGRAM_MAP(sapi3a_mem) diff --git a/src/mame/drivers/sartorius.cpp b/src/mame/drivers/sartorius.cpp index 97f881a3337..5a51008117a 100644 --- a/src/mame/drivers/sartorius.cpp +++ b/src/mame/drivers/sartorius.cpp @@ -36,6 +36,8 @@ public: driver_device(mconfig, type, tag) { } + + void sart3733(machine_config &config); }; @@ -52,7 +54,7 @@ ADDRESS_MAP_START(sart3733_status, i4040_cpu_device::AS_RAM_STATUS, 8, sart3733_ ADDRESS_MAP_END -MACHINE_CONFIG_START(sart3733) +MACHINE_CONFIG_START(sart3733_state::sart3733) MCFG_CPU_ADD("maincpu", I4040, 750'000) // clock speed is a complete guess - can't see crystal or multi-phase clock generator MCFG_I4040_ROM_MAP(sart3733_rom) MCFG_I4040_RAM_MEMORY_MAP(sart3733_memory) diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp index 5b5537ab5d0..3e28d93f287 100644 --- a/src/mame/drivers/saturn.cpp +++ b/src/mame/drivers/saturn.cpp @@ -493,6 +493,10 @@ public: required_device m_ctrl1; required_device m_ctrl2; + void saturn(machine_config &config); + void saturnjp(machine_config &config); + void saturneu(machine_config &config); + void saturnus(machine_config &config); }; @@ -778,7 +782,7 @@ uint8_t sat_console_state::smpc_direct_mode(uint16_t in_value,bool which) return 0x80 | 0x10 | ((in_value >> shift_bit[hshake]) & 0xf); } -static MACHINE_CONFIG_START( saturn ) +MACHINE_CONFIG_START(sat_console_state::saturn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz @@ -860,7 +864,7 @@ static SLOT_INTERFACE_START(saturn_cart) SLOT_INTERFACE_END -MACHINE_CONFIG_DERIVED( saturnus, saturn ) +MACHINE_CONFIG_DERIVED(sat_console_state::saturnus, saturn) MCFG_CDROM_ADD( "cdrom" ) MCFG_CDROM_INTERFACE("sat_cdrom") MCFG_DEVICE_ADD("saturn_cdb", SATURN_CDB, 16000000) @@ -876,7 +880,7 @@ MACHINE_CONFIG_DERIVED( saturnus, saturn ) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( saturneu, saturn ) +MACHINE_CONFIG_DERIVED(sat_console_state::saturneu, saturn) MCFG_CDROM_ADD( "cdrom" ) MCFG_CDROM_INTERFACE("sat_cdrom") MCFG_DEVICE_ADD("saturn_cdb", SATURN_CDB, 16000000) @@ -891,7 +895,7 @@ MACHINE_CONFIG_DERIVED( saturneu, saturn ) smpc_hle_device::static_set_region_code(*device, 12); MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( saturnjp, saturn ) +MACHINE_CONFIG_DERIVED(sat_console_state::saturnjp, saturn) MCFG_CDROM_ADD( "cdrom" ) MCFG_CDROM_INTERFACE("sat_cdrom") MCFG_DEVICE_ADD("saturn_cdb", SATURN_CDB, 16000000) diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp index e9dc8607e1c..ea2affedadc 100644 --- a/src/mame/drivers/sauro.cpp +++ b/src/mame/drivers/sauro.cpp @@ -442,7 +442,7 @@ static GFXDECODE_START( trckydoc ) GFXDECODE_END -static MACHINE_CONFIG_START( tecfri ) +MACHINE_CONFIG_START(sauro_state::tecfri) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz/4) /* verified on pcb */ @@ -473,7 +473,7 @@ static MACHINE_CONFIG_START( tecfri ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( trckydoc, tecfri ) +MACHINE_CONFIG_DERIVED(sauro_state::trckydoc, tecfri) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(trckydoc_map) @@ -491,7 +491,7 @@ static MACHINE_CONFIG_DERIVED( trckydoc, tecfri ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sauro, tecfri ) +MACHINE_CONFIG_DERIVED(sauro_state::sauro, tecfri) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sauro_map) @@ -522,7 +522,7 @@ static MACHINE_CONFIG_DERIVED( sauro, tecfri ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( saurob, sauro ) +MACHINE_CONFIG_DERIVED(sauro_state::saurob, sauro) MCFG_CPU_MODIFY("audiocpu") MCFG_CPU_PROGRAM_MAP(saurob_sound_map) diff --git a/src/mame/drivers/savia84.cpp b/src/mame/drivers/savia84.cpp index 35c0b53b071..fc9840369fa 100644 --- a/src/mame/drivers/savia84.cpp +++ b/src/mame/drivers/savia84.cpp @@ -48,6 +48,7 @@ public: DECLARE_WRITE8_MEMBER(savia84_8255_portb_w); DECLARE_WRITE8_MEMBER(savia84_8255_portc_w); + void savia84(machine_config &config); private: uint8_t m_kbd; uint8_t m_segment; @@ -170,7 +171,7 @@ READ8_MEMBER( savia84_state::savia84_8255_portc_r ) // IN FA - read keyboard return 0xff; } -static MACHINE_CONFIG_START( savia84 ) +MACHINE_CONFIG_START(savia84_state::savia84) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz / 2) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/savquest.cpp b/src/mame/drivers/savquest.cpp index 9831faa3648..de0730058f9 100644 --- a/src/mame/drivers/savquest.cpp +++ b/src/mame/drivers/savquest.cpp @@ -113,6 +113,7 @@ public: DECLARE_READ8_MEMBER(smram_r); DECLARE_WRITE8_MEMBER(smram_w); + void savquest(machine_config &config); protected: @@ -802,7 +803,7 @@ SLOT_INTERFACE_START( savquest_isa16_cards ) SLOT_INTERFACE("sb16", ISA16_SOUND_BLASTER_16) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( savquest ) +MACHINE_CONFIG_START(savquest_state::savquest) MCFG_CPU_ADD("maincpu", PENTIUM2, 450000000) // actually Pentium II 450 MCFG_CPU_PROGRAM_MAP(savquest_map) MCFG_CPU_IO_MAP(savquest_io) diff --git a/src/mame/drivers/sbasketb.cpp b/src/mame/drivers/sbasketb.cpp index 86194b70412..340f60073b4 100644 --- a/src/mame/drivers/sbasketb.cpp +++ b/src/mame/drivers/sbasketb.cpp @@ -192,7 +192,7 @@ INTERRUPT_GEN_MEMBER(sbasketb_state::vblank_irq) device.execute().set_input_line(0, HOLD_LINE); } -static MACHINE_CONFIG_START( sbasketb ) +MACHINE_CONFIG_START(sbasketb_state::sbasketb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI1, 1400000) /* 1.400 MHz ??? */ @@ -245,7 +245,7 @@ static MACHINE_CONFIG_START( sbasketb ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(sbasketbu, sbasketb) +MACHINE_CONFIG_DERIVED(sbasketb_state::sbasketbu, sbasketb) MCFG_DEVICE_REMOVE("maincpu") MCFG_CPU_ADD("maincpu", MC6809E, 1400000) /* 6809E at 1.400 MHz ??? */ MCFG_CPU_PROGRAM_MAP(sbasketb_map) diff --git a/src/mame/drivers/sbc6510.cpp b/src/mame/drivers/sbc6510.cpp index 8e1ffed705d..be115f2187e 100644 --- a/src/mame/drivers/sbc6510.cpp +++ b/src/mame/drivers/sbc6510.cpp @@ -77,6 +77,7 @@ public: DECLARE_WRITE8_MEMBER(key_w); DECLARE_READ8_MEMBER(key_r); + void sbc6510(machine_config &config); private: uint8_t m_key_row; uint8_t m_2; @@ -264,7 +265,7 @@ static GFXDECODE_START( sbc6510 ) GFXDECODE_END -static MACHINE_CONFIG_START( sbc6510 ) +MACHINE_CONFIG_START(sbc6510_state::sbc6510) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6510, XTAL_1MHz) MCFG_CPU_PROGRAM_MAP(sbc6510_mem) diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp index fe79f805a27..5c31883e29b 100644 --- a/src/mame/drivers/sbowling.cpp +++ b/src/mame/drivers/sbowling.cpp @@ -87,6 +87,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void postload(); + void sbowling(machine_config &config); }; TILE_GET_INFO_MEMBER(sbowling_state::get_tile_info) @@ -402,7 +403,7 @@ PALETTE_INIT_MEMBER(sbowling_state, sbowling) } } -static MACHINE_CONFIG_START( sbowling ) +MACHINE_CONFIG_START(sbowling_state::sbowling) MCFG_CPU_ADD("maincpu", I8080, XTAL_19_968MHz/10) /* ? */ MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_IO_MAP(port_map) diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp index 75c4af96426..86e72aa52ca 100644 --- a/src/mame/drivers/sbrain.cpp +++ b/src/mame/drivers/sbrain.cpp @@ -90,6 +90,7 @@ public: u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(kbd_scan); + void sbrain(machine_config &config); private: bool m_busak; u8 m_keydown; @@ -526,7 +527,7 @@ u32 sbrain_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, con return 0; } -static MACHINE_CONFIG_START( sbrain ) +MACHINE_CONFIG_START(sbrain_state::sbrain) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(sbrain_mem) diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp index 9349f0f891f..4e1f52ae1ca 100644 --- a/src/mame/drivers/sbrkout.cpp +++ b/src/mame/drivers/sbrkout.cpp @@ -92,6 +92,8 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void sbrkoutct(machine_config &config); + void sbrkout(machine_config &config); }; @@ -578,7 +580,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( sbrkout ) +MACHINE_CONFIG_START(sbrkout_state::sbrkout) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,MAIN_CLOCK/16) /* 375 KHz? Should be 750KHz? */ @@ -613,7 +615,7 @@ static MACHINE_CONFIG_START( sbrkout ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(sbrkoutct, sbrkout) +MACHINE_CONFIG_DERIVED(sbrkout_state::sbrkoutct, sbrkout) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sbrkoutct_main_map) diff --git a/src/mame/drivers/sbugger.cpp b/src/mame/drivers/sbugger.cpp index e164e7b34d5..dd4b82c23c4 100644 --- a/src/mame/drivers/sbugger.cpp +++ b/src/mame/drivers/sbugger.cpp @@ -212,7 +212,7 @@ INPUT_PORTS_END /* machine driver */ -static MACHINE_CONFIG_START( sbugger ) +MACHINE_CONFIG_START(sbugger_state::sbugger) MCFG_CPU_ADD("maincpu", I8085A, 6000000) /* 3.00 MHz??? */ MCFG_CPU_PROGRAM_MAP(sbugger_map) diff --git a/src/mame/drivers/sc1.cpp b/src/mame/drivers/sc1.cpp index 2e92685917f..8a63f6ba4bc 100644 --- a/src/mame/drivers/sc1.cpp +++ b/src/mame/drivers/sc1.cpp @@ -62,6 +62,7 @@ public: DECLARE_READ8_MEMBER( pio_port_b_r ); uint8_t m_matrix; + void sc1(machine_config &config); }; /*************************************************************************** @@ -170,7 +171,7 @@ static INPUT_PORTS_START( sc1 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( sc1 ) +MACHINE_CONFIG_START(sc1_state::sc1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(sc1_mem) diff --git a/src/mame/drivers/sc2.cpp b/src/mame/drivers/sc2.cpp index 0bbff5767da..32bded96d5d 100644 --- a/src/mame/drivers/sc2.cpp +++ b/src/mame/drivers/sc2.cpp @@ -43,6 +43,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; required_device m_maincpu; + void sc2(machine_config &config); }; READ8_MEMBER( sc2_state::sc2_beep ) @@ -197,7 +198,7 @@ WRITE8_MEMBER( sc2_state::pio_port_b_w ) m_kp_matrix = data; } -static MACHINE_CONFIG_START( sc2 ) +MACHINE_CONFIG_START(sc2_state::sc2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(sc2_mem) diff --git a/src/mame/drivers/scm_500.cpp b/src/mame/drivers/scm_500.cpp index c7f9736bf48..4864c6c9591 100644 --- a/src/mame/drivers/scm_500.cpp +++ b/src/mame/drivers/scm_500.cpp @@ -22,6 +22,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void scm_500(machine_config &config); // required_device m_maincpu; }; @@ -37,7 +38,7 @@ void scm_500_state::machine_reset() { } -static MACHINE_CONFIG_START( scm_500 ) +MACHINE_CONFIG_START(scm_500_state::scm_500) // unknown CPU diff --git a/src/mame/drivers/scobra.cpp b/src/mame/drivers/scobra.cpp index c251964fc29..72b320b84cf 100644 --- a/src/mame/drivers/scobra.cpp +++ b/src/mame/drivers/scobra.cpp @@ -64,6 +64,20 @@ public: DECLARE_WRITE8_MEMBER(hustler_ppi8255_1_w); DECLARE_CUSTOM_INPUT_MEMBER(stratgyx_coinage_r); + void mimonkey(machine_config &config); + void stratgyx(machine_config &config); + void type1(machine_config &config); + void type2(machine_config &config); + void rescueb(machine_config &config); + void minefldfe(machine_config &config); + void hustlerb4(machine_config &config); + void minefld(machine_config &config); + void hustler(machine_config &config); + void rescue(machine_config &config); + void darkplnt(machine_config &config); + void tazmani3(machine_config &config); + void hustlerb(machine_config &config); + void rescuefe(machine_config &config); private: optional_shared_ptr m_soundram; }; @@ -826,7 +840,7 @@ static INPUT_PORTS_START( mimonsco ) INPUT_PORTS_END -static MACHINE_CONFIG_START( type1 ) +MACHINE_CONFIG_START(scobra_state::type1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ @@ -894,7 +908,7 @@ MACHINE_CONFIG_END /* Rescue, Minefield and Strategy X have extra colors, and custom video initialise */ /* routines to set up the graduated color backgound they use */ -static MACHINE_CONFIG_DERIVED( rescue, type1 ) +MACHINE_CONFIG_DERIVED(scobra_state::rescue, type1) /* basic machine hardware */ @@ -907,19 +921,19 @@ static MACHINE_CONFIG_DERIVED( rescue, type1 ) MCFG_VIDEO_START_OVERRIDE(scobra_state,rescue) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rescuefe, rescue ) +MACHINE_CONFIG_DERIVED(scobra_state::rescuefe, rescue) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(rescuefe_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rescueb, rescue ) +MACHINE_CONFIG_DERIVED(scobra_state::rescueb, rescue) MCFG_DEVICE_MODIFY("ppi8255_1") MCFG_I8255_IN_PORTC_CB(READ8(scobra_state, rescueb_a002_r)) // protection? must return 0xfc or the game jumps to 0x00 MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( minefld, type1 ) +MACHINE_CONFIG_DERIVED(scobra_state::minefld, type1) /* basic machine hardware */ @@ -932,13 +946,13 @@ static MACHINE_CONFIG_DERIVED( minefld, type1 ) MCFG_VIDEO_START_OVERRIDE(scobra_state,minefld) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( minefldfe, minefld ) +MACHINE_CONFIG_DERIVED(scobra_state::minefldfe, minefld) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(minefldfe_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mimonkey, type1 ) +MACHINE_CONFIG_DERIVED(scobra_state::mimonkey, type1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -949,14 +963,14 @@ static MACHINE_CONFIG_DERIVED( mimonkey, type1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( type2, type1 ) +MACHINE_CONFIG_DERIVED(scobra_state::type2, type1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(type2_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tazmani3, type2 ) +MACHINE_CONFIG_DERIVED(scobra_state::tazmani3, type2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -964,7 +978,7 @@ static MACHINE_CONFIG_DERIVED( tazmani3, type2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( stratgyx, type2 ) +MACHINE_CONFIG_DERIVED(scobra_state::stratgyx, type2) /* basic machine hardware */ @@ -983,7 +997,7 @@ static MACHINE_CONFIG_DERIVED( stratgyx, type2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( darkplnt, type2 ) +MACHINE_CONFIG_DERIVED(scobra_state::darkplnt, type2) /* basic machine hardware */ @@ -996,7 +1010,7 @@ static MACHINE_CONFIG_DERIVED( darkplnt, type2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hustler ) +MACHINE_CONFIG_START(scobra_state::hustler) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ @@ -1055,7 +1069,7 @@ static MACHINE_CONFIG_START( hustler ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hustlerb, hustler ) +MACHINE_CONFIG_DERIVED(scobra_state::hustlerb, hustler) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1066,7 +1080,7 @@ static MACHINE_CONFIG_DERIVED( hustlerb, hustler ) MCFG_CPU_IO_MAP(hustlerb_sound_io_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hustlerb4, hustler ) +MACHINE_CONFIG_DERIVED(scobra_state::hustlerb4, hustler) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/scopus.cpp b/src/mame/drivers/scopus.cpp index 82a07828992..6263bf206ef 100644 --- a/src/mame/drivers/scopus.cpp +++ b/src/mame/drivers/scopus.cpp @@ -45,6 +45,7 @@ public: DECLARE_READ8_MEMBER(memory_read_byte); I8275_DRAW_CHARACTER_MEMBER(crtc_display_pixels); + void sagitta180(machine_config &config); private: /* devices */ required_device m_palette; @@ -165,7 +166,7 @@ READ8_MEMBER(sagitta180_state::memory_read_byte) return prog_space.read_byte(offset); } -static MACHINE_CONFIG_START( sagitta180 ) +MACHINE_CONFIG_START(sagitta180_state::sagitta180) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, XTAL_10MHz) /* guessed ! */ diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp index 4b9506bc092..117fb792ded 100644 --- a/src/mame/drivers/scorpion.cpp +++ b/src/mame/drivers/scorpion.cpp @@ -33,6 +33,9 @@ public: DECLARE_MACHINE_START(scorpion); DECLARE_MACHINE_RESET(scorpion); TIMER_DEVICE_CALLBACK_MEMBER(nmi_check_callback); + void scorpion(machine_config &config); + void profi(machine_config &config); + void quorum(machine_config &config); protected: required_memory_bank m_bank1; required_memory_bank m_bank2; @@ -280,7 +283,7 @@ static GFXDECODE_START( quorum ) GFXDECODE_ENTRY( "maincpu", 0x1fb00, quorum_charlayout, 0, 8 ) GFXDECODE_END -static MACHINE_CONFIG_DERIVED( scorpion, spectrum_128 ) +MACHINE_CONFIG_DERIVED(scorpion_state::scorpion, spectrum_128) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(scorpion_mem) MCFG_CPU_IO_MAP(scorpion_io) @@ -301,11 +304,11 @@ static MACHINE_CONFIG_DERIVED( scorpion, spectrum_128 ) MCFG_DEVICE_REMOVE("exp") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( profi, scorpion ) +MACHINE_CONFIG_DERIVED(scorpion_state::profi, scorpion) MCFG_GFXDECODE_MODIFY("gfxdecode", profi) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quorum, scorpion ) +MACHINE_CONFIG_DERIVED(scorpion_state::quorum, scorpion) MCFG_GFXDECODE_MODIFY("gfxdecode", quorum) MACHINE_CONFIG_END diff --git a/src/mame/drivers/scotrsht.cpp b/src/mame/drivers/scotrsht.cpp index 27da006843f..e8c457383ba 100644 --- a/src/mame/drivers/scotrsht.cpp +++ b/src/mame/drivers/scotrsht.cpp @@ -184,7 +184,7 @@ static GFXDECODE_START( scotrsht ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 16*16*8, 16*8 ) /* sprites */ GFXDECODE_END -static MACHINE_CONFIG_START( scotrsht ) +MACHINE_CONFIG_START(scotrsht_state::scotrsht) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, 18432000/6) /* 3.072 MHz */ diff --git a/src/mame/drivers/scramble.cpp b/src/mame/drivers/scramble.cpp index 326920f2969..abf46ffe332 100644 --- a/src/mame/drivers/scramble.cpp +++ b/src/mame/drivers/scramble.cpp @@ -1284,7 +1284,7 @@ GFXDECODE_END /**************************************************************************/ -static MACHINE_CONFIG_START( scramble ) +MACHINE_CONFIG_START(scramble_state::scramble) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ @@ -1348,7 +1348,7 @@ static MACHINE_CONFIG_START( scramble ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mars, scramble ) +MACHINE_CONFIG_DERIVED(scramble_state::mars, scramble) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1366,7 +1366,7 @@ static MACHINE_CONFIG_DERIVED( mars, scramble ) MCFG_PALETTE_INIT_OWNER(scramble_state,galaxold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( devilfsh, scramble ) +MACHINE_CONFIG_DERIVED(scramble_state::devilfsh, scramble) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1379,7 +1379,7 @@ static MACHINE_CONFIG_DERIVED( devilfsh, scramble ) MCFG_PALETTE_INIT_OWNER(scramble_state,galaxold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( newsin7, scramble ) +MACHINE_CONFIG_DERIVED(scramble_state::newsin7, scramble) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1394,7 +1394,7 @@ static MACHINE_CONFIG_DERIVED( newsin7, scramble ) MCFG_VIDEO_START_OVERRIDE(scramble_state,newsin7) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mrkougb, scramble ) +MACHINE_CONFIG_DERIVED(scramble_state::mrkougb, scramble) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1411,13 +1411,13 @@ static MACHINE_CONFIG_DERIVED( mrkougb, scramble ) MCFG_PALETTE_INIT_OWNER(scramble_state,galaxold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mrkougar, mrkougb ) +MACHINE_CONFIG_DERIVED(scramble_state::mrkougar, mrkougb) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", mrkougar) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ckongs, scramble ) +MACHINE_CONFIG_DERIVED(scramble_state::ckongs, scramble) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1430,7 +1430,7 @@ static MACHINE_CONFIG_DERIVED( ckongs, scramble ) MCFG_VIDEO_START_OVERRIDE(scramble_state,ckongs) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hotshock, scramble ) +MACHINE_CONFIG_DERIVED(scramble_state::hotshock, scramble) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1461,7 +1461,7 @@ static MACHINE_CONFIG_DERIVED( hotshock, scramble ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cavelon, scramble ) +MACHINE_CONFIG_DERIVED(scramble_state::cavelon, scramble) /* basic machine hardware */ @@ -1472,7 +1472,7 @@ static MACHINE_CONFIG_DERIVED( cavelon, scramble ) MCFG_VIDEO_START_OVERRIDE(scramble_state,ckongs) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mimonscr, scramble ) +MACHINE_CONFIG_DERIVED(scramble_state::mimonscr, scramble) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1483,7 +1483,7 @@ static MACHINE_CONFIG_DERIVED( mimonscr, scramble ) MACHINE_CONFIG_END /* Triple Punch and Mariner are different - only one CPU, one 8910 */ -static MACHINE_CONFIG_DERIVED( triplep, scramble ) +MACHINE_CONFIG_DERIVED(scramble_state::triplep, scramble) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1510,7 +1510,7 @@ static MACHINE_CONFIG_DERIVED( triplep, scramble ) MCFG_DEVICE_REMOVE("8910.2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mariner, triplep ) +MACHINE_CONFIG_DERIVED(scramble_state::mariner, triplep) /* basic machine hardware */ @@ -1523,7 +1523,7 @@ static MACHINE_CONFIG_DERIVED( mariner, triplep ) MACHINE_CONFIG_END /* Hunchback replaces the Z80 with a S2650 CPU */ -static MACHINE_CONFIG_DERIVED( hunchbks, scramble ) +MACHINE_CONFIG_DERIVED(scramble_state::hunchbks, scramble) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", S2650, 18432000/6) @@ -1542,7 +1542,7 @@ static MACHINE_CONFIG_DERIVED( hunchbks, scramble ) MCFG_PALETTE_INIT_OWNER(scramble_state,galaxold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hncholms, hunchbks ) +MACHINE_CONFIG_DERIVED(scramble_state::hncholms, hunchbks) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1551,7 +1551,7 @@ static MACHINE_CONFIG_DERIVED( hncholms, hunchbks ) MCFG_VIDEO_START_OVERRIDE(scramble_state,scorpion) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ad2083 ) +MACHINE_CONFIG_START(scramble_state::ad2083) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(ad2083_map) @@ -1593,7 +1593,7 @@ static MACHINE_CONFIG_START( ad2083 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( harem, scramble ) +MACHINE_CONFIG_DERIVED(scramble_state::harem, scramble) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/scregg.cpp b/src/mame/drivers/scregg.cpp index 30e7c0a6275..0ce22f498e0 100644 --- a/src/mame/drivers/scregg.cpp +++ b/src/mame/drivers/scregg.cpp @@ -73,6 +73,8 @@ public: DECLARE_MACHINE_START(scregg); DECLARE_MACHINE_RESET(scregg); TIMER_DEVICE_CALLBACK_MEMBER(scregg_interrupt); + void scregg(machine_config &config); + void dommy(machine_config &config); }; @@ -258,7 +260,7 @@ MACHINE_RESET_MEMBER(scregg_state,scregg) m_btime_tilemap[3] = 0; } -static MACHINE_CONFIG_START( dommy ) +MACHINE_CONFIG_START(scregg_state::dommy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/8) @@ -290,7 +292,7 @@ static MACHINE_CONFIG_START( dommy ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( scregg ) +MACHINE_CONFIG_START(scregg_state::scregg) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/8) diff --git a/src/mame/drivers/scv.cpp b/src/mame/drivers/scv.cpp index 8d48e57dd9f..063470f5fba 100644 --- a/src/mame/drivers/scv.cpp +++ b/src/mame/drivers/scv.cpp @@ -43,6 +43,8 @@ public: DECLARE_PALETTE_INIT(scv); uint32_t screen_update_scv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void scv(machine_config &config); + void scv_pal(machine_config &config); protected: enum { @@ -651,7 +653,7 @@ static SLOT_INTERFACE_START(scv_cart) SLOT_INTERFACE_INTERNAL("rom128k_ram", SCV_ROM128K_RAM4K) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( scv ) +MACHINE_CONFIG_START(scv_state::scv) MCFG_CPU_ADD( "maincpu", UPD7801, XTAL_4MHz ) MCFG_CPU_PROGRAM_MAP( scv_mem ) @@ -683,7 +685,7 @@ static MACHINE_CONFIG_START( scv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( scv_pal, scv ) +MACHINE_CONFIG_DERIVED(scv_state::scv_pal, scv) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_CLOCK( 3780000 ) diff --git a/src/mame/drivers/scyclone.cpp b/src/mame/drivers/scyclone.cpp index 5ee25c58bb1..f7f0bf14cc2 100644 --- a/src/mame/drivers/scyclone.cpp +++ b/src/mame/drivers/scyclone.cpp @@ -88,6 +88,7 @@ public: CUSTOM_INPUT_MEMBER(collision_r); + void scyclone(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -595,7 +596,7 @@ INTERRUPT_GEN_MEMBER(scyclone_state::irq) } -static MACHINE_CONFIG_START( scyclone ) +MACHINE_CONFIG_START(scyclone_state::scyclone) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5000000/2) // MOSTEK Z80-CPU ? MHz (there's also a 9.987MHz XTAL) intermissions seem driven directly by CPU speed for reference diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp index b888a6afc50..4430ee443d0 100644 --- a/src/mame/drivers/sderby.cpp +++ b/src/mame/drivers/sderby.cpp @@ -593,7 +593,7 @@ GFXDECODE_END * Machine Drivers * ****************************/ -static MACHINE_CONFIG_START( sderby ) +MACHINE_CONFIG_START(sderby_state::sderby) MCFG_CPU_ADD("maincpu", M68000, 12000000) MCFG_CPU_PROGRAM_MAP(sderby_map) @@ -618,7 +618,7 @@ static MACHINE_CONFIG_START( sderby ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sderbya ) +MACHINE_CONFIG_START(sderby_state::sderbya) MCFG_CPU_ADD("maincpu", M68000, 12000000) MCFG_CPU_PROGRAM_MAP(sderbya_map) @@ -643,7 +643,7 @@ static MACHINE_CONFIG_START( sderbya ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( luckboom ) +MACHINE_CONFIG_START(sderby_state::luckboom) MCFG_CPU_ADD("maincpu", M68000, 12000000) MCFG_CPU_PROGRAM_MAP(luckboom_map) @@ -668,7 +668,7 @@ static MACHINE_CONFIG_START( luckboom ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( spacewin ) +MACHINE_CONFIG_START(sderby_state::spacewin) MCFG_CPU_ADD("maincpu", M68000, 12000000) MCFG_CPU_PROGRAM_MAP(spacewin_map) @@ -693,7 +693,7 @@ static MACHINE_CONFIG_START( spacewin ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( shinygld) +MACHINE_CONFIG_START(sderby_state::shinygld) MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) // verified MCFG_CPU_PROGRAM_MAP(shinygld_map) @@ -718,7 +718,7 @@ static MACHINE_CONFIG_START( shinygld) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pmroulet ) +MACHINE_CONFIG_START(sderby_state::pmroulet) MCFG_CPU_ADD("maincpu", M68000, 12000000) MCFG_CPU_PROGRAM_MAP(roulette_map) diff --git a/src/mame/drivers/sderby2.cpp b/src/mame/drivers/sderby2.cpp index 07f8a4c4390..81fcb1d0d6e 100644 --- a/src/mame/drivers/sderby2.cpp +++ b/src/mame/drivers/sderby2.cpp @@ -78,6 +78,7 @@ public: uint8_t sub_data; uint8_t main_data; uint8_t host_io_40; + void sderby2(machine_config &config); }; @@ -284,7 +285,7 @@ void sderby2_state::machine_reset() } -static MACHINE_CONFIG_START( sderby2 ) +MACHINE_CONFIG_START(sderby2_state::sderby2) MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) MCFG_CPU_PROGRAM_MAP(main_program_map) MCFG_CPU_IO_MAP(main_io_map) diff --git a/src/mame/drivers/sdk80.cpp b/src/mame/drivers/sdk80.cpp index 08303254f76..fdc474c3414 100644 --- a/src/mame/drivers/sdk80.cpp +++ b/src/mame/drivers/sdk80.cpp @@ -53,6 +53,7 @@ public: DECLARE_WRITE_LINE_MEMBER( usart_clock_tick ); + void sdk80(machine_config &config); private: required_device m_maincpu; required_device m_usart; @@ -115,7 +116,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) // set up terminal to default to DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( sdk80 ) +MACHINE_CONFIG_START(sdk80_state::sdk80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080A, XTAL_18_432MHz/9) MCFG_CPU_PROGRAM_MAP(sdk80_mem) diff --git a/src/mame/drivers/sdk85.cpp b/src/mame/drivers/sdk85.cpp index 9c1f4948bd7..8ea81ab3d12 100644 --- a/src/mame/drivers/sdk85.cpp +++ b/src/mame/drivers/sdk85.cpp @@ -58,6 +58,7 @@ public: DECLARE_WRITE8_MEMBER(digit_w); DECLARE_READ8_MEMBER(kbd_r); + void sdk85(machine_config &config); protected: virtual void machine_reset() override; @@ -141,7 +142,7 @@ READ8_MEMBER( sdk85_state::kbd_r ) return data; } -static MACHINE_CONFIG_START( sdk85 ) +MACHINE_CONFIG_START(sdk85_state::sdk85) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz) MCFG_CPU_PROGRAM_MAP(sdk85_mem) diff --git a/src/mame/drivers/sdk86.cpp b/src/mame/drivers/sdk86.cpp index 510a819db78..dd129214ada 100644 --- a/src/mame/drivers/sdk86.cpp +++ b/src/mame/drivers/sdk86.cpp @@ -51,6 +51,7 @@ public: DECLARE_WRITE8_MEMBER(digit_w); DECLARE_READ8_MEMBER(kbd_r); + void sdk86(machine_config &config); private: uint8_t m_digit; required_device m_maincpu; @@ -136,7 +137,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( sdk86 ) +MACHINE_CONFIG_START(sdk86_state::sdk86) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, XTAL_14_7456MHz/3) /* divided down by i8284 clock generator; jumper selection allows it to be slowed to 2.5MHz, hence changing divider from 3 to 6 */ MCFG_CPU_PROGRAM_MAP(sdk86_mem) diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp index 963d41fbbed..f95c79f6759 100644 --- a/src/mame/drivers/seabattl.cpp +++ b/src/mame/drivers/seabattl.cpp @@ -105,6 +105,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void seabattl(machine_config &config); }; @@ -473,7 +474,7 @@ static GFXDECODE_START( seabattl ) GFXDECODE_ENTRY( "gfx3", 0, tiles8x8_layout, 24, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( seabattl ) +MACHINE_CONFIG_START(seabattl_state::seabattl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 14318180/4/2) diff --git a/src/mame/drivers/sealy.cpp b/src/mame/drivers/sealy.cpp index bb5114bdeec..95a06e2ea11 100644 --- a/src/mame/drivers/sealy.cpp +++ b/src/mame/drivers/sealy.cpp @@ -52,6 +52,7 @@ public: // screen updates DECLARE_PALETTE_INIT(sealy); uint32_t screen_update_sealy(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void sealy(machine_config &config); }; @@ -95,7 +96,7 @@ static GFXDECODE_START( sealy ) GFXDECODE_END -static MACHINE_CONFIG_START( sealy ) +MACHINE_CONFIG_START(sealy_state::sealy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a M16C core ATM */ diff --git a/src/mame/drivers/seattle.cpp b/src/mame/drivers/seattle.cpp index 25d74d2e879..f83776894ce 100644 --- a/src/mame/drivers/seattle.cpp +++ b/src/mame/drivers/seattle.cpp @@ -368,6 +368,26 @@ public: void update_widget_irq(); void init_common(int config); + void seattle_common(machine_config &config); + void phoenixsa(machine_config &config); + void seattle150(machine_config &config); + void seattle150_widget(machine_config &config); + void seattle200(machine_config &config); + void seattle200_widget(machine_config &config); + void flagstaff(machine_config &config); + void wg3dh(machine_config &config); + void sfrush(machine_config &config); + void hyprdriv(machine_config &config); + void carnevil(machine_config &config); + void blitz99(machine_config &config); + void blitz2k(machine_config &config); + void blitz(machine_config &config); + void biofreak(machine_config &config); + void sfrushrkw(machine_config &config); + void calspeed(machine_config &config); + void mace(machine_config &config); + void vaportrx(machine_config &config); + void sfrushrk(machine_config &config); }; @@ -1840,7 +1860,7 @@ INPUT_PORTS_END #define PCI_ID_VIDEO ":pci:08.0" #define PCI_ID_IDE ":pci:09.0" -static MACHINE_CONFIG_START( seattle_common ) +MACHINE_CONFIG_START(seattle_state::seattle_common) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R5000LE, SYSTEM_CLOCK*3) @@ -1882,7 +1902,7 @@ static MACHINE_CONFIG_START( seattle_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( phoenixsa, seattle_common ) +MACHINE_CONFIG_DERIVED(seattle_state::phoenixsa, seattle_common) MCFG_CPU_REPLACE("maincpu", R4700LE, SYSTEM_CLOCK*2) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) @@ -1894,7 +1914,7 @@ static MACHINE_CONFIG_DERIVED( phoenixsa, seattle_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( seattle150, seattle_common ) +MACHINE_CONFIG_DERIVED(seattle_state::seattle150, seattle_common) MCFG_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*3) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) @@ -1902,13 +1922,13 @@ static MACHINE_CONFIG_DERIVED( seattle150, seattle_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( seattle150_widget, seattle150 ) +MACHINE_CONFIG_DERIVED(seattle_state::seattle150_widget, seattle150) MCFG_SMC91C94_ADD("ethernet") MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(seattle_state, ethernet_interrupt)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( seattle200, seattle_common ) +MACHINE_CONFIG_DERIVED(seattle_state::seattle200, seattle_common) MCFG_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) @@ -1916,12 +1936,12 @@ static MACHINE_CONFIG_DERIVED( seattle200, seattle_common ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( seattle200_widget, seattle200 ) +MACHINE_CONFIG_DERIVED(seattle_state::seattle200_widget, seattle200) MCFG_SMC91C94_ADD("ethernet") MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(seattle_state, ethernet_interrupt)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( flagstaff, seattle_common ) +MACHINE_CONFIG_DERIVED(seattle_state::flagstaff, seattle_common) MCFG_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) @@ -1940,7 +1960,7 @@ MACHINE_CONFIG_END // Per game configurations -static MACHINE_CONFIG_DERIVED( wg3dh, phoenixsa ) +MACHINE_CONFIG_DERIVED(seattle_state::wg3dh, phoenixsa) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x3839) @@ -1953,7 +1973,7 @@ static MACHINE_CONFIG_DERIVED( wg3dh, phoenixsa ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mace, seattle150 ) +MACHINE_CONFIG_DERIVED(seattle_state::mace, seattle150) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x3839) @@ -1965,7 +1985,7 @@ static MACHINE_CONFIG_DERIVED( mace, seattle150 ) MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sfrush, flagstaff ) +MACHINE_CONFIG_DERIVED(seattle_state::sfrush, flagstaff) MCFG_DEVICE_ADD("cage", ATARI_CAGE_SEATTLE, 0) MCFG_ATARI_CAGE_SPEEDUP(0x5236) MCFG_ATARI_CAGE_IRQ_CALLBACK(DEVWRITE8("ioasic",midway_ioasic_device,cage_irq_handler)) @@ -1978,7 +1998,7 @@ static MACHINE_CONFIG_DERIVED( sfrush, flagstaff ) MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(seattle_state, wheel_board_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sfrushrk, flagstaff ) +MACHINE_CONFIG_DERIVED(seattle_state::sfrushrk, flagstaff) MCFG_DEVICE_ADD("cage", ATARI_CAGE_SEATTLE, 0) MCFG_ATARI_CAGE_SPEEDUP(0x5329) MCFG_ATARI_CAGE_IRQ_CALLBACK(DEVWRITE8("ioasic",midway_ioasic_device,cage_irq_handler)) @@ -1991,12 +2011,12 @@ static MACHINE_CONFIG_DERIVED( sfrushrk, flagstaff ) MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(seattle_state, wheel_board_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sfrushrkw, sfrushrk ) +MACHINE_CONFIG_DERIVED(seattle_state::sfrushrkw, sfrushrk) MCFG_DEVICE_MODIFY("ioasic") MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( calspeed, seattle150_widget ) +MACHINE_CONFIG_DERIVED(seattle_state::calspeed, seattle150_widget) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x39c0) @@ -2009,7 +2029,7 @@ static MACHINE_CONFIG_DERIVED( calspeed, seattle150_widget ) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vaportrx, seattle200_widget ) +MACHINE_CONFIG_DERIVED(seattle_state::vaportrx, seattle200_widget) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x39c2) @@ -2021,7 +2041,7 @@ static MACHINE_CONFIG_DERIVED( vaportrx, seattle200_widget ) MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( biofreak, seattle150 ) +MACHINE_CONFIG_DERIVED(seattle_state::biofreak, seattle150) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x3835) @@ -2033,7 +2053,7 @@ static MACHINE_CONFIG_DERIVED( biofreak, seattle150 ) MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( blitz, seattle150 ) +MACHINE_CONFIG_DERIVED(seattle_state::blitz, seattle150) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x39c2) @@ -2045,7 +2065,7 @@ static MACHINE_CONFIG_DERIVED( blitz, seattle150 ) MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( blitz99, seattle150 ) +MACHINE_CONFIG_DERIVED(seattle_state::blitz99, seattle150) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0afb) @@ -2057,7 +2077,7 @@ static MACHINE_CONFIG_DERIVED( blitz99, seattle150 ) MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( blitz2k, seattle150 ) +MACHINE_CONFIG_DERIVED(seattle_state::blitz2k, seattle150) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) @@ -2069,7 +2089,7 @@ static MACHINE_CONFIG_DERIVED( blitz2k, seattle150 ) MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( carnevil, seattle150 ) +MACHINE_CONFIG_DERIVED(seattle_state::carnevil, seattle150) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0af7) @@ -2081,7 +2101,7 @@ static MACHINE_CONFIG_DERIVED( carnevil, seattle150 ) MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hyprdriv, seattle200_widget ) +MACHINE_CONFIG_DERIVED(seattle_state::hyprdriv, seattle200_widget) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0af7) diff --git a/src/mame/drivers/seattlecmp.cpp b/src/mame/drivers/seattlecmp.cpp index 2d5956bf215..10fd62db039 100644 --- a/src/mame/drivers/seattlecmp.cpp +++ b/src/mame/drivers/seattlecmp.cpp @@ -49,6 +49,7 @@ public: DECLARE_READ8_MEMBER(pic_slave_ack); + void seattle(machine_config &config); private: required_device m_maincpu; required_device_array m_pic; @@ -97,7 +98,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( seattle ) +MACHINE_CONFIG_START(seattle_comp_state::seattle) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, XTAL_24MHz / 3) // 8 MHz or 4 MHz selectable MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/sega_sawatte.cpp b/src/mame/drivers/sega_sawatte.cpp index 151bb74649b..1c71cd94f22 100644 --- a/src/mame/drivers/sega_sawatte.cpp +++ b/src/mame/drivers/sega_sawatte.cpp @@ -35,6 +35,7 @@ public: : driver_device(mconfig, type, tag) { } + void sawatte(machine_config &config); protected: }; @@ -43,7 +44,7 @@ static INPUT_PORTS_START( sawatte ) INPUT_PORTS_END -static MACHINE_CONFIG_START( sawatte ) +MACHINE_CONFIG_START(sawatte_state::sawatte) MCFG_SOFTWARE_LIST_ADD("cart_list", "sawatte") MACHINE_CONFIG_END diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp index 21a617e2488..408acd055a7 100644 --- a/src/mame/drivers/segac2.cpp +++ b/src/mame/drivers/segac2.cpp @@ -213,6 +213,8 @@ public: int prot_func_pclubjv2(int in); int prot_func_pclubjv4(int in); int prot_func_pclubjv5(int in); + void segac2(machine_config &config); + void segac(machine_config &config); }; @@ -1533,7 +1535,7 @@ WRITE_LINE_MEMBER(segac2_state::vdp_lv4irqline_callback_c2) } -static MACHINE_CONFIG_START( segac ) +MACHINE_CONFIG_START(segac2_state::segac) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XL2_CLOCK/6) @@ -1589,7 +1591,7 @@ static MACHINE_CONFIG_START( segac ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( segac2, segac ) +MACHINE_CONFIG_DERIVED(segac2_state::segac2, segac) /* basic machine hardware */ MCFG_DEVICE_MODIFY("io") diff --git a/src/mame/drivers/segacoin.cpp b/src/mame/drivers/segacoin.cpp index 9895b038284..2711233d912 100644 --- a/src/mame/drivers/segacoin.cpp +++ b/src/mame/drivers/segacoin.cpp @@ -33,6 +33,7 @@ public: required_device m_maincpu; required_device m_audiocpu; + void westdrm(machine_config &config); }; @@ -104,7 +105,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( westdrm ) +MACHINE_CONFIG_START(segacoin_state::westdrm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 8000000) // clock frequency unknown diff --git a/src/mame/drivers/segae.cpp b/src/mame/drivers/segae.cpp index ded71eba870..06c87049faf 100644 --- a/src/mame/drivers/segae.cpp +++ b/src/mame/drivers/segae.cpp @@ -341,6 +341,12 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void systemex_315_5177(machine_config &config); + void systemex(machine_config &config); + void ridleofp(machine_config &config); + void hangonjr(machine_config &config); + void systeme(machine_config &config); + void systemeb(machine_config &config); private: // Devices required_device m_maincpu; @@ -860,7 +866,7 @@ uint32_t systeme_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma return 0; } -static MACHINE_CONFIG_START( systeme ) +MACHINE_CONFIG_START(systeme_state::systeme) MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/2) /* Z80B @ 5.3693Mhz */ MCFG_CPU_PROGRAM_MAP(systeme_map) MCFG_CPU_IO_MAP(io_map) @@ -894,14 +900,14 @@ static MACHINE_CONFIG_START( systeme ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hangonjr, systeme ) +MACHINE_CONFIG_DERIVED(systeme_state::hangonjr, systeme) MCFG_DEVICE_MODIFY("ppi") MCFG_I8255_IN_PORTA_CB(READ8(systeme_state, hangonjr_port_f8_read)) MCFG_I8255_IN_PORTC_CB(CONSTANT(0)) // bit 4 must be the ADC0804 /INTR signal MCFG_I8255_OUT_PORTC_CB(WRITE8(systeme_state, hangonjr_port_fa_write)) // CD4051 selector input MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ridleofp, systeme ) +MACHINE_CONFIG_DERIVED(systeme_state::ridleofp, systeme) MCFG_DEVICE_ADD("upd4701", UPD4701A, 0) // on 834-6193 I/O sub board MCFG_UPD4701_PORTX("PAD1") MCFG_UPD4701_PORTY("PAD2") @@ -915,14 +921,14 @@ static MACHINE_CONFIG_DERIVED( ridleofp, systeme ) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("upd4701", upd4701_device, resety_w)) MCFG_DEVCB_BIT(0) // or possibly bit 1 MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( systemex, systeme ) +MACHINE_CONFIG_DERIVED(systeme_state::systemex, systeme) MCFG_CPU_REPLACE("maincpu", MC8123, XTAL_10_738635MHz/2) /* Z80B @ 5.3693Mhz */ MCFG_CPU_PROGRAM_MAP(systeme_map) MCFG_CPU_IO_MAP(io_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( systemex_315_5177, systeme ) +MACHINE_CONFIG_DERIVED(systeme_state::systemex_315_5177, systeme) MCFG_CPU_REPLACE("maincpu", SEGA_315_5177, XTAL_10_738635MHz/2) /* Z80B @ 5.3693Mhz */ MCFG_CPU_PROGRAM_MAP(systeme_map) MCFG_CPU_IO_MAP(io_map) @@ -930,7 +936,7 @@ static MACHINE_CONFIG_DERIVED( systemex_315_5177, systeme ) MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( systemeb, systeme ) +MACHINE_CONFIG_DERIVED(systeme_state::systemeb, systeme) MCFG_CPU_REPLACE("maincpu", MC8123, XTAL_10_738635MHz/2) /* Z80B @ 5.3693Mhz */ MCFG_CPU_PROGRAM_MAP(systeme_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/segag80r.cpp b/src/mame/drivers/segag80r.cpp index 079a86fa008..2ba754044ab 100644 --- a/src/mame/drivers/segag80r.cpp +++ b/src/mame/drivers/segag80r.cpp @@ -829,7 +829,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( g80r_base ) +MACHINE_CONFIG_START(segag80r_state::g80r_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, VIDEO_CLOCK/4) @@ -853,7 +853,7 @@ static MACHINE_CONFIG_START( g80r_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( astrob, g80r_base ) +MACHINE_CONFIG_DERIVED(segag80r_state::astrob, g80r_base) /* basic machine hardware */ @@ -863,7 +863,7 @@ static MACHINE_CONFIG_DERIVED( astrob, g80r_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( 005, g80r_base ) +MACHINE_CONFIG_DERIVED(segag80r_state::sega005, g80r_base) /* basic machine hardware */ @@ -871,11 +871,11 @@ static MACHINE_CONFIG_DERIVED( 005, g80r_base ) MCFG_CPU_IO_MAP(main_ppi8255_portmap) /* sound boards */ - MCFG_FRAGMENT_ADD(005_sound_board) + MCFG_FRAGMENT_ADD(sega005_sound_board) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spaceod, g80r_base ) +MACHINE_CONFIG_DERIVED(segag80r_state::spaceod, g80r_base) /* basic machine hardware */ @@ -891,7 +891,7 @@ static MACHINE_CONFIG_DERIVED( spaceod, g80r_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( monsterb, g80r_base ) +MACHINE_CONFIG_DERIVED(segag80r_state::monsterb, g80r_base) /* basic machine hardware */ @@ -907,7 +907,7 @@ static MACHINE_CONFIG_DERIVED( monsterb, g80r_base ) MCFG_FRAGMENT_ADD(monsterb_sound_board) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( monster2, monsterb ) +MACHINE_CONFIG_DERIVED(segag80r_state::monster2, monsterb) MCFG_CPU_REPLACE("maincpu", SEGA_315_SPAT, VIDEO_CLOCK/4) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_IO_MAP(main_ppi8255_portmap) @@ -917,7 +917,7 @@ static MACHINE_CONFIG_DERIVED( monster2, monsterb ) MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pignewt, g80r_base ) +MACHINE_CONFIG_DERIVED(segag80r_state::pignewt, g80r_base) /* basic machine hardware */ @@ -931,7 +931,7 @@ static MACHINE_CONFIG_DERIVED( pignewt, g80r_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sindbadm, g80r_base ) +MACHINE_CONFIG_DERIVED(segag80r_state::sindbadm, g80r_base) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", SEGA_315_5028, VIDEO_CLOCK/4) @@ -1618,7 +1618,7 @@ GAME( 1981, astrob2, astrob, astrob, astrob2, segag80r_state, astrob, R GAME( 1981, astrob2a, astrob, astrob, astrob2, segag80r_state, astrob, ROT270, "Sega", "Astro Blaster (version 2a)", MACHINE_IMPERFECT_SOUND ) GAME( 1981, astrob1, astrob, astrob, astrob, segag80r_state, astrob, ROT270, "Sega", "Astro Blaster (version 1)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // instant death if you start game with 1 credit, protection?, bad dump? GAME( 1981, astrobg, astrob, astrob, astrob, segag80r_state, astrob, ROT270, "Sega", "Astro Blaster (German)", MACHINE_IMPERFECT_SOUND ) -GAME( 1981, 005, 0, 005, 005, segag80r_state, 005, ROT270, "Sega", "005", MACHINE_IMPERFECT_SOUND ) +GAME( 1981, 005, 0, sega005, 005, segag80r_state, 005, ROT270, "Sega", "005", MACHINE_IMPERFECT_SOUND ) /* basic G-80 system with individual background boards */ diff --git a/src/mame/drivers/segag80v.cpp b/src/mame/drivers/segag80v.cpp index 4a6ab47d12d..ca5d4e1fb98 100644 --- a/src/mame/drivers/segag80v.cpp +++ b/src/mame/drivers/segag80v.cpp @@ -870,7 +870,7 @@ static const char *const zektor_sample_names[] = * *************************************/ -static MACHINE_CONFIG_START( g80v_base ) +MACHINE_CONFIG_START(segag80v_state::g80v_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, VIDEO_CLOCK/4) @@ -894,7 +894,7 @@ static MACHINE_CONFIG_START( g80v_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( elim2, g80v_base ) +MACHINE_CONFIG_DERIVED(segag80v_state::elim2, g80v_base) /* custom sound board */ MCFG_SOUND_ADD("samples", SAMPLES, 0) @@ -904,7 +904,7 @@ static MACHINE_CONFIG_DERIVED( elim2, g80v_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spacfury, g80v_base ) +MACHINE_CONFIG_DERIVED(segag80v_state::spacfury, g80v_base) /* custom sound board */ MCFG_SOUND_ADD("samples", SAMPLES, 0) @@ -917,7 +917,7 @@ static MACHINE_CONFIG_DERIVED( spacfury, g80v_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zektor, g80v_base ) +MACHINE_CONFIG_DERIVED(segag80v_state::zektor, g80v_base) /* custom sound board */ MCFG_SOUND_ADD("samples", SAMPLES, 0) @@ -933,14 +933,14 @@ static MACHINE_CONFIG_DERIVED( zektor, g80v_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tacscan, g80v_base ) +MACHINE_CONFIG_DERIVED(segag80v_state::tacscan, g80v_base) /* universal sound board */ MCFG_SEGAUSB_ADD("usbsnd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( startrek, g80v_base ) +MACHINE_CONFIG_DERIVED(segag80v_state::startrek, g80v_base) /* speech board */ MCFG_FRAGMENT_ADD(sega_speech_board) diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp index f17840d40b1..e95705b1eda 100644 --- a/src/mame/drivers/segahang.cpp +++ b/src/mame/drivers/segahang.cpp @@ -746,7 +746,7 @@ GFXDECODE_END // GENERIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( shared_base ) +MACHINE_CONFIG_START(segahang_state::shared_base) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/4) @@ -784,13 +784,13 @@ static MACHINE_CONFIG_START( shared_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hangon_base, shared_base ) +MACHINE_CONFIG_DERIVED(segahang_state::hangon_base, shared_base) // video hardware MCFG_SEGA_HANGON_SPRITES_ADD("sprites") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sharrier_base, shared_base ) +MACHINE_CONFIG_DERIVED(segahang_state::sharrier_base, shared_base) // basic machine hardware MCFG_CPU_MODIFY("maincpu") @@ -805,7 +805,7 @@ static MACHINE_CONFIG_DERIVED( sharrier_base, shared_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( enduror_base, sharrier_base ) +MACHINE_CONFIG_DERIVED(segahang_state::enduror_base, sharrier_base) // basic machine hardware MCFG_CPU_REPLACE("maincpu", FD1089B, MASTER_CLOCK_10MHz) @@ -813,7 +813,7 @@ static MACHINE_CONFIG_DERIVED( enduror_base, sharrier_base ) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segahang_state, irq4_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( endurord_base, sharrier_base ) +MACHINE_CONFIG_DERIVED(segahang_state::endurord_base, sharrier_base) // basic machine hardware MCFG_CPU_REPLACE("maincpu", M68000, MASTER_CLOCK_10MHz) @@ -821,7 +821,7 @@ static MACHINE_CONFIG_DERIVED( endurord_base, sharrier_base ) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segahang_state, irq4_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sound_board_2203 ) +MACHINE_CONFIG_START(segahang_state::sound_board_2203) // basic machine hardware MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2) @@ -849,7 +849,7 @@ static MACHINE_CONFIG_START( sound_board_2203 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sound_board_2203x2 ) +MACHINE_CONFIG_START(segahang_state::sound_board_2203x2) // basic machine hardware MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2) @@ -887,7 +887,7 @@ static MACHINE_CONFIG_START( sound_board_2203x2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sound_board_2151 ) +MACHINE_CONFIG_START(segahang_state::sound_board_2151) // basic machine hardware MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2) @@ -914,12 +914,12 @@ MACHINE_CONFIG_END // SPECIFIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_DERIVED( hangon, hangon_base ) +MACHINE_CONFIG_DERIVED(segahang_state::hangon, hangon_base) MCFG_FRAGMENT_ADD(sound_board_2203) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shangupb, hangon_base ) +MACHINE_CONFIG_DERIVED(segahang_state::shangupb, hangon_base) MCFG_FRAGMENT_ADD(sound_board_2151) // not sure about these speeds, but at 6MHz, the road is not updated fast enough @@ -930,14 +930,14 @@ static MACHINE_CONFIG_DERIVED( shangupb, hangon_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shangonro, shangupb ) +MACHINE_CONFIG_DERIVED(segahang_state::shangonro, shangupb) MCFG_CPU_REPLACE("subcpu", FD1094, 10000000) MCFG_CPU_PROGRAM_MAP(sub_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(fd1094_decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sharrier, sharrier_base ) +MACHINE_CONFIG_DERIVED(segahang_state::sharrier, sharrier_base) MCFG_FRAGMENT_ADD(sound_board_2203) MCFG_CPU_MODIFY("maincpu") @@ -951,25 +951,25 @@ static MACHINE_CONFIG_DERIVED( sharrier, sharrier_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( enduror, enduror_base ) +MACHINE_CONFIG_DERIVED(segahang_state::enduror, enduror_base) MCFG_FRAGMENT_ADD(sound_board_2151) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( enduror1, enduror_base ) +MACHINE_CONFIG_DERIVED(segahang_state::enduror1, enduror_base) MCFG_FRAGMENT_ADD(sound_board_2203) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( endurord, endurord_base ) +MACHINE_CONFIG_DERIVED(segahang_state::endurord, endurord_base) MCFG_FRAGMENT_ADD(sound_board_2151) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( enduror1d, endurord_base ) +MACHINE_CONFIG_DERIVED(segahang_state::enduror1d, endurord_base) MCFG_FRAGMENT_ADD(sound_board_2203) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( endurobl, sharrier_base ) +MACHINE_CONFIG_DERIVED(segahang_state::endurobl, sharrier_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) @@ -977,7 +977,7 @@ static MACHINE_CONFIG_DERIVED( endurobl, sharrier_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( endurob2, sharrier_base ) +MACHINE_CONFIG_DERIVED(segahang_state::endurob2, sharrier_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) diff --git a/src/mame/drivers/segajw.cpp b/src/mame/drivers/segajw.cpp index 6a2b15105e8..2819b4c46d7 100644 --- a/src/mame/drivers/segajw.cpp +++ b/src/mame/drivers/segajw.cpp @@ -61,6 +61,7 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(coin_sensors_r); DECLARE_CUSTOM_INPUT_MEMBER(hopper_sensors_r); + void segajw(machine_config &config); protected: // devices @@ -349,7 +350,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, segajw_state ) AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START( segajw ) +MACHINE_CONFIG_START(segajw_state::segajw) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,8000000) // unknown clock MCFG_CPU_PROGRAM_MAP(segajw_map) diff --git a/src/mame/drivers/segald.cpp b/src/mame/drivers/segald.cpp index 60a891c009d..ffe7823223e 100644 --- a/src/mame/drivers/segald.cpp +++ b/src/mame/drivers/segald.cpp @@ -69,6 +69,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void astron(machine_config &config); }; /* VIDEO GOODS */ @@ -367,7 +368,7 @@ void segald_state::machine_start() /* DRIVER */ -static MACHINE_CONFIG_START( astron ) +MACHINE_CONFIG_START(segald_state::astron) /* main cpu */ MCFG_CPU_ADD("maincpu", Z80, SCHEMATIC_CLOCK/4) diff --git a/src/mame/drivers/segam1.cpp b/src/mame/drivers/segam1.cpp index da97eb34220..49354fa25b4 100644 --- a/src/mame/drivers/segam1.cpp +++ b/src/mame/drivers/segam1.cpp @@ -74,6 +74,8 @@ public: required_device m_tile; required_device m_mixer; required_device m_ymsnd; + void unkm1(machine_config &config); + void segam1(machine_config &config); }; void segam1_state::machine_start() @@ -334,7 +336,7 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( segam1 ) +MACHINE_CONFIG_START(segam1_state::segam1) MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) MCFG_CPU_PROGRAM_MAP(segam1_map) @@ -386,7 +388,7 @@ static MACHINE_CONFIG_START( segam1 ) //MCFG_YM2612_IRQ_HANDLER(WRITELINE(segam1_state, ym3438_irq_handler)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( unkm1, segam1 ) +MACHINE_CONFIG_DERIVED(segam1_state::unkm1, segam1) MCFG_CPU_MODIFY("audiocpu") MCFG_CPU_PROGRAM_MAP(unkm1_sound_map) diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp index c69e6d6f923..7298b9c99f9 100644 --- a/src/mame/drivers/segaorun.cpp +++ b/src/mame/drivers/segaorun.cpp @@ -1183,7 +1183,7 @@ GFXDECODE_END // GENERIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( outrun_base ) +MACHINE_CONFIG_START(segaorun_state::outrun_base) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4) @@ -1244,7 +1244,7 @@ MACHINE_CONFIG_END // GAME-SPECIFIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_DERIVED( outrundx, outrun_base ) +MACHINE_CONFIG_DERIVED(segaorun_state::outrundx, outrun_base) // basic machine hardware MCFG_TIMER_DRIVER_ADD_PERIODIC("bankmotor", segaorun_state, bankmotor_update, attotime::from_msec(10)) @@ -1253,13 +1253,13 @@ static MACHINE_CONFIG_DERIVED( outrundx, outrun_base ) MCFG_SEGA_OUTRUN_SPRITES_ADD("sprites") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( outrun, outrundx ) +MACHINE_CONFIG_DERIVED(segaorun_state::outrun, outrundx) // basic machine hardware MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( outrun_fd1094, outrun ) +MACHINE_CONFIG_DERIVED(segaorun_state::outrun_fd1094, outrun) // basic machine hardware MCFG_CPU_REPLACE("maincpu", FD1094, MASTER_CLOCK/4) @@ -1267,7 +1267,7 @@ static MACHINE_CONFIG_DERIVED( outrun_fd1094, outrun ) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( outrun_fd1089a, outrun ) +MACHINE_CONFIG_DERIVED(segaorun_state::outrun_fd1089a, outrun) // basic machine hardware MCFG_CPU_REPLACE("maincpu", FD1089A, MASTER_CLOCK/4) @@ -1275,7 +1275,7 @@ static MACHINE_CONFIG_DERIVED( outrun_fd1089a, outrun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shangon, outrun_base ) +MACHINE_CONFIG_DERIVED(segaorun_state::shangon, outrun_base) // basic machine hardware MCFG_DEVICE_REMOVE("i8255") @@ -1297,7 +1297,7 @@ static MACHINE_CONFIG_DERIVED( shangon, outrun_base ) MCFG_SEGA_SYS16B_SPRITES_ADD("sprites") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shangon_fd1089b, shangon ) +MACHINE_CONFIG_DERIVED(segaorun_state::shangon_fd1089b, shangon) // basic machine hardware MCFG_CPU_REPLACE("maincpu", FD1089B, MASTER_CLOCK/4) diff --git a/src/mame/drivers/segapico.cpp b/src/mame/drivers/segapico.cpp index 562c209517c..7030bdbb948 100644 --- a/src/mame/drivers/segapico.cpp +++ b/src/mame/drivers/segapico.cpp @@ -167,6 +167,8 @@ public: required_device m_picocart; DECLARE_MACHINE_START(pico); + void pico(machine_config &config); + void picopal(machine_config &config); }; @@ -385,7 +387,7 @@ MACHINE_START_MEMBER(pico_state,pico) m_vdp->stop_timers(); } -static MACHINE_CONFIG_START( pico ) +MACHINE_CONFIG_START(pico_state::pico) MCFG_FRAGMENT_ADD( md_ntsc ) MCFG_CPU_MODIFY("maincpu") @@ -406,7 +408,7 @@ static MACHINE_CONFIG_START( pico ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.16) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( picopal ) +MACHINE_CONFIG_START(pico_state::picopal) MCFG_FRAGMENT_ADD( md_pal ) MCFG_CPU_MODIFY("maincpu") @@ -561,6 +563,7 @@ public: required_device m_picocart; DECLARE_MACHINE_START(copera); + void copera(machine_config &config); }; @@ -597,7 +600,7 @@ MACHINE_START_MEMBER(copera_state,copera) } -static MACHINE_CONFIG_START( copera ) +MACHINE_CONFIG_START(copera_state::copera) MCFG_FRAGMENT_ADD( md_ntsc ) MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/segapm.cpp b/src/mame/drivers/segapm.cpp index eeb729d257e..814d98fd67e 100644 --- a/src/mame/drivers/segapm.cpp +++ b/src/mame/drivers/segapm.cpp @@ -23,6 +23,7 @@ public: virtual void video_start() override; uint32_t screen_update_segapm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void segapm(machine_config &config); }; @@ -52,7 +53,7 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( segapm ) +MACHINE_CONFIG_START(segapm_state::segapm) MCFG_CPU_ADD("maincpu", M68000, 8000000) // ?? MCFG_CPU_PROGRAM_MAP(segapm_map) diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp index a26475f4cdf..1b9351fd25d 100644 --- a/src/mame/drivers/segas16a.cpp +++ b/src/mame/drivers/segas16a.cpp @@ -1965,7 +1965,7 @@ GFXDECODE_END // GENERIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( system16a ) +MACHINE_CONFIG_START(segas16a_state::system16a) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, 10000000) @@ -2025,31 +2025,31 @@ static MACHINE_CONFIG_START( system16a ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16a_fd1089a, system16a ) +MACHINE_CONFIG_DERIVED(segas16a_state::system16a_fd1089a, system16a) MCFG_CPU_REPLACE("maincpu", FD1089A, 10000000) MCFG_CPU_PROGRAM_MAP(system16a_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16a_state, irq4_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16a_fd1089b, system16a ) +MACHINE_CONFIG_DERIVED(segas16a_state::system16a_fd1089b, system16a) MCFG_CPU_REPLACE("maincpu", FD1089B, 10000000) MCFG_CPU_PROGRAM_MAP(system16a_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16a_state, irq4_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16a_fd1094, system16a ) +MACHINE_CONFIG_DERIVED(segas16a_state::system16a_fd1094, system16a) MCFG_CPU_REPLACE("maincpu", FD1094, 10000000) MCFG_CPU_PROGRAM_MAP(system16a_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16a_state, irq4_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aceattaca_fd1094, system16a_fd1094 ) +MACHINE_CONFIG_DERIVED(segas16a_state::aceattaca_fd1094, system16a_fd1094) MCFG_DEVICE_ADD("cxdio", CXD1095, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16a_i8751, system16a ) +MACHINE_CONFIG_DERIVED(segas16a_state::system16a_i8751, system16a) MCFG_CPU_MODIFY("maincpu") MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16a_state, i8751_main_cpu_vblank) @@ -2059,7 +2059,7 @@ static MACHINE_CONFIG_DERIVED( system16a_i8751, system16a ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16a_no7751, system16a ) +MACHINE_CONFIG_DERIVED(segas16a_state::system16a_no7751, system16a) MCFG_CPU_MODIFY("soundcpu") MCFG_CPU_IO_MAP(sound_no7751_portmap) @@ -2071,7 +2071,7 @@ static MACHINE_CONFIG_DERIVED( system16a_no7751, system16a ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16a_no7751p, system16a_no7751 ) +MACHINE_CONFIG_DERIVED(segas16a_state::system16a_no7751p, system16a_no7751) MCFG_CPU_REPLACE("soundcpu", SEGA_315_5177, 4000000) MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_CPU_IO_MAP(sound_no7751_portmap) @@ -2090,7 +2090,7 @@ static MACHINE_CONFIG_DERIVED( system16a_i8751_no7751, system16a_i8751 ) MACHINE_CONFIG_END */ -static MACHINE_CONFIG_DERIVED( system16a_fd1089a_no7751, system16a_fd1089a ) +MACHINE_CONFIG_DERIVED(segas16a_state::system16a_fd1089a_no7751, system16a_fd1089a) MCFG_CPU_MODIFY("soundcpu") MCFG_CPU_IO_MAP(sound_no7751_portmap) @@ -2102,7 +2102,7 @@ static MACHINE_CONFIG_DERIVED( system16a_fd1089a_no7751, system16a_fd1089a ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16a_fd1089b_no7751, system16a_fd1089b ) +MACHINE_CONFIG_DERIVED(segas16a_state::system16a_fd1089b_no7751, system16a_fd1089b) MCFG_CPU_MODIFY("soundcpu") MCFG_CPU_IO_MAP(sound_no7751_portmap) @@ -2114,7 +2114,7 @@ static MACHINE_CONFIG_DERIVED( system16a_fd1089b_no7751, system16a_fd1089b ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16a_fd1094_no7751, system16a_fd1094 ) +MACHINE_CONFIG_DERIVED(segas16a_state::system16a_fd1094_no7751, system16a_fd1094) MCFG_CPU_MODIFY("soundcpu") MCFG_CPU_IO_MAP(sound_no7751_portmap) diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index cda07751c36..e56893d7a78 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -3700,7 +3700,7 @@ GFXDECODE_END // GENERIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( system16b ) +MACHINE_CONFIG_START(segas16b_state::system16b) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_10MHz) @@ -3741,33 +3741,33 @@ static MACHINE_CONFIG_START( system16b ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.48) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16b_mc8123, system16b ) +MACHINE_CONFIG_DERIVED(segas16b_state::system16b_mc8123, system16b) MCFG_CPU_REPLACE("soundcpu", MC8123, MASTER_CLOCK_10MHz/2) MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_CPU_IO_MAP(sound_portmap) MCFG_CPU_DECRYPTED_OPCODES_MAP(sound_decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16b_fd1089a, system16b ) +MACHINE_CONFIG_DERIVED(segas16b_state::system16b_fd1089a, system16b) MCFG_CPU_REPLACE("maincpu", FD1089A, MASTER_CLOCK_10MHz) MCFG_CPU_PROGRAM_MAP(system16b_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16b_fd1089b, system16b ) +MACHINE_CONFIG_DERIVED(segas16b_state::system16b_fd1089b, system16b) MCFG_CPU_REPLACE("maincpu", FD1089B, MASTER_CLOCK_10MHz) MCFG_CPU_PROGRAM_MAP(system16b_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16b_fd1094, system16b ) +MACHINE_CONFIG_DERIVED(segas16b_state::system16b_fd1094, system16b) MCFG_CPU_REPLACE("maincpu", FD1094, MASTER_CLOCK_10MHz) MCFG_CPU_PROGRAM_MAP(system16b_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aceattacb_fd1094, system16b_fd1094 ) +MACHINE_CONFIG_DERIVED(segas16b_state::aceattacb_fd1094, system16b_fd1094) // 834-6602 I/O board MCFG_DEVICE_ADD("upd4701a1", UPD4701A, 0) MCFG_DEVICE_ADD("upd4701a2", UPD4701A, 0) @@ -3777,7 +3777,7 @@ static MACHINE_CONFIG_DERIVED( aceattacb_fd1094, system16b_fd1094 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16b_i8751, system16b ) +MACHINE_CONFIG_DERIVED(segas16b_state::system16b_i8751, system16b) MCFG_CPU_MODIFY("maincpu") MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16b_state, i8751_main_cpu_vblank) @@ -3790,25 +3790,25 @@ MACHINE_CONFIG_END // same as the above, but with custom Sega ICs -static MACHINE_CONFIG_START( rom_5797_fragment ) +MACHINE_CONFIG_START(segas16b_state::rom_5797_fragment) MCFG_SEGA_315_5248_MULTIPLIER_ADD("multiplier") MCFG_SEGA_315_5250_COMPARE_TIMER_ADD("cmptimer_1") MCFG_SEGA_315_5250_COMPARE_TIMER_ADD("cmptimer_2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16b_5797, system16b ) +MACHINE_CONFIG_DERIVED(segas16b_state::system16b_5797, system16b) MCFG_FRAGMENT_ADD(rom_5797_fragment) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16b_i8751_5797, system16b_i8751 ) +MACHINE_CONFIG_DERIVED(segas16b_state::system16b_i8751_5797, system16b_i8751) MCFG_FRAGMENT_ADD(rom_5797_fragment) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16b_fd1094_5797, system16b_fd1094 ) +MACHINE_CONFIG_DERIVED(segas16b_state::system16b_fd1094_5797, system16b_fd1094) MCFG_FRAGMENT_ADD(rom_5797_fragment) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16b_split, system16b ) +MACHINE_CONFIG_DERIVED(segas16b_state::system16b_split, system16b) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(system16b_bootleg_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map_x) @@ -3842,7 +3842,7 @@ void segas16b_state::tilemap_16b_fpointbl_fill_latch(int i, uint16_t* latched_pa // printf("%02x returning latched page select %04x scrollx %04x scrolly %04x\n", i, latched_pageselect[i], latched_xscroll[i], latched_yscroll[i]); } -static MACHINE_CONFIG_DERIVED( fpointbl, system16b ) +MACHINE_CONFIG_DERIVED(segas16b_state::fpointbl, system16b) MCFG_DEVICE_REMOVE("mapper") MCFG_DEVICE_REMOVE("sprites") @@ -3863,7 +3863,7 @@ static MACHINE_CONFIG_DERIVED( fpointbl, system16b ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fpointbla, fpointbl ) +MACHINE_CONFIG_DERIVED(segas16b_state::fpointbla, fpointbl) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(map_fpointbla) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map_fpointbla) @@ -3875,7 +3875,7 @@ static MACHINE_CONFIG_DERIVED( fpointbla, fpointbl ) MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(60) // these align the pieces with the playfield MACHINE_CONFIG_END -static MACHINE_CONFIG_START( lockonph ) +MACHINE_CONFIG_START(segas16b_state::lockonph) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // ? @@ -3926,7 +3926,7 @@ MACHINE_CONFIG_END // GAME-SPECIFIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_DERIVED( atomicp, system16b ) // 10MHz CPU Clock verified +MACHINE_CONFIG_DERIVED(segas16b_state::atomicp, system16b) // 10MHz CPU Clock verified // basic machine hardware MCFG_DEVICE_REMOVE("soundcpu") @@ -3942,7 +3942,7 @@ static MACHINE_CONFIG_DERIVED( atomicp, system16b ) // 10MHz CPU Clock verified MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system16c, system16b ) +MACHINE_CONFIG_DERIVED(segas16b_state::system16c, system16b) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(system16c_map) MACHINE_CONFIG_END @@ -9715,7 +9715,7 @@ void isgsm_state::machine_reset() } -static MACHINE_CONFIG_DERIVED( isgsm, system16b ) +MACHINE_CONFIG_DERIVED(isgsm_state::isgsm, system16b) // basic machine hardware MCFG_DEVICE_REMOVE("maincpu") diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp index 605d79d7530..3cc1d29bf59 100644 --- a/src/mame/drivers/segas18.cpp +++ b/src/mame/drivers/segas18.cpp @@ -1319,7 +1319,7 @@ WRITE_LINE_MEMBER(segas18_state::ym3438_irq_handler) } -static MACHINE_CONFIG_START( system18 ) +MACHINE_CONFIG_START(segas18_state::system18) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, 10000000) @@ -1389,7 +1389,7 @@ static MACHINE_CONFIG_START( system18 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system18_fd1094, system18 ) +MACHINE_CONFIG_DERIVED(segas18_state::system18_fd1094, system18) // basic machine hardware MCFG_CPU_REPLACE("maincpu", FD1094, 10000000) @@ -1398,21 +1398,21 @@ static MACHINE_CONFIG_DERIVED( system18_fd1094, system18 ) MCFG_CPU_VBLANK_INT_DRIVER("screen", segas18_state, irq4_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lghost_fd1094, system18_fd1094 ) +MACHINE_CONFIG_DERIVED(segas18_state::lghost_fd1094, system18_fd1094) // basic machine hardware MCFG_DEVICE_MODIFY("io") MCFG_315_5296_OUT_PORTC_CB(WRITE8(segas18_state, lghost_gun_recoil_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lghost, system18 ) +MACHINE_CONFIG_DERIVED(segas18_state::lghost, system18) // basic machine hardware MCFG_DEVICE_MODIFY("io") MCFG_315_5296_OUT_PORTC_CB(WRITE8(segas18_state, lghost_gun_recoil_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wwally_fd1094, system18_fd1094 ) +MACHINE_CONFIG_DERIVED(segas18_state::wwally_fd1094, system18_fd1094) MCFG_DEVICE_ADD("upd1", UPD4701A, 0) MCFG_UPD4701_PORTX("TRACKX1") MCFG_UPD4701_PORTY("TRACKY1") @@ -1426,7 +1426,7 @@ static MACHINE_CONFIG_DERIVED( wwally_fd1094, system18_fd1094 ) MCFG_UPD4701_PORTY("TRACKY3") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wwally, system18 ) +MACHINE_CONFIG_DERIVED(segas18_state::wwally, system18) MCFG_DEVICE_ADD("upd1", UPD4701A, 0) MCFG_UPD4701_PORTX("TRACKX1") MCFG_UPD4701_PORTY("TRACKY1") @@ -1440,7 +1440,7 @@ static MACHINE_CONFIG_DERIVED( wwally, system18 ) MCFG_UPD4701_PORTY("TRACKY3") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system18_i8751, system18 ) +MACHINE_CONFIG_DERIVED(segas18_state::system18_i8751, system18) // basic machine hardware MCFG_CPU_MODIFY("maincpu") @@ -1451,7 +1451,7 @@ static MACHINE_CONFIG_DERIVED( system18_i8751, system18 ) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas18_state, irq0_line_hold) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system18_fd1094_i8751, system18_fd1094 ) +MACHINE_CONFIG_DERIVED(segas18_state::system18_fd1094_i8751, system18_fd1094) // basic machine hardware MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/segas24.cpp b/src/mame/drivers/segas24.cpp index 02759921a47..617d51c5e32 100644 --- a/src/mame/drivers/segas24.cpp +++ b/src/mame/drivers/segas24.cpp @@ -1860,7 +1860,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( system24 ) +MACHINE_CONFIG_START(segas24_state::system24) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2) @@ -1914,18 +1914,18 @@ static MACHINE_CONFIG_START( system24 ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mahmajn, system24 ) +MACHINE_CONFIG_DERIVED(segas24_state::mahmajn, system24) MCFG_DEVICE_MODIFY("io") MCFG_315_5296_IN_PORTA_CB(READ8(segas24_state, mahmajn_input_line_r)) MCFG_315_5296_IN_PORTC_CB(READ8(segas24_state, mahmajn_inputs_r)) MCFG_315_5296_OUT_PORTD_CB(WRITE8(segas24_state, mahmajn_mux_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system24_floppy, system24 ) +MACHINE_CONFIG_DERIVED(segas24_state::system24_floppy, system24) MCFG_NVRAM_ADD_NO_FILL("floppy_nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system24_floppy_hotrod, system24_floppy ) +MACHINE_CONFIG_DERIVED(segas24_state::system24_floppy_hotrod, system24_floppy) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(hotrod_cpu1_map) MCFG_CPU_MODIFY("subcpu") @@ -1948,13 +1948,13 @@ static MACHINE_CONFIG_DERIVED( system24_floppy_hotrod, system24_floppy ) MCFG_DEVICE_ADD("adc2", MSM6253, 0) // IC2 - 33k/33p R/C clock MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system24_floppy_fd1094, system24_floppy ) +MACHINE_CONFIG_DERIVED(segas24_state::system24_floppy_fd1094, system24_floppy) MCFG_CPU_REPLACE("subcpu", FD1094, MASTER_CLOCK/2) MCFG_CPU_PROGRAM_MAP(system24_cpu2_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system24_floppy_fd_upd, system24_floppy_fd1094 ) +MACHINE_CONFIG_DERIVED(segas24_state::system24_floppy_fd_upd, system24_floppy_fd1094) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(roughrac_cpu1_map) MCFG_CPU_MODIFY("subcpu") @@ -1965,13 +1965,13 @@ static MACHINE_CONFIG_DERIVED( system24_floppy_fd_upd, system24_floppy_fd1094 ) MCFG_UPD4701_PORTY("DIAL2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dcclub, system24 ) +MACHINE_CONFIG_DERIVED(segas24_state::dcclub, system24) MCFG_DEVICE_MODIFY("io") MCFG_315_5296_IN_PORTA_CB(READ8(segas24_state, dcclub_p1_r)) MCFG_315_5296_IN_PORTC_CB(READ8(segas24_state, dcclub_p3_r)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( system24_floppy_dcclub, system24_floppy_fd1094 ) +MACHINE_CONFIG_DERIVED(segas24_state::system24_floppy_dcclub, system24_floppy_fd1094) MCFG_DEVICE_MODIFY("io") MCFG_315_5296_IN_PORTA_CB(READ8(segas24_state, dcclub_p1_r)) MCFG_315_5296_IN_PORTC_CB(READ8(segas24_state, dcclub_p3_r)) diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp index 5436ed77eed..83fe2b8ab6f 100644 --- a/src/mame/drivers/segas32.cpp +++ b/src/mame/drivers/segas32.cpp @@ -2241,7 +2241,7 @@ GFXDECODE_END *************************************/ -MACHINE_CONFIG_MEMBER(segas32_state::device_add_mconfig) +MACHINE_CONFIG_START(segas32_state::device_add_mconfig) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V60, MASTER_CLOCK/2) @@ -2318,7 +2318,7 @@ static ADDRESS_MAP_START( system32_analog_map, AS_PROGRAM, 16, segas32_state ) AM_IMPORT_FROM(system32_map) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER(segas32_analog_state::device_add_mconfig) +MACHINE_CONFIG_START(segas32_analog_state::device_add_mconfig) segas32_state::device_add_mconfig(config); MCFG_DEVICE_MODIFY("maincpu") @@ -2356,7 +2356,7 @@ static ADDRESS_MAP_START( system32_trackball_map, AS_PROGRAM, 16, segas32_trackb AM_IMPORT_FROM(system32_map) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER(segas32_trackball_state::device_add_mconfig) +MACHINE_CONFIG_START(segas32_trackball_state::device_add_mconfig) segas32_state::device_add_mconfig(config); MCFG_DEVICE_MODIFY("maincpu") @@ -2394,7 +2394,7 @@ static ADDRESS_MAP_START( system32_4player_map, AS_PROGRAM, 16, segas32_state ) AM_IMPORT_FROM(system32_map) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER(segas32_4player_state::device_add_mconfig) +MACHINE_CONFIG_START(segas32_4player_state::device_add_mconfig) segas32_state::device_add_mconfig(config); MCFG_DEVICE_MODIFY("maincpu") @@ -2428,7 +2428,7 @@ static ADDRESS_MAP_START( ga2_main_map, AS_PROGRAM, 16, segas32_state ) AM_IMPORT_FROM(system32_4player_map) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER(segas32_v25_state::device_add_mconfig) +MACHINE_CONFIG_START(segas32_v25_state::device_add_mconfig) segas32_4player_state::device_add_mconfig(config); MCFG_CPU_MODIFY("maincpu") @@ -2452,7 +2452,7 @@ segas32_v25_state::segas32_v25_state(const machine_config &mconfig, const char * -MACHINE_CONFIG_MEMBER(segas32_upd7725_state::device_add_mconfig) +MACHINE_CONFIG_START(segas32_upd7725_state::device_add_mconfig) segas32_analog_state::device_add_mconfig(config); /* add a upd7725; this is on the 837-8341 daughterboard which plugs into the socket on the master pcb's rom board where an fd1149 could go */ @@ -2510,14 +2510,14 @@ static ADDRESS_MAP_START( system32_cd_map, AS_PROGRAM, 16, segas32_state ) AM_IMPORT_FROM(system32_map) ADDRESS_MAP_END -static MACHINE_CONFIG_START( cdrom_config ) - MCFG_DEVICE_MODIFY( "cdda" ) +void segas32_cd_state::cdrom_config(device_t *device) +{ + device = device->subdevice("cdda"); MCFG_SOUND_ROUTE( 0, "^^^^lspeaker", 0.30 ) MCFG_SOUND_ROUTE( 1, "^^^^rspeaker", 0.30 ) -MACHINE_CONFIG_END - +} -MACHINE_CONFIG_MEMBER(segas32_cd_state::device_add_mconfig) +MACHINE_CONFIG_START(segas32_cd_state::device_add_mconfig) segas32_state::device_add_mconfig(config); MCFG_DEVICE_MODIFY("maincpu") @@ -2547,7 +2547,7 @@ segas32_cd_state::segas32_cd_state(const machine_config &mconfig, const char *ta -MACHINE_CONFIG_MEMBER(sega_multi32_state::device_add_mconfig) +MACHINE_CONFIG_START(sega_multi32_state::device_add_mconfig) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V70, MULTI32_CLOCK/2) MCFG_CPU_PROGRAM_MAP(multi32_map) @@ -2641,7 +2641,7 @@ static ADDRESS_MAP_START( multi32_analog_map, AS_PROGRAM, 32, sega_multi32_analo AM_IMPORT_FROM(multi32_map) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER(sega_multi32_analog_state::device_add_mconfig) +MACHINE_CONFIG_START(sega_multi32_analog_state::device_add_mconfig) sega_multi32_state::device_add_mconfig(config); MCFG_DEVICE_MODIFY("maincpu") @@ -2685,7 +2685,7 @@ static ADDRESS_MAP_START( multi32_6player_map, AS_PROGRAM, 32, segas32_state ) AM_IMPORT_FROM(multi32_map) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER(sega_multi32_6player_state::device_add_mconfig) +MACHINE_CONFIG_START(sega_multi32_6player_state::device_add_mconfig) sega_multi32_state::device_add_mconfig(config); MCFG_DEVICE_MODIFY("maincpu") @@ -2748,63 +2748,75 @@ public: DECLARE_READ16_MEMBER(dual_pcb_slave); + void sega_multi32(machine_config &config); + void sega_system32(machine_config &config); + void sega_multi32_analog(machine_config &config); + void sega_multi32_6p(machine_config &config); + void sega_system32_dual_direct_upd7725(machine_config &config); + void sega_system32_dual_direct(machine_config &config); + void sega_system32_track(machine_config &config); + void sega_system32_ga2(machine_config &config); + void sega_system32_cd(machine_config &config); + void sega_system32_arf(machine_config &config); + void sega_system32_analog(machine_config &config); + void sega_system32_4p(machine_config &config); }; -static MACHINE_CONFIG_START( sega_system32 ) +MACHINE_CONFIG_START(segas32_new_state::sega_system32) MCFG_DEVICE_ADD("mainpcb", SEGA_S32_REGULAR_DEVICE, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_system32_analog ) +MACHINE_CONFIG_START(segas32_new_state::sega_system32_analog) MCFG_DEVICE_ADD("mainpcb", SEGA_S32_ANALOG_DEVICE, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_system32_track ) +MACHINE_CONFIG_START(segas32_new_state::sega_system32_track) MCFG_DEVICE_ADD("mainpcb", SEGA_S32_TRACKBALL_DEVICE, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_system32_4p ) +MACHINE_CONFIG_START(segas32_new_state::sega_system32_4p) MCFG_DEVICE_ADD("mainpcb", SEGA_S32_4PLAYER_DEVICE, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_system32_cd ) +MACHINE_CONFIG_START(segas32_new_state::sega_system32_cd) MCFG_DEVICE_ADD("mainpcb", SEGA_S32_CD_DEVICE, 0) MACHINE_CONFIG_END // for f1en where there is a sub-board containing shared ram sitting underneath the ROM board bridging 2 PCBs (not a network link) -static MACHINE_CONFIG_START( sega_system32_dual_direct ) +MACHINE_CONFIG_START(segas32_new_state::sega_system32_dual_direct) MCFG_DEVICE_ADD("mainpcb", SEGA_S32_ANALOG_DEVICE, 0) MCFG_DEVICE_ADD("slavepcb", SEGA_S32_ANALOG_DEVICE, 0) MACHINE_CONFIG_END // air rescue is like f1en above but also has the 837-8341 DSP daughterboard on the mainpcb side only -static MACHINE_CONFIG_START( sega_system32_dual_direct_upd7725 ) +MACHINE_CONFIG_START(segas32_new_state::sega_system32_dual_direct_upd7725) MCFG_DEVICE_ADD("mainpcb", SEGA_S32_UPD7725_DEVICE, 0) MCFG_DEVICE_ADD("slavepcb", SEGA_S32_ANALOG_DEVICE, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_system32_ga2 ) +MACHINE_CONFIG_START(segas32_new_state::sega_system32_ga2) MCFG_DEVICE_ADD("mainpcb", SEGA_S32_V25_DEVICE, 0) MCFG_CPU_MODIFY("mainpcb:mcu") MCFG_V25_CONFIG(segas32_v25_state::ga2_opcode_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_system32_arf ) +MACHINE_CONFIG_START(segas32_new_state::sega_system32_arf) MCFG_DEVICE_ADD("mainpcb", SEGA_S32_V25_DEVICE, 0) MCFG_CPU_MODIFY("mainpcb:mcu") MCFG_V25_CONFIG(segas32_v25_state::arf_opcode_table) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_multi32 ) +MACHINE_CONFIG_START(segas32_new_state::sega_multi32) MCFG_DEVICE_ADD("mainpcb", SEGA_MULTI32_DEVICE, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_multi32_analog ) +MACHINE_CONFIG_START(segas32_new_state::sega_multi32_analog) MCFG_DEVICE_ADD("mainpcb", SEGA_MULTI32_ANALOG_DEVICE, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_multi32_6p ) +MACHINE_CONFIG_START(segas32_new_state::sega_multi32_6p) MCFG_DEVICE_ADD("mainpcb", SEGA_MULTI32_6PLAYER_DEVICE, 0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/segasp.cpp b/src/mame/drivers/segasp.cpp index 391fafa9e4b..4fa57231997 100644 --- a/src/mame/drivers/segasp.cpp +++ b/src/mame/drivers/segasp.cpp @@ -296,7 +296,7 @@ INPUT_PORTS_START( segasp ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( segasp, naomi_aw_base ) +MACHINE_CONFIG_DERIVED(segasp_state::segasp, naomi_aw_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(segasp_map) MCFG_CPU_IO_MAP(onchip_port) diff --git a/src/mame/drivers/segaufo.cpp b/src/mame/drivers/segaufo.cpp index 5d421cc57d2..624f4c8fcbf 100644 --- a/src/mame/drivers/segaufo.cpp +++ b/src/mame/drivers/segaufo.cpp @@ -127,6 +127,10 @@ public: virtual void machine_start() override; TIMER_DEVICE_CALLBACK_MEMBER(simulate_xyz); TIMER_DEVICE_CALLBACK_MEMBER(update_info); + void ufomini(machine_config &config); + void ufo21(machine_config &config); + void newufo(machine_config &config); + void ufo800(machine_config &config); }; @@ -748,7 +752,7 @@ void ufo_state::machine_start() save_item(NAME(m_stepper)); } -static MACHINE_CONFIG_START( newufo ) +MACHINE_CONFIG_START(ufo_state::newufo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) @@ -796,7 +800,7 @@ static MACHINE_CONFIG_START( newufo ) MCFG_SOUND_ROUTE(1, "mono", 0.40) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ufomini, newufo ) +MACHINE_CONFIG_DERIVED(ufo_state::ufomini, newufo) /* basic machine hardware */ MCFG_DEVICE_MODIFY("io1") @@ -806,7 +810,7 @@ static MACHINE_CONFIG_DERIVED( ufomini, newufo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ufo21, newufo ) +MACHINE_CONFIG_DERIVED(ufo_state::ufo21, newufo) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -829,7 +833,7 @@ static MACHINE_CONFIG_DERIVED( ufo21, newufo ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ufo800, newufo ) +MACHINE_CONFIG_DERIVED(ufo_state::ufo800, newufo) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index 9b19f22a966..a86354e3a6d 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -370,6 +370,14 @@ public: DECLARE_DRIVER_INIT(rascot); DECLARE_DRIVER_INIT(gprider); + void sega_smgp_fd1094(machine_config &config); + void sega_lastsurv_fd1094(machine_config &config); + void sega_lastsurv(machine_config &config); + void sega_xboard(machine_config &config); + void sega_aburner2(machine_config &config); + void sega_xboard_fd1094(machine_config &config); + void sega_rascot(machine_config &config); + void sega_smgp(machine_config &config); }; class segaxbd_new_state_double : public segaxbd_new_state @@ -425,6 +433,7 @@ public: uint16_t shareram[0x800]; uint16_t rampage1; uint16_t rampage2; + void sega_xboard_fd1094_double(machine_config &config); }; //************************************************************************** @@ -1679,7 +1688,7 @@ GFXDECODE_END // GENERIC MACHINE DRIVERS //************************************************************************** -MACHINE_CONFIG_MEMBER( segaxbd_state::xboard_base_mconfig ) +MACHINE_CONFIG_START(segaxbd_state::xboard_base_mconfig ) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4) @@ -1761,12 +1770,12 @@ segaxbd_regular_state::segaxbd_regular_state(const machine_config &mconfig, cons { } -MACHINE_CONFIG_MEMBER( segaxbd_regular_state::device_add_mconfig ) +MACHINE_CONFIG_START(segaxbd_regular_state::device_add_mconfig) segaxbd_state::xboard_base_mconfig(config); MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_xboard ) +MACHINE_CONFIG_START(segaxbd_new_state::sega_xboard) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_REGULAR, 0) MACHINE_CONFIG_END @@ -1778,7 +1787,7 @@ segaxbd_fd1094_state::segaxbd_fd1094_state(const machine_config &mconfig, const { } -MACHINE_CONFIG_MEMBER( segaxbd_fd1094_state::device_add_mconfig ) +MACHINE_CONFIG_START(segaxbd_fd1094_state::device_add_mconfig) segaxbd_state::xboard_base_mconfig(config); @@ -1788,11 +1797,11 @@ MACHINE_CONFIG_MEMBER( segaxbd_fd1094_state::device_add_mconfig ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_xboard_fd1094 ) +MACHINE_CONFIG_START(segaxbd_new_state::sega_xboard_fd1094) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_FD1094, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_xboard_fd1094_double ) +MACHINE_CONFIG_START(segaxbd_new_state_double::sega_xboard_fd1094_double) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_FD1094, 0) MCFG_DEVICE_ADD("subpcb", SEGA_XBD_FD1094, 0) @@ -1811,7 +1820,7 @@ segaxbd_aburner2_state::segaxbd_aburner2_state(const machine_config &mconfig, co { } -MACHINE_CONFIG_MEMBER( segaxbd_aburner2_state::device_add_mconfig ) +MACHINE_CONFIG_START(segaxbd_aburner2_state::device_add_mconfig) segaxbd_state::xboard_base_mconfig(config); // basic machine hardware @@ -1820,7 +1829,7 @@ MACHINE_CONFIG_MEMBER( segaxbd_aburner2_state::device_add_mconfig ) MCFG_CXD1095_OUT_PORTB_CB(WRITE8(segaxbd_state, aburner2_motor_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_aburner2 ) +MACHINE_CONFIG_START(segaxbd_new_state::sega_aburner2) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_ABURNER2_DEVICE, 0) MACHINE_CONFIG_END @@ -1832,7 +1841,7 @@ segaxbd_lastsurv_fd1094_state::segaxbd_lastsurv_fd1094_state(const machine_confi { } -MACHINE_CONFIG_MEMBER( segaxbd_lastsurv_fd1094_state::device_add_mconfig ) +MACHINE_CONFIG_START(segaxbd_lastsurv_fd1094_state::device_add_mconfig) segaxbd_state::xboard_base_mconfig(config); @@ -1856,7 +1865,7 @@ MACHINE_CONFIG_MEMBER( segaxbd_lastsurv_fd1094_state::device_add_mconfig ) MCFG_SOUND_ROUTE(1, "lspeaker", 0.43) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_lastsurv_fd1094 ) +MACHINE_CONFIG_START(segaxbd_new_state::sega_lastsurv_fd1094) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_LASTSURV_FD1094, 0) MACHINE_CONFIG_END @@ -1868,7 +1877,7 @@ segaxbd_lastsurv_state::segaxbd_lastsurv_state(const machine_config &mconfig, co { } -MACHINE_CONFIG_MEMBER( segaxbd_lastsurv_state::device_add_mconfig ) +MACHINE_CONFIG_START(segaxbd_lastsurv_state::device_add_mconfig) segaxbd_state::xboard_base_mconfig(config); @@ -1888,7 +1897,7 @@ MACHINE_CONFIG_MEMBER( segaxbd_lastsurv_state::device_add_mconfig ) MCFG_SOUND_ROUTE(1, "lspeaker", 0.43) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_lastsurv ) +MACHINE_CONFIG_START(segaxbd_new_state::sega_lastsurv) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_LASTSURV, 0) MACHINE_CONFIG_END @@ -1900,7 +1909,7 @@ segaxbd_smgp_fd1094_state::segaxbd_smgp_fd1094_state(const machine_config &mconf { } -MACHINE_CONFIG_MEMBER( segaxbd_smgp_fd1094_state::device_add_mconfig ) +MACHINE_CONFIG_START(segaxbd_smgp_fd1094_state::device_add_mconfig) segaxbd_state::xboard_base_mconfig(config); MCFG_CPU_REPLACE("maincpu", FD1094, MASTER_CLOCK/4) @@ -1933,7 +1942,7 @@ MACHINE_CONFIG_MEMBER( segaxbd_smgp_fd1094_state::device_add_mconfig ) MCFG_SOUND_ROUTE(1, "rearright", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_smgp_fd1094 ) +MACHINE_CONFIG_START(segaxbd_new_state::sega_smgp_fd1094) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_SMGP_FD1094, 0) MACHINE_CONFIG_END @@ -1945,7 +1954,7 @@ segaxbd_smgp_state::segaxbd_smgp_state(const machine_config &mconfig, const char { } -MACHINE_CONFIG_MEMBER( segaxbd_smgp_state::device_add_mconfig ) +MACHINE_CONFIG_START(segaxbd_smgp_state::device_add_mconfig) segaxbd_state::xboard_base_mconfig(config); // basic machine hardware @@ -1974,7 +1983,7 @@ MACHINE_CONFIG_MEMBER( segaxbd_smgp_state::device_add_mconfig ) MCFG_SOUND_ROUTE(1, "rearright", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_smgp ) +MACHINE_CONFIG_START(segaxbd_new_state::sega_smgp) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_SMGP, 0) MACHINE_CONFIG_END @@ -1986,7 +1995,7 @@ segaxbd_rascot_state::segaxbd_rascot_state(const machine_config &mconfig, const { } -MACHINE_CONFIG_MEMBER( segaxbd_rascot_state::device_add_mconfig ) +MACHINE_CONFIG_START(segaxbd_rascot_state::device_add_mconfig) segaxbd_state::xboard_base_mconfig(config); // basic machine hardware @@ -1995,7 +2004,7 @@ MACHINE_CONFIG_MEMBER( segaxbd_rascot_state::device_add_mconfig ) MCFG_CPU_IO_MAP(rascot_z80_portmap) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sega_rascot ) +MACHINE_CONFIG_START(segaxbd_new_state::sega_rascot) MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_RASCOT, 0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp index 92a08f913c7..20840aee79a 100644 --- a/src/mame/drivers/segaybd.cpp +++ b/src/mame/drivers/segaybd.cpp @@ -1303,7 +1303,7 @@ INPUT_PORTS_END // GENERIC MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( yboard ) +MACHINE_CONFIG_START(segaybd_state::yboard) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4) @@ -1383,7 +1383,7 @@ MACHINE_CONFIG_END // irq at 0x28 is from MB8421, and irq at 0x38 probably from MB89372? -static MACHINE_CONFIG_DERIVED( yboard_link, yboard ) +MACHINE_CONFIG_DERIVED(segaybd_state::yboard_link, yboard) // basic machine hardware MCFG_CPU_MODIFY("maincpu") @@ -1398,7 +1398,7 @@ static MACHINE_CONFIG_DERIVED( yboard_link, yboard ) MCFG_MB8421_INTR_HANDLER(WRITELINE(segaybd_state, mb8421_intr)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( yboard_deluxe, yboard ) +MACHINE_CONFIG_DERIVED(segaybd_state::yboard_deluxe, yboard) // basic machine hardware MCFG_CPU_ADD("motorcpu", Z80, XTAL_16MHz/2 ) // 8 Mhz(guessed) diff --git a/src/mame/drivers/seibucats.cpp b/src/mame/drivers/seibucats.cpp index 63d802478d4..0ed63c48c5d 100644 --- a/src/mame/drivers/seibucats.cpp +++ b/src/mame/drivers/seibucats.cpp @@ -116,6 +116,7 @@ public: DECLARE_WRITE16_MEMBER(aux_rtc_w); DECLARE_DRIVER_INIT(seibucats); + void seibucats(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -290,7 +291,7 @@ IRQ_CALLBACK_MEMBER(seibucats_state::spi_irq_callback) } #endif -static MACHINE_CONFIG_START( seibucats ) +MACHINE_CONFIG_START(seibucats_state::seibucats) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I386, MAIN_CLOCK) diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp index 7fc0f07d3da..7d19f798ce8 100644 --- a/src/mame/drivers/seibuspi.cpp +++ b/src/mame/drivers/seibuspi.cpp @@ -1863,7 +1863,7 @@ MACHINE_RESET_MEMBER(seibuspi_state,spi) m_z80_prg_transfer_pos = 0; } -static MACHINE_CONFIG_START( spi ) +MACHINE_CONFIG_START(seibuspi_state::spi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I386, XTAL_50MHz/2) // AMD or Intel 386DX, 25MHz @@ -1913,13 +1913,13 @@ static MACHINE_CONFIG_START( spi ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ejanhs, spi ) +MACHINE_CONFIG_DERIVED(seibuspi_state::ejanhs, spi) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(seibuspi_state, ejanhs) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rdft2, spi ) +MACHINE_CONFIG_DERIVED(seibuspi_state::rdft2, spi) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(rdft2_map) MACHINE_CONFIG_END @@ -1934,7 +1934,7 @@ MACHINE_RESET_MEMBER(seibuspi_state,sxx2e) m_sb_coin_latch = 0; } -static MACHINE_CONFIG_DERIVED( sxx2e, spi ) +MACHINE_CONFIG_DERIVED(seibuspi_state::sxx2e, spi) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1958,7 +1958,7 @@ static MACHINE_CONFIG_DERIVED( sxx2e, spi ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sxx2f, sxx2e ) +MACHINE_CONFIG_DERIVED(seibuspi_state::sxx2f, sxx2e) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1972,7 +1972,7 @@ static MACHINE_CONFIG_DERIVED( sxx2f, sxx2e ) // clock is unknown, possibly slower than 7.159MHz MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sxx2g, sxx2f ) // clocks differ, but otherwise same hw as sxx2f +MACHINE_CONFIG_DERIVED(seibuspi_state::sxx2g, sxx2f) // clocks differ, but otherwise same hw as sxx2f /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") // AMD AM386DX/DX-40, 28.63636MHz @@ -1992,7 +1992,7 @@ MACHINE_CONFIG_END /* SYS386I */ -static MACHINE_CONFIG_START( sys386i ) +MACHINE_CONFIG_START(seibuspi_state::sys386i) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I386, XTAL_40MHz) // AMD 386DX, 40MHz @@ -2049,7 +2049,7 @@ DRIVER_INIT_MEMBER(seibuspi_state,sys386f) } } -static MACHINE_CONFIG_START( sys386f ) +MACHINE_CONFIG_START(seibuspi_state::sys386f) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I386, XTAL_50MHz/2) // Intel i386DX, 25MHz diff --git a/src/mame/drivers/seicross.cpp b/src/mame/drivers/seicross.cpp index 55a02d7c210..5e24bbe7a1c 100644 --- a/src/mame/drivers/seicross.cpp +++ b/src/mame/drivers/seicross.cpp @@ -390,7 +390,7 @@ INTERRUPT_GEN_MEMBER(seicross_state::vblank_irq) } -static MACHINE_CONFIG_START( no_nvram ) +MACHINE_CONFIG_START(seicross_state::no_nvram) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz / 6) /* D780C, 3.072 MHz? */ @@ -433,7 +433,7 @@ static MACHINE_CONFIG_START( no_nvram ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nvram, no_nvram ) +MACHINE_CONFIG_DERIVED(seicross_state::nvram, no_nvram) /* basic machine hardware */ MCFG_CPU_MODIFY("mcu") @@ -442,7 +442,7 @@ static MACHINE_CONFIG_DERIVED( nvram, no_nvram ) MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram", seicross_state, nvram_init) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( friskytb, nvram ) +MACHINE_CONFIG_DERIVED(seicross_state::friskytb, nvram) MCFG_CPU_MODIFY("mcu") MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp index 6da61ac1058..cd7fa32062a 100644 --- a/src/mame/drivers/seicupbl.cpp +++ b/src/mame/drivers/seicupbl.cpp @@ -73,6 +73,7 @@ public: TILE_GET_INFO_MEMBER(get_sc2_tileinfo); TILE_GET_INFO_MEMBER(get_sc3_tileinfo); + void cupsocbl(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -532,7 +533,7 @@ static GFXDECODE_START( seicupbl_csb ) GFXDECODE_END -static MACHINE_CONFIG_START( cupsocbl ) +MACHINE_CONFIG_START(seicupbl_state::cupsocbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,12000000) diff --git a/src/mame/drivers/selz80.cpp b/src/mame/drivers/selz80.cpp index 86443fed04d..9a2858b6644 100644 --- a/src/mame/drivers/selz80.cpp +++ b/src/mame/drivers/selz80.cpp @@ -55,6 +55,8 @@ public: DECLARE_MACHINE_RESET(dagz80); DECLARE_MACHINE_RESET(selz80); + void selz80(machine_config &config); + void dagz80(machine_config &config); private: uint8_t m_digit; void setup_baud(); @@ -198,7 +200,7 @@ READ8_MEMBER( selz80_state::kbd_r ) return data; } -static MACHINE_CONFIG_START( selz80 ) +MACHINE_CONFIG_START(selz80_state::selz80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) // it's actually a 5MHz XTAL with a NEC uPD780C-1 cpu MCFG_CPU_PROGRAM_MAP(selz80_mem) @@ -231,7 +233,7 @@ static MACHINE_CONFIG_START( selz80 ) MCFG_I8279_IN_CTRL_CB(VCC) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dagz80, selz80 ) +MACHINE_CONFIG_DERIVED(selz80_state::dagz80, selz80) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(dagz80_mem) MCFG_MACHINE_RESET_OVERRIDE(selz80_state, dagz80 ) diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp index 5e94a348be7..2527d355977 100644 --- a/src/mame/drivers/sengokmj.cpp +++ b/src/mame/drivers/sengokmj.cpp @@ -122,6 +122,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void sengokmj(machine_config &config); }; @@ -566,7 +567,7 @@ WRITE16_MEMBER( sengokmj_state::layer_scroll_w ) } -static MACHINE_CONFIG_START( sengokmj ) +MACHINE_CONFIG_START(sengokmj_state::sengokmj) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30, 16000000/2) /* V30-8 */ diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp index 3380be0d37c..53dce08943e 100644 --- a/src/mame/drivers/senjyo.cpp +++ b/src/mame/drivers/senjyo.cpp @@ -550,7 +550,7 @@ static GFXDECODE_START( senjyo ) GFXDECODE_END -static MACHINE_CONFIG_START( senjyo ) +MACHINE_CONFIG_START(senjyo_state::senjyo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */ @@ -606,7 +606,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( senjyox_e, senjyo ) +MACHINE_CONFIG_DERIVED(senjyo_state::senjyox_e, senjyo) MCFG_CPU_REPLACE("maincpu", SEGA_315_5015, 4000000) /* 4 MHz? */ MCFG_CPU_PROGRAM_MAP(senjyo_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) @@ -614,7 +614,7 @@ static MACHINE_CONFIG_DERIVED( senjyox_e, senjyo ) MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( senjyox_a, senjyo ) +MACHINE_CONFIG_DERIVED(senjyo_state::senjyox_a, senjyo) MCFG_CPU_REPLACE("maincpu", SEGA_315_5018, 4000000) /* 4 MHz? */ MCFG_CPU_PROGRAM_MAP(senjyo_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) @@ -623,7 +623,7 @@ static MACHINE_CONFIG_DERIVED( senjyox_a, senjyo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( starforb, senjyox_e ) +MACHINE_CONFIG_DERIVED(senjyo_state::starforb, senjyox_e) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index 82b217824fb..71f1ba7ec6a 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -7750,7 +7750,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta_state::tndrcade_sub_interrupt) m_subcpu->set_input_line(0, HOLD_LINE); } -static MACHINE_CONFIG_START( tndrcade ) +MACHINE_CONFIG_START(seta_state::tndrcade) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */ @@ -7804,7 +7804,7 @@ MACHINE_CONFIG_END /* twineagl lev 3 = lev 2 + lev 1 ! */ -static MACHINE_CONFIG_START( twineagl ) +MACHINE_CONFIG_START(seta_state::twineagl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */ @@ -7850,7 +7850,7 @@ MACHINE_CONFIG_END /* downtown lev 3 = lev 2 + lev 1 ! */ -static MACHINE_CONFIG_START( downtown ) +MACHINE_CONFIG_START(seta_state::downtown) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */ @@ -7918,7 +7918,7 @@ MACHINE_START_MEMBER(seta_state, usclssic) } -static MACHINE_CONFIG_START( usclssic ) +MACHINE_CONFIG_START(seta_state::usclssic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */ @@ -7985,7 +7985,7 @@ MACHINE_CONFIG_END Test mode shows a 16ms and 4ms counters. I wonder if every game has 5 ints per frame */ -static MACHINE_CONFIG_START( calibr50 ) +MACHINE_CONFIG_START(seta_state::calibr50) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */ @@ -8042,7 +8042,7 @@ MACHINE_CONFIG_END /* metafox lev 3 = lev 2 + lev 1 ! */ -static MACHINE_CONFIG_START( metafox ) +MACHINE_CONFIG_START(seta_state::metafox) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */ @@ -8086,7 +8086,7 @@ MACHINE_CONFIG_END Athena no Hatena? ***************************************************************************/ -static MACHINE_CONFIG_START( atehate ) +MACHINE_CONFIG_START(seta_state::atehate) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -8129,7 +8129,7 @@ MACHINE_CONFIG_END samples are bankswitched */ -static MACHINE_CONFIG_START( blandia ) +MACHINE_CONFIG_START(seta_state::blandia) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -8166,7 +8166,7 @@ static MACHINE_CONFIG_START( blandia ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( blandiap ) +MACHINE_CONFIG_START(seta_state::blandiap) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -8208,7 +8208,7 @@ MACHINE_CONFIG_END Block Carnival ***************************************************************************/ -static MACHINE_CONFIG_START( blockcar ) +MACHINE_CONFIG_START(seta_state::blockcar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */ @@ -8255,7 +8255,7 @@ static ADDRESS_MAP_START( blockcarb_sound_portmap, AS_IO, 8, seta_state ) // AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3f) AM_DEVREAD("soundlatch", generic_latch_8_device, read) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( blockcarb, blockcar ) +MACHINE_CONFIG_DERIVED(seta_state::blockcarb, blockcar) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -8279,7 +8279,7 @@ MACHINE_CONFIG_END Daioh ***************************************************************************/ -static MACHINE_CONFIG_START( daioh ) +MACHINE_CONFIG_START(seta_state::daioh) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16 MHz, MC68000-16, Verified from PCB */ @@ -8316,7 +8316,7 @@ MACHINE_CONFIG_END Daioh (prototype) ***************************************************************************/ -static MACHINE_CONFIG_START( daiohp ) +MACHINE_CONFIG_START(seta_state::daiohp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16 MHz, MC68000-16, Verified from PCB */ @@ -8358,7 +8358,7 @@ MACHINE_CONFIG_END lev 2 drives the game */ -static MACHINE_CONFIG_START( drgnunit ) +MACHINE_CONFIG_START(seta_state::drgnunit) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */ @@ -8394,7 +8394,7 @@ MACHINE_CONFIG_END /* Same as qzkklogy, but with a 16MHz CPU and different layout for the layer's tiles */ -static MACHINE_CONFIG_START( qzkklgy2 ) +MACHINE_CONFIG_START(seta_state::qzkklgy2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -8445,7 +8445,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(setaroul_state::interrupt) // lev 6: RS232 } -static MACHINE_CONFIG_START( setaroul ) +MACHINE_CONFIG_START(setaroul_state::setaroul) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* 8 MHz */ @@ -8498,7 +8498,7 @@ MACHINE_CONFIG_END Eight Force ***************************************************************************/ -static MACHINE_CONFIG_START( eightfrc ) +MACHINE_CONFIG_START(seta_state::eightfrc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -8541,7 +8541,7 @@ MACHINE_CONFIG_END lev 1 == lev 3 (writes to $500000, bit 4 -> 1 then 0) lev 2 drives the game */ -static MACHINE_CONFIG_START( extdwnhl ) +MACHINE_CONFIG_START(seta_state::extdwnhl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -8599,7 +8599,7 @@ MACHINE_START_MEMBER(seta_state,wrofaero){ uPD71054_timer_init(); } lev 2: VBlank lev 4: Sound (generated by a timer mapped at $d00000-6 ?) */ -static MACHINE_CONFIG_START( gundhara ) +MACHINE_CONFIG_START(seta_state::gundhara) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -8648,7 +8648,7 @@ MACHINE_CONFIG_END Zombie Raid ***************************************************************************/ -static MACHINE_CONFIG_DERIVED( zombraid, gundhara ) +MACHINE_CONFIG_DERIVED(seta_state::zombraid, gundhara) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -8668,7 +8668,7 @@ MACHINE_CONFIG_END lev 1 == lev 3 (writes to $500000, bit 4 -> 1 then 0) lev 2 drives the game */ -static MACHINE_CONFIG_START( jjsquawk ) +MACHINE_CONFIG_START(seta_state::jjsquawk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -8704,7 +8704,7 @@ static MACHINE_CONFIG_START( jjsquawk ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( jjsquawb ) +MACHINE_CONFIG_START(seta_state::jjsquawb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -8744,7 +8744,7 @@ MACHINE_CONFIG_END ***************************************************************************/ /* kamenrid: lev 2 by vblank, lev 4 by timer */ -static MACHINE_CONFIG_START( kamenrid ) +MACHINE_CONFIG_START(seta_state::kamenrid) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -8787,7 +8787,7 @@ MACHINE_CONFIG_END /* The CPU clock has been verified/measured, PCB only has one OSC and it's 14.318180 MHz */ -static MACHINE_CONFIG_START( orbs ) +MACHINE_CONFIG_START(seta_state::orbs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14318180/2) /* 7.143 MHz */ @@ -8827,7 +8827,7 @@ MACHINE_CONFIG_END Kero Kero Keroppi no Issyoni Asobou ***************************************************************************/ -static MACHINE_CONFIG_START( keroppij ) +MACHINE_CONFIG_START(seta_state::keroppij) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14318180/2) /* 7.143 MHz */ @@ -8862,7 +8862,7 @@ static MACHINE_CONFIG_START( keroppij ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( keroppi, keroppij ) +MACHINE_CONFIG_DERIVED(seta_state::keroppi, keroppij) MCFG_GFXDECODE_MODIFY("gfxdecode", tndrcade) MACHINE_CONFIG_END @@ -8870,7 +8870,7 @@ MACHINE_CONFIG_END Krazy Bowl ***************************************************************************/ -static MACHINE_CONFIG_START( krzybowl ) +MACHINE_CONFIG_START(seta_state::krzybowl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -8916,7 +8916,7 @@ MACHINE_CONFIG_END ***************************************************************************/ /* madshark: lev 2 by vblank, lev 4 by timer */ -static MACHINE_CONFIG_START( madshark ) +MACHINE_CONFIG_START(seta_state::madshark) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -8962,7 +8962,7 @@ MACHINE_CONFIG_END ***************************************************************************/ /* magspeed: lev 2 by vblank, lev 4 by timer */ -static MACHINE_CONFIG_START( magspeed ) +MACHINE_CONFIG_START(seta_state::magspeed) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -9007,7 +9007,7 @@ MACHINE_CONFIG_END /* msgundam lev 2 == lev 6 ! */ -static MACHINE_CONFIG_START( msgundam ) +MACHINE_CONFIG_START(seta_state::msgundam) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -9050,7 +9050,7 @@ MACHINE_CONFIG_END Oishii Puzzle ***************************************************************************/ -static MACHINE_CONFIG_START( oisipuzl ) +MACHINE_CONFIG_START(seta_state::oisipuzl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -9089,7 +9089,7 @@ MACHINE_CONFIG_END /* same as oisipuzl but with different interrupts and sound */ -static MACHINE_CONFIG_START( triplfun ) +MACHINE_CONFIG_START(seta_state::triplfun) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -9126,7 +9126,7 @@ MACHINE_CONFIG_END Pro Mahjong Kiwame ***************************************************************************/ -static MACHINE_CONFIG_START( kiwame ) +MACHINE_CONFIG_START(seta_state::kiwame) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -9173,7 +9173,7 @@ MACHINE_CONFIG_END /* pretty much like wrofaero, but ints are 1&2, not 2&4 */ -static MACHINE_CONFIG_START( rezon ) +MACHINE_CONFIG_START(seta_state::rezon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -9214,7 +9214,7 @@ MACHINE_CONFIG_END /* thunderl lev 2 = lev 3 - other levels lead to an error */ -static MACHINE_CONFIG_START( thunderl ) +MACHINE_CONFIG_START(seta_state::thunderl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */ @@ -9262,7 +9262,7 @@ static ADDRESS_MAP_START( thunderlbl_sound_portmap, AS_IO, 8, seta_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( thunderlbl, thunderl ) +MACHINE_CONFIG_DERIVED(seta_state::thunderlbl, thunderl) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -9284,7 +9284,7 @@ static MACHINE_CONFIG_DERIVED( thunderlbl, thunderl ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wiggie ) +MACHINE_CONFIG_START(seta_state::wiggie) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */ @@ -9322,12 +9322,12 @@ static MACHINE_CONFIG_START( wiggie ) MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( superbar, wiggie ) +MACHINE_CONFIG_DERIVED(seta_state::superbar, wiggie) MCFG_GFXDECODE_MODIFY("gfxdecode", superbar) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wits ) +MACHINE_CONFIG_START(seta_state::wits) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */ @@ -9364,7 +9364,7 @@ MACHINE_CONFIG_END Ultraman Club / SD Gundam Neo Battling ***************************************************************************/ -static MACHINE_CONFIG_START( umanclub ) +MACHINE_CONFIG_START(seta_state::umanclub) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -9401,7 +9401,7 @@ MACHINE_CONFIG_END Ultra Toukond Densetsu ***************************************************************************/ -static MACHINE_CONFIG_START( utoukond ) +MACHINE_CONFIG_START(seta_state::utoukond) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -9452,7 +9452,7 @@ MACHINE_CONFIG_END War of Aero ***************************************************************************/ -static MACHINE_CONFIG_START( wrofaero ) +MACHINE_CONFIG_START(seta_state::wrofaero) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -9506,7 +9506,7 @@ MACHINE_CONFIG_END at int 1 is necessary: it plays the background music. */ -static MACHINE_CONFIG_START( zingzip ) +MACHINE_CONFIG_START(seta_state::zingzip) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -9544,7 +9544,7 @@ static MACHINE_CONFIG_START( zingzip ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zingzipbl, zingzip ) +MACHINE_CONFIG_DERIVED(seta_state::zingzipbl, zingzip) MCFG_GFXDECODE_MODIFY("gfxdecode", zingzipbl) MCFG_DEVICE_REMOVE("maincpu") @@ -9563,7 +9563,7 @@ MACHINE_CONFIG_END Pairs Love ***************************************************************************/ -static MACHINE_CONFIG_START( pairlove ) +MACHINE_CONFIG_START(seta_state::pairlove) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */ @@ -9611,7 +9611,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta_state::crazyfgt_interrupt) m_maincpu->set_input_line(1, HOLD_LINE); } -static MACHINE_CONFIG_START( crazyfgt ) +MACHINE_CONFIG_START(seta_state::crazyfgt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -9672,7 +9672,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(jockeyc_state::interrupt) m_maincpu->set_input_line(6, HOLD_LINE); } -static MACHINE_CONFIG_START( jockeyc ) +MACHINE_CONFIG_START(jockeyc_state::jockeyc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // TMP68000N-8 @@ -9725,7 +9725,7 @@ MACHINE_CONFIG_END International Toote ***************************************************************************/ -static MACHINE_CONFIG_DERIVED( inttoote, jockeyc ) +MACHINE_CONFIG_DERIVED(jockeyc_state::inttoote, jockeyc) MCFG_DEVICE_REMOVE("maincpu") MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // TMP68HC000N-16 MCFG_CPU_PROGRAM_MAP(inttoote_map) diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp index cab41d4cfea..eb2d7493ccd 100644 --- a/src/mame/drivers/seta2.cpp +++ b/src/mame/drivers/seta2.cpp @@ -2503,7 +2503,7 @@ INTERRUPT_GEN_MEMBER(seta2_state::samshoot_interrupt) m_tmp68301->external_interrupt_2(); // to do: hook up x1-10 interrupts } -static MACHINE_CONFIG_START( seta2 ) +MACHINE_CONFIG_START(seta2_state::seta2) MCFG_CPU_ADD("maincpu", M68301, XTAL_50MHz/3) // !! TMP68301 !! MCFG_CPU_PROGRAM_MAP(mj4simai_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", seta2_state, seta2_interrupt) @@ -2536,13 +2536,13 @@ static MACHINE_CONFIG_START( seta2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mj4simai, seta2 ) +MACHINE_CONFIG_DERIVED(seta2_state::mj4simai, seta2) MCFG_MACHINE_START_OVERRIDE(seta2_state, mj4simai) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gundamex, seta2 ) +MACHINE_CONFIG_DERIVED(seta2_state::gundamex, seta2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(gundamex_map) @@ -2558,7 +2558,7 @@ static MACHINE_CONFIG_DERIVED( gundamex, seta2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( grdians, seta2 ) +MACHINE_CONFIG_DERIVED(seta2_state::grdians, seta2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(grdians_map) @@ -2568,7 +2568,7 @@ static MACHINE_CONFIG_DERIVED( grdians, seta2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( myangel, seta2 ) +MACHINE_CONFIG_DERIVED(seta2_state::myangel, seta2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(myangel_map) @@ -2580,7 +2580,7 @@ static MACHINE_CONFIG_DERIVED( myangel, seta2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( myangel2, seta2 ) +MACHINE_CONFIG_DERIVED(seta2_state::myangel2, seta2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(myangel2_map) @@ -2592,7 +2592,7 @@ static MACHINE_CONFIG_DERIVED( myangel2, seta2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pzlbowl, seta2 ) +MACHINE_CONFIG_DERIVED(seta2_state::pzlbowl, seta2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pzlbowl_map) @@ -2602,7 +2602,7 @@ static MACHINE_CONFIG_DERIVED( pzlbowl, seta2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( penbros, seta2 ) +MACHINE_CONFIG_DERIVED(seta2_state::penbros, seta2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(penbros_map) @@ -2611,7 +2611,7 @@ static MACHINE_CONFIG_DERIVED( penbros, seta2 ) MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0x80, 0x160-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ablastb, penbros ) +MACHINE_CONFIG_DERIVED(seta2_state::ablastb, penbros) MCFG_CPU_REPLACE("maincpu", M68000, XTAL_16MHz) // TMP68HC000P-16 MCFG_CPU_PROGRAM_MAP(ablastb_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", seta2_state, irq2_line_hold) @@ -2619,7 +2619,7 @@ static MACHINE_CONFIG_DERIVED( ablastb, penbros ) MCFG_DEVICE_REMOVE("tmp68301") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( reelquak, seta2 ) +MACHINE_CONFIG_DERIVED(seta2_state::reelquak, seta2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(reelquak_map) @@ -2637,7 +2637,7 @@ static MACHINE_CONFIG_DERIVED( reelquak, seta2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( samshoot, seta2 ) +MACHINE_CONFIG_DERIVED(seta2_state::samshoot, seta2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(samshoot_map) MCFG_CPU_PERIODIC_INT_DRIVER(seta2_state, samshoot_interrupt, 60) @@ -2653,7 +2653,7 @@ static MACHINE_CONFIG_DERIVED( samshoot, seta2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( staraudi, seta2 ) +MACHINE_CONFIG_DERIVED(staraudi_state::staraudi, seta2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(staraudi_map) @@ -2669,7 +2669,7 @@ static MACHINE_CONFIG_DERIVED( staraudi, seta2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( telpacfl, seta2 ) +MACHINE_CONFIG_DERIVED(seta2_state::telpacfl, seta2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(telpacfl_map) @@ -2715,7 +2715,7 @@ MACHINE_RESET_MEMBER(seta2_state, funcube) m_funcube_hopper_motor = 0; } -static MACHINE_CONFIG_START( funcube ) +MACHINE_CONFIG_START(seta2_state::funcube) MCFG_CPU_ADD("maincpu", MCF5206E, XTAL_25_447MHz) MCFG_CPU_PROGRAM_MAP(funcube_map) @@ -2760,7 +2760,7 @@ static MACHINE_CONFIG_START( funcube ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( funcube2, funcube ) +MACHINE_CONFIG_DERIVED(seta2_state::funcube2, funcube) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(funcube2_map) @@ -2773,14 +2773,14 @@ static MACHINE_CONFIG_DERIVED( funcube2, funcube ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( funcube3, funcube2 ) +MACHINE_CONFIG_DERIVED(seta2_state::funcube3, funcube2) // video hardware MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0x0, 0x140-1, 0x80-0x40, 0x170-1-0x40) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( namcostr ) +MACHINE_CONFIG_START(seta2_state::namcostr) MCFG_CPU_ADD("maincpu", M68301, XTAL_50MHz/3) // !! TMP68301 !! MCFG_CPU_PROGRAM_MAP(namcostr_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", seta2_state, seta2_interrupt) diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp index 8d5f5b9b9e0..28e3c448bcf 100644 --- a/src/mame/drivers/sf.cpp +++ b/src/mame/drivers/sf.cpp @@ -534,7 +534,7 @@ void sf_state::machine_reset() m_fgscroll = 0; } -static MACHINE_CONFIG_START( sfan ) +MACHINE_CONFIG_START(sf_state::sfan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) @@ -585,7 +585,7 @@ static MACHINE_CONFIG_START( sfan ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sfus, sfan ) +MACHINE_CONFIG_DERIVED(sf_state::sfus, sfan) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -593,7 +593,7 @@ static MACHINE_CONFIG_DERIVED( sfus, sfan ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sfjp, sfan ) +MACHINE_CONFIG_DERIVED(sf_state::sfjp, sfan) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -601,7 +601,7 @@ static MACHINE_CONFIG_DERIVED( sfjp, sfan ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sfp, sfan ) +MACHINE_CONFIG_DERIVED(sf_state::sfp, sfan) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp index f0f6854c677..43fe3327381 100644 --- a/src/mame/drivers/sfbonus.cpp +++ b/src/mame/drivers/sfbonus.cpp @@ -471,6 +471,7 @@ public: virtual void video_start() override; void draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int category); uint32_t screen_update_sfbonus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void sfbonus(machine_config &config); }; @@ -1360,7 +1361,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, sfbonus_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( sfbonus ) +MACHINE_CONFIG_START(sfbonus_state::sfbonus) MCFG_CPU_ADD("maincpu", Z80, 6000000) // custom packaged z80 CPU ?? Mhz MCFG_CPU_PROGRAM_MAP(sfbonus_map) MCFG_CPU_IO_MAP(sfbonus_io) diff --git a/src/mame/drivers/sfcbox.cpp b/src/mame/drivers/sfcbox.cpp index 4e03d1f0285..dd74e09009c 100644 --- a/src/mame/drivers/sfcbox.cpp +++ b/src/mame/drivers/sfcbox.cpp @@ -154,6 +154,7 @@ public: virtual void machine_reset() override; DECLARE_READ8_MEMBER(spc_ram_100_r); DECLARE_WRITE8_MEMBER(spc_ram_100_w); + void sfcbox(machine_config &config); }; uint32_t sfcbox_state::screen_update( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect ) @@ -445,7 +446,7 @@ void sfcbox_state::machine_reset() m_soundcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } -static MACHINE_CONFIG_START( sfcbox ) +MACHINE_CONFIG_START(sfcbox_state::sfcbox) /* base snes hardware */ MCFG_CPU_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */ diff --git a/src/mame/drivers/sfkick.cpp b/src/mame/drivers/sfkick.cpp index fda6f6bd190..c454e526cae 100644 --- a/src/mame/drivers/sfkick.cpp +++ b/src/mame/drivers/sfkick.cpp @@ -225,6 +225,7 @@ public: required_ioport m_dial; required_ioport m_dsw1; required_ioport m_dsw2; + void sfkick(machine_config &config); }; @@ -579,7 +580,7 @@ WRITE_LINE_MEMBER(sfkick_state::irqhandler) m_soundcpu->set_input_line_and_vector(0, state ? ASSERT_LINE : CLEAR_LINE, 0xff); } -static MACHINE_CONFIG_START( sfkick ) +MACHINE_CONFIG_START(sfkick_state::sfkick) MCFG_CPU_ADD("maincpu",Z80,MASTER_CLOCK/6) MCFG_CPU_PROGRAM_MAP(sfkick_map) diff --git a/src/mame/drivers/sg1000.cpp b/src/mame/drivers/sg1000.cpp index a4618334147..0ad913115dd 100644 --- a/src/mame/drivers/sg1000.cpp +++ b/src/mame/drivers/sg1000.cpp @@ -517,7 +517,7 @@ void sf7000_state::machine_reset() MACHINE_CONFIG_START( sg1000 ) -------------------------------------------------*/ -static MACHINE_CONFIG_START( sg1000 ) +MACHINE_CONFIG_START(sg1000_state::sg1000) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10_738635MHz/3) MCFG_CPU_PROGRAM_MAP(sg1000_map) @@ -554,7 +554,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED( omv, sg1000 ) -------------------------------------------------*/ -static MACHINE_CONFIG_DERIVED( omv, sg1000 ) +MACHINE_CONFIG_DERIVED(sg1000_state::omv, sg1000) MCFG_CPU_MODIFY(Z80_TAG) MCFG_CPU_PROGRAM_MAP(omv_map) MCFG_CPU_IO_MAP(omv_io_map) @@ -570,7 +570,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START( sc3000 ) -------------------------------------------------*/ -static MACHINE_CONFIG_START( sc3000 ) +MACHINE_CONFIG_START(sc3000_state::sc3000) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10_738635MHz/3) // LH0080A MCFG_CPU_PROGRAM_MAP(sc3000_map) @@ -608,7 +608,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START( sf7000 ) -------------------------------------------------*/ -static MACHINE_CONFIG_START( sf7000 ) +MACHINE_CONFIG_START(sf7000_state::sf7000) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10_738635MHz/3) MCFG_CPU_PROGRAM_MAP(sf7000_map) diff --git a/src/mame/drivers/sg1000a.cpp b/src/mame/drivers/sg1000a.cpp index f103d5e906f..70404c5106a 100644 --- a/src/mame/drivers/sg1000a.cpp +++ b/src/mame/drivers/sg1000a.cpp @@ -290,6 +290,9 @@ public: DECLARE_DRIVER_INIT(sg1000a); required_device m_maincpu; optional_shared_ptr m_decrypted_opcodes; + void sderby2s(machine_config &config); + void sg1000ax(machine_config &config); + void sg1000a(machine_config &config); }; @@ -454,7 +457,7 @@ WRITE8_MEMBER(sg1000a_state::sg1000a_coin_counter_w) * *************************************/ -static MACHINE_CONFIG_START( sg1000a ) +MACHINE_CONFIG_START(sg1000a_state::sg1000a) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) MCFG_CPU_PROGRAM_MAP(program_map) @@ -481,7 +484,7 @@ static MACHINE_CONFIG_START( sg1000a ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sg1000ax, sg1000a ) +MACHINE_CONFIG_DERIVED(sg1000a_state::sg1000ax, sg1000a) MCFG_CPU_REPLACE("maincpu", SEGA_315_5033, XTAL_3_579545MHz) MCFG_CPU_PROGRAM_MAP(program_map) MCFG_CPU_IO_MAP(io_map) @@ -489,7 +492,7 @@ static MACHINE_CONFIG_DERIVED( sg1000ax, sg1000a ) MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sderby2s, sg1000a ) +MACHINE_CONFIG_DERIVED(sg1000a_state::sderby2s, sg1000a) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(XTAL_10_738635MHz / 3) MCFG_CPU_IO_MAP(sderby2_io_map) diff --git a/src/mame/drivers/sh4robot.cpp b/src/mame/drivers/sh4robot.cpp index a61d47ec513..e5c6ed0ece0 100644 --- a/src/mame/drivers/sh4robot.cpp +++ b/src/mame/drivers/sh4robot.cpp @@ -41,6 +41,7 @@ public: , m_maincpu(*this, "maincpu") { } + void sh4robot(machine_config &config); private: required_device m_maincpu; }; @@ -61,7 +62,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( sh4robot ) INPUT_PORTS_END -static MACHINE_CONFIG_START( sh4robot ) +MACHINE_CONFIG_START(sh4robot_state::sh4robot) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH4LE, 200000000) // SH7750 MCFG_SH4_MD0(1) diff --git a/src/mame/drivers/shadfrce.cpp b/src/mame/drivers/shadfrce.cpp index 1e12b32a2e0..342ca62c794 100644 --- a/src/mame/drivers/shadfrce.cpp +++ b/src/mame/drivers/shadfrce.cpp @@ -532,7 +532,7 @@ GFXDECODE_END /* Machine Driver Bits */ -static MACHINE_CONFIG_START( shadfrce ) +MACHINE_CONFIG_START(shadfrce_state::shadfrce) MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(shadfrce_map) diff --git a/src/mame/drivers/shangha3.cpp b/src/mame/drivers/shangha3.cpp index 483f36a5177..ef9e0392645 100644 --- a/src/mame/drivers/shangha3.cpp +++ b/src/mame/drivers/shangha3.cpp @@ -443,7 +443,7 @@ static GFXDECODE_START( shangha3 ) GFXDECODE_END -static MACHINE_CONFIG_START( shangha3 ) +MACHINE_CONFIG_START(shangha3_state::shangha3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_48MHz/3) // TMP68HC000N-16 @@ -480,7 +480,7 @@ static MACHINE_CONFIG_START( shangha3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( heberpop ) +MACHINE_CONFIG_START(shangha3_state::heberpop) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_48MHz/3) // TMP68HC000N-16 like the others?? @@ -524,7 +524,7 @@ static MACHINE_CONFIG_START( heberpop ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( blocken ) +MACHINE_CONFIG_START(shangha3_state::blocken) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_48MHz/3) // TMP68HC000N-16 diff --git a/src/mame/drivers/shanghai.cpp b/src/mame/drivers/shanghai.cpp index da6e6e67ade..dcc3fc4fe77 100644 --- a/src/mame/drivers/shanghai.cpp +++ b/src/mame/drivers/shanghai.cpp @@ -43,6 +43,9 @@ public: DECLARE_PALETTE_INIT(shanghai); INTERRUPT_GEN_MEMBER(half_vblank_irq); + void shanghai(machine_config &config); + void shangha2(machine_config &config); + void kothello(machine_config &config); private: required_device m_maincpu; required_device m_screen; @@ -378,7 +381,7 @@ static ADDRESS_MAP_START( hd63484_map, 0, 16, shanghai_state ) AM_RANGE(0x00000, 0x3ffff) AM_RAM ADDRESS_MAP_END -static MACHINE_CONFIG_START( shanghai ) +MACHINE_CONFIG_START(shanghai_state::shanghai) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz/2) /* NEC D70116C-8 */ @@ -414,7 +417,7 @@ static MACHINE_CONFIG_START( shanghai ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( shangha2 ) +MACHINE_CONFIG_START(shanghai_state::shangha2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz/2) /* ? */ @@ -449,7 +452,7 @@ static MACHINE_CONFIG_START( shangha2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( kothello ) +MACHINE_CONFIG_START(shanghai_state::kothello) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz) diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp index 01d70d397f5..9c0b1fbfbc0 100644 --- a/src/mame/drivers/shangkid.cpp +++ b/src/mame/drivers/shangkid.cpp @@ -366,7 +366,7 @@ ADDRESS_MAP_END /***************************************************************************************/ -static MACHINE_CONFIG_START( chinhero ) +MACHINE_CONFIG_START(shangkid_state::chinhero) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */ @@ -422,7 +422,7 @@ static MACHINE_CONFIG_START( chinhero ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shangkid, chinhero ) +MACHINE_CONFIG_DERIVED(shangkid_state::shangkid, chinhero) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -472,7 +472,7 @@ static ADDRESS_MAP_START( dynamski_portmap, AS_IO, 8, shangkid_state ) AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_device, data_address_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START( dynamski ) +MACHINE_CONFIG_START(shangkid_state::dynamski) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3000000) /* ? */ diff --git a/src/mame/drivers/shaolins.cpp b/src/mame/drivers/shaolins.cpp index 00ef4091e34..b0bb076a8dc 100644 --- a/src/mame/drivers/shaolins.cpp +++ b/src/mame/drivers/shaolins.cpp @@ -192,7 +192,7 @@ static GFXDECODE_START( shaolins ) GFXDECODE_END -static MACHINE_CONFIG_START( shaolins ) +MACHINE_CONFIG_START(shaolins_state::shaolins) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/12) /* verified on pcb */ diff --git a/src/mame/drivers/shisen.cpp b/src/mame/drivers/shisen.cpp index 7297973182b..42b8a700102 100644 --- a/src/mame/drivers/shisen.cpp +++ b/src/mame/drivers/shisen.cpp @@ -207,7 +207,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( shisen ) +MACHINE_CONFIG_START(shisen_state::shisen) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 6000000) /* 6 MHz ? */ diff --git a/src/mame/drivers/shootaway2.cpp b/src/mame/drivers/shootaway2.cpp index c438292d689..12335f54b13 100644 --- a/src/mame/drivers/shootaway2.cpp +++ b/src/mame/drivers/shootaway2.cpp @@ -36,6 +36,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void m74(machine_config &config); protected: // devices @@ -75,7 +76,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( m74 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( m74 ) +MACHINE_CONFIG_START(m74_state::m74) MCFG_CPU_ADD("maincpu", M37450, XTAL_8MHz) /* C68 @ 8.0MHz - main CPU */ MCFG_CPU_PROGRAM_MAP(c68_map) diff --git a/src/mame/drivers/shootout.cpp b/src/mame/drivers/shootout.cpp index b168d83b020..0306db19002 100644 --- a/src/mame/drivers/shootout.cpp +++ b/src/mame/drivers/shootout.cpp @@ -273,7 +273,7 @@ void shootout_state::machine_reset () m_ccnt_old_val = 0x40; } -static MACHINE_CONFIG_START( shootout ) +MACHINE_CONFIG_START(shootout_state::shootout) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", DECO_222, XTAL_12MHz / 6) // 2 MHz? @@ -306,7 +306,7 @@ static MACHINE_CONFIG_START( shootout ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( shootouj ) +MACHINE_CONFIG_START(shootout_state::shootouj) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz / 6) // 2 MHz? (Assuming the same XTAL as DE-0219 pcb) @@ -337,7 +337,7 @@ static MACHINE_CONFIG_START( shootouj ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shootouk, shootouj ) +MACHINE_CONFIG_DERIVED(shootout_state::shootouk, shootouj) /* the Korean 'bootleg' has the usual DECO222 style encryption */ MCFG_DEVICE_REMOVE("maincpu") MCFG_CPU_ADD("maincpu", DECO_222, XTAL_12MHz / 6) // 2 MHz? (Assuming the same XTAL as DE-0219 pcb) diff --git a/src/mame/drivers/shougi.cpp b/src/mame/drivers/shougi.cpp index cc7e04ad10a..af9e082721e 100644 --- a/src/mame/drivers/shougi.cpp +++ b/src/mame/drivers/shougi.cpp @@ -118,6 +118,7 @@ public: INTERRUPT_GEN_MEMBER(vblank_nmi); virtual void machine_start() override; + void shougi(machine_config &config); }; @@ -360,7 +361,7 @@ INTERRUPT_GEN_MEMBER(shougi_state::vblank_nmi) } -static MACHINE_CONFIG_START( shougi ) +MACHINE_CONFIG_START(shougi_state::shougi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/4) diff --git a/src/mame/drivers/shtzone.cpp b/src/mame/drivers/shtzone.cpp index 9adb3247e6e..1f1a197c420 100644 --- a/src/mame/drivers/shtzone.cpp +++ b/src/mame/drivers/shtzone.cpp @@ -62,6 +62,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_shtzone(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void shtzone(machine_config &config); }; static ADDRESS_MAP_START( shtzone_map, AS_PROGRAM, 8, shtzone_state ) @@ -93,7 +94,7 @@ uint32_t shtzone_state::screen_update_shtzone(screen_device &screen, bitmap_ind1 } -static MACHINE_CONFIG_START( shtzone ) +MACHINE_CONFIG_START(shtzone_state::shtzone) /* basic machine hardware */ MCFG_CPU_ADD("timercpu", Z80,10738000/4) diff --git a/src/mame/drivers/shuuz.cpp b/src/mame/drivers/shuuz.cpp index 07e150c8baa..86fa68170f1 100644 --- a/src/mame/drivers/shuuz.cpp +++ b/src/mame/drivers/shuuz.cpp @@ -231,7 +231,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( shuuz ) +MACHINE_CONFIG_START(shuuz_state::shuuz) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) diff --git a/src/mame/drivers/sidearms.cpp b/src/mame/drivers/sidearms.cpp index 7bc16753437..fc96bfee87e 100644 --- a/src/mame/drivers/sidearms.cpp +++ b/src/mame/drivers/sidearms.cpp @@ -593,7 +593,7 @@ static GFXDECODE_START( turtship ) GFXDECODE_END -static MACHINE_CONFIG_START( sidearms ) +MACHINE_CONFIG_START(sidearms_state::sidearms) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */ @@ -642,7 +642,7 @@ static MACHINE_CONFIG_START( sidearms ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( turtship ) +MACHINE_CONFIG_START(sidearms_state::turtship) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */ @@ -690,7 +690,7 @@ static MACHINE_CONFIG_START( turtship ) MCFG_SOUND_ROUTE(3, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( whizz ) +MACHINE_CONFIG_START(sidearms_state::whizz) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */ diff --git a/src/mame/drivers/sidepckt.cpp b/src/mame/drivers/sidepckt.cpp index 701e6844a2a..d19c22f4e8c 100644 --- a/src/mame/drivers/sidepckt.cpp +++ b/src/mame/drivers/sidepckt.cpp @@ -366,7 +366,7 @@ void sidepckt_state::machine_reset() m_scroll_y = 0; } -static MACHINE_CONFIG_START( sidepckt ) +MACHINE_CONFIG_START(sidepckt_state::sidepckt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) /* 2 MHz */ @@ -403,7 +403,7 @@ static MACHINE_CONFIG_START( sidepckt ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sidepcktb, sidepckt ) +MACHINE_CONFIG_DERIVED(sidepckt_state::sidepcktb, sidepckt) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/sigmab52.cpp b/src/mame/drivers/sigmab52.cpp index 521cb260376..1759ead0868 100644 --- a/src/mame/drivers/sigmab52.cpp +++ b/src/mame/drivers/sigmab52.cpp @@ -177,6 +177,7 @@ public: uint64_t m_coin_start_cycles; uint64_t m_hopper_start_cycles; int m_audiocpu_cmd_irq; + void jwildb52(machine_config &config); }; @@ -572,7 +573,7 @@ void sigmab52_state::machine_reset() * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( jwildb52 ) +MACHINE_CONFIG_START(sigmab52_state::jwildb52) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_8MHz) diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp index 5f8259a8c2e..fc6796367db 100644 --- a/src/mame/drivers/sigmab98.cpp +++ b/src/mame/drivers/sigmab98.cpp @@ -277,6 +277,17 @@ public: INTERRUPT_GEN_MEMBER(sigmab98_vblank_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(sammymdl_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri_mask); + void sigmab98(machine_config &config); + void pyenaget(machine_config &config); + void dodghero(machine_config &config); + void dashhero(machine_config &config); + void gegege(machine_config &config); + void haekaka(machine_config &config); + void gocowboy(machine_config &config); + void tdoboon(machine_config &config); + void animalc(machine_config &config); + void sammymdl(machine_config &config); + void itazuram(machine_config &config); }; @@ -2498,7 +2509,7 @@ INTERRUPT_GEN_MEMBER(sigmab98_state::sigmab98_vblank_interrupt) device.execute().set_input_line_and_vector(0, HOLD_LINE, 0x5a); } -static MACHINE_CONFIG_START( sigmab98 ) +MACHINE_CONFIG_START(sigmab98_state::sigmab98) MCFG_CPU_ADD("maincpu", Z80, 10000000) // !! TAXAN KY-80, clock @X1? !! MCFG_CPU_PROGRAM_MAP(gegege_mem_map) MCFG_CPU_IO_MAP(gegege_io_map) @@ -2535,19 +2546,19 @@ static MACHINE_CONFIG_START( sigmab98 ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dodghero, sigmab98 ) +MACHINE_CONFIG_DERIVED(sigmab98_state::dodghero, sigmab98) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP( dodghero_mem_map ) MCFG_CPU_IO_MAP( dodghero_io_map ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gegege, sigmab98 ) +MACHINE_CONFIG_DERIVED(sigmab98_state::gegege, sigmab98) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP( gegege_mem_map ) MCFG_CPU_IO_MAP( gegege_io_map ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dashhero, sigmab98 ) +MACHINE_CONFIG_DERIVED(sigmab98_state::dashhero, sigmab98) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP( gegege_mem_map ) MCFG_CPU_IO_MAP( dashhero_io_map ) @@ -2579,7 +2590,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(sigmab98_state::sammymdl_irq) m_maincpu->set_input_line_and_vector(0,HOLD_LINE, m_timer1_vector); } -static MACHINE_CONFIG_START( sammymdl ) +MACHINE_CONFIG_START(sigmab98_state::sammymdl) MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz / 2) // !! KL5C80A120FP @ 10MHz? (actually 4 times faster than Z80) !! MCFG_CPU_PROGRAM_MAP( animalc_map ) MCFG_CPU_IO_MAP( animalc_io ) @@ -2619,13 +2630,13 @@ static MACHINE_CONFIG_START( sammymdl ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( animalc, sammymdl ) +MACHINE_CONFIG_DERIVED(sigmab98_state::animalc, sammymdl) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP( animalc_map ) MCFG_CPU_IO_MAP( animalc_io ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gocowboy, sammymdl ) +MACHINE_CONFIG_DERIVED(sigmab98_state::gocowboy, sammymdl) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP( gocowboy_map ) MCFG_CPU_IO_MAP( gocowboy_io ) @@ -2635,25 +2646,25 @@ static MACHINE_CONFIG_DERIVED( gocowboy, sammymdl ) MCFG_TICKET_DISPENSER_ADD("hopper_large", attotime::from_msec(1000), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( haekaka, sammymdl ) +MACHINE_CONFIG_DERIVED(sigmab98_state::haekaka, sammymdl) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP( haekaka_map ) MCFG_CPU_IO_MAP( haekaka_io ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( itazuram, sammymdl ) +MACHINE_CONFIG_DERIVED(sigmab98_state::itazuram, sammymdl) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP( itazuram_map ) MCFG_CPU_IO_MAP( itazuram_io ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pyenaget, sammymdl ) +MACHINE_CONFIG_DERIVED(sigmab98_state::pyenaget, sammymdl) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP( haekaka_map ) MCFG_CPU_IO_MAP( pyenaget_io ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tdoboon, sammymdl ) +MACHINE_CONFIG_DERIVED(sigmab98_state::tdoboon, sammymdl) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP( tdoboon_map ) MCFG_CPU_IO_MAP( tdoboon_io ) diff --git a/src/mame/drivers/silkroad.cpp b/src/mame/drivers/silkroad.cpp index 08a8d81e729..6926d43fe1c 100644 --- a/src/mame/drivers/silkroad.cpp +++ b/src/mame/drivers/silkroad.cpp @@ -273,7 +273,7 @@ static GFXDECODE_START( silkroad ) GFXDECODE_ENTRY( "gfx1", 0, tiles16x16x6_layout, 0x0000, 256 ) GFXDECODE_END -static MACHINE_CONFIG_START( silkroad ) +MACHINE_CONFIG_START(silkroad_state::silkroad) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* 16MHz */ diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp index d77d20c49c7..c4830c1c4e0 100644 --- a/src/mame/drivers/silvmil.cpp +++ b/src/mame/drivers/silvmil.cpp @@ -132,6 +132,9 @@ public: virtual void video_start() override; uint32_t screen_update_silvmil(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void tumblepb_gfx1_rearrange(); + void puzzlovek(machine_config &config); + void puzzlove(machine_config &config); + void silvmil(machine_config &config); }; @@ -395,7 +398,7 @@ static ADDRESS_MAP_START( silvmil_sound_map, AS_PROGRAM, 8, silvmil_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( silvmil ) +MACHINE_CONFIG_START(silvmil_state::silvmil) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* Verified */ @@ -438,7 +441,7 @@ static MACHINE_CONFIG_START( silvmil ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( puzzlove, silvmil ) +MACHINE_CONFIG_DERIVED(silvmil_state::puzzlove, silvmil) MCFG_DEVICE_REMOVE("audiocpu") MCFG_CPU_ADD("audiocpu", Z80, XTAL_4MHz) /* Verified */ MCFG_CPU_PROGRAM_MAP(silvmil_sound_map) @@ -451,7 +454,7 @@ static MACHINE_CONFIG_DERIVED( puzzlove, silvmil ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( puzzlovek, puzzlove ) +MACHINE_CONFIG_DERIVED(silvmil_state::puzzlovek, puzzlove) MCFG_DEVICE_REMOVE("ymsnd") MCFG_YM2151_ADD("ymsnd", XTAL_15MHz/4) /* Verified */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) diff --git a/src/mame/drivers/simpl156.cpp b/src/mame/drivers/simpl156.cpp index 0cc4ee135e5..cc90d653258 100644 --- a/src/mame/drivers/simpl156.cpp +++ b/src/mame/drivers/simpl156.cpp @@ -396,7 +396,7 @@ DECOSPR_PRIORITY_CB_MEMBER(simpl156_state::pri_callback) } -static MACHINE_CONFIG_START( chainrec ) +MACHINE_CONFIG_START(simpl156_state::chainrec) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM, 28000000 /* /4 */) /*DE156*/ /* 7.000 MHz */ /* measured at 7.. seems to need 28? */ @@ -451,28 +451,28 @@ static MACHINE_CONFIG_START( chainrec ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( magdrop, chainrec ) +MACHINE_CONFIG_DERIVED(simpl156_state::magdrop, chainrec) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(magdrop_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( magdropp, chainrec ) +MACHINE_CONFIG_DERIVED(simpl156_state::magdropp, chainrec) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(magdropp_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( joemacr, chainrec ) +MACHINE_CONFIG_DERIVED(simpl156_state::joemacr, chainrec) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(joemacr_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mitchell156, chainrec ) +MACHINE_CONFIG_DERIVED(simpl156_state::mitchell156, chainrec) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/simple_st0016.cpp b/src/mame/drivers/simple_st0016.cpp index f5cd2606a71..21c4e5a1fe2 100644 --- a/src/mame/drivers/simple_st0016.cpp +++ b/src/mame/drivers/simple_st0016.cpp @@ -462,7 +462,7 @@ uint32_t st0016_state::screen_update_st0016(screen_device &screen, bitmap_ind16 } -static MACHINE_CONFIG_START( st0016 ) +MACHINE_CONFIG_START(st0016_state::st0016) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",ST0016_CPU,8000000) /* 8 MHz ? */ MCFG_CPU_PROGRAM_MAP(st0016_mem) @@ -483,7 +483,7 @@ static MACHINE_CONFIG_START( st0016 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mayjinsn, st0016 ) +MACHINE_CONFIG_DERIVED(st0016_state::mayjinsn, st0016) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(st0016_m2_io) MCFG_CPU_ADD("sub", V810, 10000000)//25 Mhz ? @@ -491,7 +491,7 @@ static MACHINE_CONFIG_DERIVED( mayjinsn, st0016 ) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( renju, st0016 ) +MACHINE_CONFIG_DERIVED(st0016_state::renju, st0016) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(renju_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/simpsons.cpp b/src/mame/drivers/simpsons.cpp index cf9ecf32def..ef1af90a889 100644 --- a/src/mame/drivers/simpsons.cpp +++ b/src/mame/drivers/simpsons.cpp @@ -317,7 +317,7 @@ INTERRUPT_GEN_MEMBER(simpsons_state::simpsons_irq) device.execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE); } -static MACHINE_CONFIG_START( simpsons ) +MACHINE_CONFIG_START(simpsons_state::simpsons) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 053248, the clock input is 12MHz, and internal CPU divider of 4 */ diff --git a/src/mame/drivers/sitcom.cpp b/src/mame/drivers/sitcom.cpp index a23a0cc3f5e..62b40779f72 100644 --- a/src/mame/drivers/sitcom.cpp +++ b/src/mame/drivers/sitcom.cpp @@ -74,6 +74,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(update_buttons); + void sitcom(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -113,6 +114,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(update_shutter); DECLARE_INPUT_CHANGED_MEMBER(update_speed); + void sitcomtmr(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -329,7 +331,7 @@ void sitcom_timer_state::update_dac(uint8_t value) } -MACHINE_CONFIG_START( sitcom ) +MACHINE_CONFIG_START(sitcom_state::sitcom) // basic machine hardware MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz) // 3.072MHz can be used for an old slow 8085 MCFG_CPU_PROGRAM_MAP(sitcom_mem) @@ -367,7 +369,7 @@ MACHINE_CONFIG_START( sitcom ) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( sitcomtmr, sitcom ) +MACHINE_CONFIG_DERIVED(sitcom_timer_state::sitcomtmr, sitcom) MCFG_DEVICE_ADD("ds2", DL1414T, 0) // remote display MCFG_DL1414_UPDATE_HANDLER(WRITE16(sitcom_state, update_ds<2>)) diff --git a/src/mame/drivers/skeetsht.cpp b/src/mame/drivers/skeetsht.cpp index 6155b28c9c7..734836cd007 100644 --- a/src/mame/drivers/skeetsht.cpp +++ b/src/mame/drivers/skeetsht.cpp @@ -60,6 +60,7 @@ public: required_device m_68hc11; required_device m_ay; required_device m_tms; + void skeetsht(machine_config &config); }; @@ -227,7 +228,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( skeetsht ) +MACHINE_CONFIG_START(skeetsht_state::skeetsht) MCFG_CPU_ADD("68hc11", MC68HC11, 4000000) // ? MCFG_CPU_PROGRAM_MAP(hc11_pgm_map) diff --git a/src/mame/drivers/skimaxx.cpp b/src/mame/drivers/skimaxx.cpp index 89cdd79900f..9ac2c5a768f 100644 --- a/src/mame/drivers/skimaxx.cpp +++ b/src/mame/drivers/skimaxx.cpp @@ -90,6 +90,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; + void skimaxx(machine_config &config); }; @@ -493,7 +494,7 @@ void skimaxx_state::machine_reset() * *************************************/ -static MACHINE_CONFIG_START( skimaxx ) +MACHINE_CONFIG_START(skimaxx_state::skimaxx) MCFG_CPU_ADD("maincpu", M68EC030, XTAL_40MHz) MCFG_CPU_PROGRAM_MAP(68030_1_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", skimaxx_state, irq3_line_hold) // 1,3,7 are identical, rest is RTE diff --git a/src/mame/drivers/skullxbo.cpp b/src/mame/drivers/skullxbo.cpp index 8986f5abad0..59750e92593 100644 --- a/src/mame/drivers/skullxbo.cpp +++ b/src/mame/drivers/skullxbo.cpp @@ -225,7 +225,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( skullxbo ) +MACHINE_CONFIG_START(skullxbo_state::skullxbo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) diff --git a/src/mame/drivers/skyarmy.cpp b/src/mame/drivers/skyarmy.cpp index 0f73cb76649..6a96bdee22c 100644 --- a/src/mame/drivers/skyarmy.cpp +++ b/src/mame/drivers/skyarmy.cpp @@ -73,6 +73,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(nmi_source); + void skyarmy(machine_config &config); }; void skyarmy_state::machine_start() @@ -315,7 +316,7 @@ static GFXDECODE_START( skyarmy ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 8 ) GFXDECODE_END -static MACHINE_CONFIG_START( skyarmy ) +MACHINE_CONFIG_START(skyarmy_state::skyarmy) MCFG_CPU_ADD("maincpu", Z80,4000000) MCFG_CPU_PROGRAM_MAP(skyarmy_map) diff --git a/src/mame/drivers/skydiver.cpp b/src/mame/drivers/skydiver.cpp index 511a08074d9..f94be2be40a 100644 --- a/src/mame/drivers/skydiver.cpp +++ b/src/mame/drivers/skydiver.cpp @@ -346,7 +346,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( skydiver ) +MACHINE_CONFIG_START(skydiver_state::skydiver) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800,MASTER_CLOCK/16) /* ???? */ diff --git a/src/mame/drivers/skyfox.cpp b/src/mame/drivers/skyfox.cpp index 332b28c89d0..6083bd8f652 100644 --- a/src/mame/drivers/skyfox.cpp +++ b/src/mame/drivers/skyfox.cpp @@ -220,7 +220,7 @@ void skyfox_state::machine_reset() m_bg_ctrl = 0; } -static MACHINE_CONFIG_START( skyfox ) +MACHINE_CONFIG_START(skyfox_state::skyfox) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* Verified at 4MHz */ diff --git a/src/mame/drivers/skykid.cpp b/src/mame/drivers/skykid.cpp index 6f28a46a259..30b9ac8b179 100644 --- a/src/mame/drivers/skykid.cpp +++ b/src/mame/drivers/skykid.cpp @@ -435,7 +435,7 @@ INTERRUPT_GEN_MEMBER(skykid_state::mcu_vblank_irq) } -static MACHINE_CONFIG_START( skykid ) +MACHINE_CONFIG_START(skykid_state::skykid) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_49_152MHz/32) diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp index 8d371a4dc46..93e989892de 100644 --- a/src/mame/drivers/skylncr.cpp +++ b/src/mame/drivers/skylncr.cpp @@ -213,6 +213,11 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_hopper; + void neraidou(machine_config &config); + void sstar97(machine_config &config); + void bdream97(machine_config &config); + void skylncr(machine_config &config); + void mbutrfly(machine_config &config); }; @@ -1616,7 +1621,7 @@ INTERRUPT_GEN_MEMBER(skylncr_state::skylncr_vblank_interrupt) * Machine Driver * *************************************/ -static MACHINE_CONFIG_START( skylncr ) +MACHINE_CONFIG_START(skylncr_state::skylncr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4) @@ -1666,14 +1671,14 @@ static MACHINE_CONFIG_START( skylncr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mbutrfly, skylncr ) +MACHINE_CONFIG_DERIVED(skylncr_state::mbutrfly, skylncr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(io_map_mbutrfly) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( neraidou, skylncr ) +MACHINE_CONFIG_DERIVED(skylncr_state::neraidou, skylncr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1681,7 +1686,7 @@ static MACHINE_CONFIG_DERIVED( neraidou, skylncr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sstar97, skylncr ) +MACHINE_CONFIG_DERIVED(skylncr_state::sstar97, skylncr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1689,7 +1694,7 @@ static MACHINE_CONFIG_DERIVED( sstar97, skylncr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bdream97, skylncr ) +MACHINE_CONFIG_DERIVED(skylncr_state::bdream97, skylncr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/skyraid.cpp b/src/mame/drivers/skyraid.cpp index 1f9374c1a3d..a3480617685 100644 --- a/src/mame/drivers/skyraid.cpp +++ b/src/mame/drivers/skyraid.cpp @@ -218,7 +218,7 @@ static GFXDECODE_START( skyraid ) GFXDECODE_END -static MACHINE_CONFIG_START( skyraid ) +MACHINE_CONFIG_START(skyraid_state::skyraid) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 12096000 / 12) diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp index 7db3ef20492..7857866d11e 100644 --- a/src/mame/drivers/slapfght.cpp +++ b/src/mame/drivers/slapfght.cpp @@ -873,7 +873,7 @@ GFXDECODE_END ***************************************************************************/ -static MACHINE_CONFIG_START( perfrman ) +MACHINE_CONFIG_START(slapfght_state::perfrman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/4) // 4MHz? XTAL is known, divider is guessed @@ -924,7 +924,7 @@ static MACHINE_CONFIG_START( perfrman ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tigerh ) +MACHINE_CONFIG_START(slapfght_state::tigerh) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_36MHz/6) // 6MHz @@ -975,7 +975,7 @@ static MACHINE_CONFIG_START( tigerh ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tigerhb1, tigerh ) +MACHINE_CONFIG_DERIVED(slapfght_state::tigerhb1, tigerh) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -985,7 +985,7 @@ static MACHINE_CONFIG_DERIVED( tigerhb1, tigerh ) MCFG_DEVICE_REMOVE("bmcu") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tigerhb2, tigerhb1 ) +MACHINE_CONFIG_DERIVED(slapfght_state::tigerhb2, tigerhb1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -993,7 +993,7 @@ static MACHINE_CONFIG_DERIVED( tigerhb2, tigerhb1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( slapfigh ) +MACHINE_CONFIG_START(slapfght_state::slapfigh) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_36MHz/6) // 6MHz @@ -1046,7 +1046,7 @@ static MACHINE_CONFIG_START( slapfigh ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( slapfighb1, slapfigh ) +MACHINE_CONFIG_DERIVED(slapfght_state::slapfighb1, slapfigh) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1056,21 +1056,21 @@ static MACHINE_CONFIG_DERIVED( slapfighb1, slapfigh ) MCFG_DEVICE_REMOVE("bmcu") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( slapfighb2, slapfighb1 ) +MACHINE_CONFIG_DERIVED(slapfght_state::slapfighb2, slapfighb1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(slapfighb2_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( getstarb1, slapfighb1 ) +MACHINE_CONFIG_DERIVED(slapfght_state::getstarb1, slapfighb1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(getstarb1_io_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( getstarb2, slapfighb1 ) +MACHINE_CONFIG_DERIVED(slapfght_state::getstarb2, slapfighb1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/slapshot.cpp b/src/mame/drivers/slapshot.cpp index 0d353b3166f..02fb381b315 100644 --- a/src/mame/drivers/slapshot.cpp +++ b/src/mame/drivers/slapshot.cpp @@ -469,7 +469,7 @@ void slapshot_state::machine_start() } -static MACHINE_CONFIG_START( slapshot ) +MACHINE_CONFIG_START(slapshot_state::slapshot) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */ @@ -530,7 +530,7 @@ static MACHINE_CONFIG_START( slapshot ) MCFG_TC0140SYT_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( opwolf3 ) +MACHINE_CONFIG_START(slapshot_state::opwolf3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */ diff --git a/src/mame/drivers/slc1.cpp b/src/mame/drivers/slc1.cpp index f0311452563..8970c721810 100644 --- a/src/mame/drivers/slc1.cpp +++ b/src/mame/drivers/slc1.cpp @@ -67,6 +67,7 @@ public: DECLARE_READ8_MEMBER( io_r ); DECLARE_WRITE8_MEMBER( io_w ); + void slc1(machine_config &config); private: uint8_t m_digit; bool m_kbd_type; @@ -253,7 +254,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( slc1 ) +MACHINE_CONFIG_START(slc1_state::slc1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2500000) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/sleic.cpp b/src/mame/drivers/sleic.cpp index 537706fd8fe..4464d34d885 100644 --- a/src/mame/drivers/sleic.cpp +++ b/src/mame/drivers/sleic.cpp @@ -36,6 +36,7 @@ public: m_maincpu(*this, "maincpu") { } + void sleic(machine_config &config); protected: // devices @@ -64,7 +65,7 @@ DRIVER_INIT_MEMBER(sleic_state,sleic) { } -static MACHINE_CONFIG_START( sleic ) +MACHINE_CONFIG_START(sleic_state::sleic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, 8000000) MCFG_CPU_PROGRAM_MAP(sleic_map) diff --git a/src/mame/drivers/slicer.cpp b/src/mame/drivers/slicer.cpp index 872a69b7da4..1fe518d461f 100644 --- a/src/mame/drivers/slicer.cpp +++ b/src/mame/drivers/slicer.cpp @@ -27,6 +27,7 @@ public: DECLARE_WRITE8_MEMBER(sio_out_w); template DECLARE_WRITE_LINE_MEMBER(drive_sel_w); + void slicer(machine_config &config); protected: required_device m_fdc; required_device m_sasi; @@ -83,7 +84,7 @@ static SLOT_INTERFACE_START( slicer_floppies ) SLOT_INTERFACE("8dsdd", FLOPPY_8_DSDD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( slicer ) +MACHINE_CONFIG_START(slicer_state::slicer) MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz / 2) MCFG_CPU_PROGRAM_MAP(slicer_map) MCFG_CPU_IO_MAP(slicer_io) diff --git a/src/mame/drivers/sliver.cpp b/src/mame/drivers/sliver.cpp index dfc5269ea90..84d53ba490d 100644 --- a/src/mame/drivers/sliver.cpp +++ b/src/mame/drivers/sliver.cpp @@ -139,6 +139,7 @@ public: void render_jpeg(); void postload(); + void sliver(machine_config &config); }; void sliver_state::machine_start() @@ -504,7 +505,7 @@ TIMER_DEVICE_CALLBACK_MEMBER ( sliver_state::obj_irq_cb ) m_maincpu->set_input_line(3, HOLD_LINE); } -static MACHINE_CONFIG_START( sliver ) +MACHINE_CONFIG_START(sliver_state::sliver) MCFG_CPU_ADD("maincpu", M68000, 12000000) MCFG_CPU_PROGRAM_MAP(sliver_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", sliver_state, irq4_line_hold) diff --git a/src/mame/drivers/slotcarn.cpp b/src/mame/drivers/slotcarn.cpp index 8d3427836e8..68b2907cc2a 100644 --- a/src/mame/drivers/slotcarn.cpp +++ b/src/mame/drivers/slotcarn.cpp @@ -59,6 +59,7 @@ public: virtual void machine_start() override; required_device m_maincpu; required_device m_screen; + void slotcarn(machine_config &config); }; @@ -535,7 +536,7 @@ void slotcarn_state::machine_start() * Machine Driver * ***********************************/ -static MACHINE_CONFIG_START( slotcarn ) +MACHINE_CONFIG_START(slotcarn_state::slotcarn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) // 2.5 Mhz? diff --git a/src/mame/drivers/sm1800.cpp b/src/mame/drivers/sm1800.cpp index 97af4a198d0..529bc08e539 100644 --- a/src/mame/drivers/sm1800.cpp +++ b/src/mame/drivers/sm1800.cpp @@ -50,6 +50,7 @@ public: INTERRUPT_GEN_MEMBER(sm1800_vblank_interrupt); IRQ_CALLBACK_MEMBER(sm1800_irq_callback); I8275_DRAW_CHARACTER_MEMBER( crtc_display_pixels ); + void sm1800(machine_config &config); }; static ADDRESS_MAP_START(sm1800_mem, AS_PROGRAM, 8, sm1800_state) @@ -153,7 +154,7 @@ static GFXDECODE_START( sm1800 ) GFXDECODE_END -static MACHINE_CONFIG_START( sm1800 ) +MACHINE_CONFIG_START(sm1800_state::sm1800) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, XTAL_2MHz) MCFG_CPU_PROGRAM_MAP(sm1800_mem) diff --git a/src/mame/drivers/sm7238.cpp b/src/mame/drivers/sm7238.cpp index 10a95e6f859..ef51dfa9f41 100644 --- a/src/mame/drivers/sm7238.cpp +++ b/src/mame/drivers/sm7238.cpp @@ -89,6 +89,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void sm7238(machine_config &config); private: void recompute_parameters(); @@ -353,7 +354,7 @@ PALETTE_INIT_MEMBER(sm7238_state, sm7238) palette.set_pen_color(2, 0x00, 0xff, 0x00); // highlight } -static MACHINE_CONFIG_START( sm7238 ) +MACHINE_CONFIG_START(sm7238_state::sm7238) MCFG_CPU_ADD("maincpu", I8080, XTAL_16_5888MHz/9) MCFG_CPU_PROGRAM_MAP(sm7238_mem) MCFG_CPU_IO_MAP(sm7238_io) diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp index 7e45d9768ef..9b81251a4f7 100644 --- a/src/mame/drivers/smc777.cpp +++ b/src/mame/drivers/smc777.cpp @@ -100,6 +100,7 @@ public: DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); + void smc777(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -964,7 +965,7 @@ static SLOT_INTERFACE_START( smc777_floppies ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( smc777 ) +MACHINE_CONFIG_START(smc777_state::smc777) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(smc777_mem) diff --git a/src/mame/drivers/sms.cpp b/src/mame/drivers/sms.cpp index 66d33a1ac8f..0606e0cbf78 100644 --- a/src/mame/drivers/sms.cpp +++ b/src/mame/drivers/sms.cpp @@ -486,7 +486,7 @@ static INPUT_PORTS_START( gg ) INPUT_PORTS_END -static MACHINE_CONFIG_START( sms_base ) +MACHINE_CONFIG_START(sms_state::sms_base) MCFG_MACHINE_START_OVERRIDE(sms_state,sms) MCFG_MACHINE_RESET_OVERRIDE(sms_state,sms) @@ -506,7 +506,7 @@ static MACHINE_CONFIG_START( sms_base ) MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_state, sms_pixel_color)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms_ntsc_base, sms_base ) +MACHINE_CONFIG_DERIVED(sms_state::sms_ntsc_base, sms_base) MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3) MCFG_CPU_PROGRAM_MAP(sms_mem) MCFG_CPU_IO_MAP(sms_io) @@ -566,7 +566,7 @@ MACHINE_CONFIG_END MCFG_SCREEN_REFRESH_RATE((double) _pixelclock / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_NTSC)) -static MACHINE_CONFIG_DERIVED( sms2_ntsc, sms_ntsc_base ) +MACHINE_CONFIG_DERIVED(sms_state::sms2_ntsc, sms_ntsc_base) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(XTAL_10_738635MHz/2) @@ -580,7 +580,7 @@ static MACHINE_CONFIG_DERIVED( sms2_ntsc, sms_ntsc_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms1_ntsc, sms_ntsc_base ) +MACHINE_CONFIG_DERIVED(sms_state::sms1_ntsc, sms_ntsc_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses @@ -616,7 +616,7 @@ static MACHINE_CONFIG_DERIVED( sms1_ntsc, sms_ntsc_base ) MCFG_SMS_EXPANSION_ADD("smsexp", sms_expansion_devices, nullptr) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms_sdisp, sms1_ntsc ) +MACHINE_CONFIG_DERIVED(smssdisp_state::sms_sdisp, sms1_ntsc) MCFG_DEVICE_MODIFY("sms_vdp") MCFG_SEGA315_5124_INT_CB(WRITELINE(smssdisp_state, sms_store_int_callback)) @@ -663,7 +663,7 @@ static MACHINE_CONFIG_DERIVED( sms_sdisp, sms1_ntsc ) MCFG_SMS_CARD_ADD("slot32", sms_cart, nullptr) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms_pal_base, sms_base ) +MACHINE_CONFIG_DERIVED(sms_state::sms_pal_base, sms_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_PAL/15) MCFG_CPU_PROGRAM_MAP(sms_mem) @@ -676,7 +676,7 @@ static MACHINE_CONFIG_DERIVED( sms_pal_base, sms_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms2_pal, sms_pal_base ) +MACHINE_CONFIG_DERIVED(sms_state::sms2_pal, sms_pal_base) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -690,7 +690,7 @@ static MACHINE_CONFIG_DERIVED( sms2_pal, sms_pal_base ) MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms1_pal, sms_pal_base ) +MACHINE_CONFIG_DERIVED(sms_state::sms1_pal, sms_pal_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses @@ -727,7 +727,7 @@ static MACHINE_CONFIG_DERIVED( sms1_pal, sms_pal_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms_paln_base, sms_base ) +MACHINE_CONFIG_DERIVED(sms_state::sms_paln_base, sms_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_PALN/3) MCFG_CPU_PROGRAM_MAP(sms_mem) @@ -740,7 +740,7 @@ static MACHINE_CONFIG_DERIVED( sms_paln_base, sms_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms3_paln, sms_paln_base ) +MACHINE_CONFIG_DERIVED(sms_state::sms3_paln, sms_paln_base) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -754,7 +754,7 @@ static MACHINE_CONFIG_DERIVED( sms3_paln, sms_paln_base ) MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms1_paln, sms_paln_base ) +MACHINE_CONFIG_DERIVED(sms_state::sms1_paln, sms_paln_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses @@ -791,7 +791,7 @@ static MACHINE_CONFIG_DERIVED( sms1_paln, sms_paln_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms_br_base, sms_base ) +MACHINE_CONFIG_DERIVED(sms_state::sms_br_base, sms_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_PALM/3) MCFG_CPU_PROGRAM_MAP(sms_mem) @@ -805,7 +805,7 @@ static MACHINE_CONFIG_DERIVED( sms_br_base, sms_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms3_br, sms_br_base ) +MACHINE_CONFIG_DERIVED(sms_state::sms3_br, sms_br_base) /* video hardware */ // PAL-M height/width parameters are the same of NTSC screens. MCFG_SCREEN_ADD("screen", RASTER) @@ -819,7 +819,7 @@ static MACHINE_CONFIG_DERIVED( sms3_br, sms_br_base ) MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms1_br, sms_br_base ) +MACHINE_CONFIG_DERIVED(sms_state::sms1_br, sms_br_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses @@ -857,7 +857,7 @@ static MACHINE_CONFIG_DERIVED( sms1_br, sms_br_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms2_kr, sms2_ntsc ) +MACHINE_CONFIG_DERIVED(sms_state::sms2_kr, sms2_ntsc) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(smskr_io) @@ -866,7 +866,7 @@ static MACHINE_CONFIG_DERIVED( sms2_kr, sms2_ntsc ) MCFG_SOFTWARE_LIST_ADD("cart_list2","sg1000") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sms1_kr, sms1_ntsc ) +MACHINE_CONFIG_DERIVED(sms_state::sms1_kr, sms1_ntsc) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(smskr_io) @@ -885,7 +885,7 @@ static MACHINE_CONFIG_DERIVED( sms1_kr, sms1_ntsc ) MCFG_SEGA315_5124_CSYNC_CB(WRITELINE(sms_state, sms_csync_callback)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( smsj, sms1_kr ) +MACHINE_CONFIG_DERIVED(sms_state::smsj, sms1_kr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(smsj_io) @@ -895,7 +895,7 @@ static MACHINE_CONFIG_DERIVED( smsj, sms1_kr ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sg1000m3, sms1_ntsc ) +MACHINE_CONFIG_DERIVED(sms_state::sg1000m3, sms1_ntsc) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(sg1000m3_io) @@ -917,7 +917,7 @@ static MACHINE_CONFIG_DERIVED( sg1000m3, sms1_ntsc ) MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(NOOP) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gamegear ) +MACHINE_CONFIG_START(sms_state::gamegear) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_GG/9) MCFG_CPU_PROGRAM_MAP(sms_mem) diff --git a/src/mame/drivers/sms_bootleg.cpp b/src/mame/drivers/sms_bootleg.cpp index 9577892706c..e81790fc1fb 100644 --- a/src/mame/drivers/sms_bootleg.cpp +++ b/src/mame/drivers/sms_bootleg.cpp @@ -271,7 +271,7 @@ ADDRESS_MAP_END -static MACHINE_CONFIG_START( sms_supergame ) +MACHINE_CONFIG_START(smsbootleg_state::sms_supergame) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3) MCFG_CPU_PROGRAM_MAP(sms_supergame_map) diff --git a/src/mame/drivers/smsmcorp.cpp b/src/mame/drivers/smsmcorp.cpp index fff73cf7058..150538acc92 100644 --- a/src/mame/drivers/smsmcorp.cpp +++ b/src/mame/drivers/smsmcorp.cpp @@ -253,6 +253,8 @@ public: uint32_t screen_update_sms(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_screen; + void sureshot(machine_config &config); + void sms(machine_config &config); }; @@ -533,7 +535,7 @@ void smsmfg_state::machine_reset() m_communication_port_status = 0; } -static MACHINE_CONFIG_START( sms ) +MACHINE_CONFIG_START(smsmfg_state::sms) MCFG_CPU_ADD("maincpu", I8088, XTAL_24MHz/8) MCFG_CPU_PROGRAM_MAP(sms_map) @@ -572,7 +574,7 @@ static MACHINE_CONFIG_START( sms ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sureshot, sms ) +MACHINE_CONFIG_DERIVED(smsmfg_state::sureshot, sms) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sureshot_map) diff --git a/src/mame/drivers/snes.cpp b/src/mame/drivers/snes.cpp index eb3b2e51ae8..aef86d23364 100644 --- a/src/mame/drivers/snes.cpp +++ b/src/mame/drivers/snes.cpp @@ -106,6 +106,8 @@ public: required_device m_ctrl1; required_device m_ctrl2; optional_device m_cartslot; + void snespal(machine_config &config); + void snes(machine_config &config); }; @@ -1325,7 +1327,7 @@ void snes_console_state::machine_reset() } -static MACHINE_CONFIG_START( snes ) +MACHINE_CONFIG_START(snes_console_state::snes) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", _5A22, MCLK_NTSC) /* 2.68 MHz, also 3.58 MHz */ @@ -1365,7 +1367,7 @@ static MACHINE_CONFIG_START( snes ) MCFG_SOFTWARE_LIST_ADD("st_list","snes_strom") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( snespal, snes ) +MACHINE_CONFIG_DERIVED(snes_console_state::snespal, snes) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_CLOCK( MCLK_PAL ) diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp index bc90590097d..cf2d1bbadc3 100644 --- a/src/mame/drivers/snesb.cpp +++ b/src/mame/drivers/snesb.cpp @@ -185,6 +185,9 @@ public: DECLARE_DRIVER_INIT(mk3snes); DECLARE_DRIVER_INIT(legendsb); DECLARE_MACHINE_RESET(ffight2b); + void mk3snes(machine_config &config); + void ffight2b(machine_config &config); + void kinstb(machine_config &config); }; @@ -686,7 +689,7 @@ static INPUT_PORTS_START( endless ) INPUT_PORTS_END -static MACHINE_CONFIG_START( kinstb ) +MACHINE_CONFIG_START(snesb_state::kinstb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */ @@ -719,7 +722,7 @@ static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8, snesb_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( mk3snes, kinstb ) +MACHINE_CONFIG_DERIVED(snesb_state::mk3snes, kinstb) MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz) MCFG_CPU_IO_MAP(mcu_io_map) @@ -735,7 +738,7 @@ MACHINE_RESET_MEMBER( snesb_state, ffight2b ) cpu0space.write_byte(0x7eadce, 0x00); } -static MACHINE_CONFIG_DERIVED( ffight2b, kinstb ) +MACHINE_CONFIG_DERIVED(snesb_state::ffight2b, kinstb) MCFG_MACHINE_RESET_OVERRIDE( snesb_state, ffight2b ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp index a9c7bc837c9..0410f21880a 100644 --- a/src/mame/drivers/snk.cpp +++ b/src/mame/drivers/snk.cpp @@ -3608,7 +3608,7 @@ GFXDECODE_END /**********************************************************************/ -static MACHINE_CONFIG_START( marvins ) +MACHINE_CONFIG_START(snk_state::marvins) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3360000) /* 3.36 MHz */ @@ -3658,7 +3658,7 @@ static MACHINE_CONFIG_START( marvins ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vangrd2, marvins ) +MACHINE_CONFIG_DERIVED(snk_state::vangrd2, marvins) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3669,7 +3669,7 @@ static MACHINE_CONFIG_DERIVED( vangrd2, marvins ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( madcrush, marvins ) +MACHINE_CONFIG_DERIVED(snk_state::madcrush, marvins) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3680,7 +3680,7 @@ static MACHINE_CONFIG_DERIVED( madcrush, marvins ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( jcross ) +MACHINE_CONFIG_START(snk_state::jcross) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3350000) /* NOT verified */ @@ -3727,7 +3727,7 @@ static MACHINE_CONFIG_START( jcross ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sgladiat, jcross ) +MACHINE_CONFIG_DERIVED(snk_state::sgladiat, jcross) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3744,7 +3744,7 @@ static MACHINE_CONFIG_DERIVED( sgladiat, jcross ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hal21, jcross ) +MACHINE_CONFIG_DERIVED(snk_state::hal21, jcross) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3763,7 +3763,7 @@ static MACHINE_CONFIG_DERIVED( hal21, jcross ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tnk3 ) +MACHINE_CONFIG_START(snk_state::tnk3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_13_4MHz/4) /* verified on pcb */ @@ -3806,7 +3806,7 @@ static MACHINE_CONFIG_START( tnk3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( aso, tnk3 ) +MACHINE_CONFIG_DERIVED(snk_state::aso, tnk3) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3823,7 +3823,7 @@ static MACHINE_CONFIG_DERIVED( aso, tnk3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( athena, tnk3 ) +MACHINE_CONFIG_DERIVED(snk_state::athena, tnk3) /* basic machine hardware */ MCFG_CPU_MODIFY("audiocpu") @@ -3836,7 +3836,7 @@ static MACHINE_CONFIG_DERIVED( athena, tnk3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fitegolf, tnk3 ) +MACHINE_CONFIG_DERIVED(snk_state::fitegolf, tnk3) /* basic machine hardware */ MCFG_CPU_MODIFY("audiocpu") @@ -3849,13 +3849,13 @@ static MACHINE_CONFIG_DERIVED( fitegolf, tnk3 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fitegolf2, fitegolf ) +MACHINE_CONFIG_DERIVED(snk_state::fitegolf2, fitegolf) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(snk_state, screen_update_fitegolf2) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ikari ) +MACHINE_CONFIG_START(snk_state::ikari) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_13_4MHz/4) /* verified on pcb */ @@ -3901,7 +3901,7 @@ static MACHINE_CONFIG_START( ikari ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( victroad, ikari ) +MACHINE_CONFIG_DERIVED(snk_state::victroad, ikari) /* basic machine hardware */ MCFG_CPU_MODIFY("audiocpu") @@ -3914,7 +3914,7 @@ static MACHINE_CONFIG_DERIVED( victroad, ikari ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bermudat ) +MACHINE_CONFIG_START(snk_state::bermudat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* verified on pcb */ @@ -3958,14 +3958,14 @@ static MACHINE_CONFIG_START( bermudat ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psychos, bermudat ) +MACHINE_CONFIG_DERIVED(snk_state::psychos, bermudat) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(snk_state,psychos) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gwar, bermudat ) +MACHINE_CONFIG_DERIVED(snk_state::gwar, bermudat) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3977,7 +3977,7 @@ static MACHINE_CONFIG_DERIVED( gwar, bermudat ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gwara, bermudat ) +MACHINE_CONFIG_DERIVED(snk_state::gwara, bermudat) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3988,7 +3988,7 @@ static MACHINE_CONFIG_DERIVED( gwara, bermudat ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( chopper1, bermudat ) +MACHINE_CONFIG_DERIVED(snk_state::chopper1, bermudat) /* basic machine hardware */ MCFG_CPU_MODIFY("sub") @@ -4004,7 +4004,7 @@ static MACHINE_CONFIG_DERIVED( chopper1, bermudat ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( choppera, chopper1 ) +MACHINE_CONFIG_DERIVED(snk_state::choppera, chopper1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -4012,7 +4012,7 @@ static MACHINE_CONFIG_DERIVED( choppera, chopper1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tdfever ) +MACHINE_CONFIG_START(snk_state::tdfever) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) @@ -4058,7 +4058,7 @@ static MACHINE_CONFIG_START( tdfever ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tdfever2, tdfever ) +MACHINE_CONFIG_DERIVED(snk_state::tdfever2, tdfever) /* basic machine hardware */ MCFG_CPU_MODIFY("audiocpu") diff --git a/src/mame/drivers/snk6502.cpp b/src/mame/drivers/snk6502.cpp index 2ae1ce7a377..1fc4bd8e1ee 100644 --- a/src/mame/drivers/snk6502.cpp +++ b/src/mame/drivers/snk6502.cpp @@ -828,7 +828,7 @@ MACHINE_RESET_MEMBER(snk6502_state,pballoon) * *************************************/ -static MACHINE_CONFIG_START( sasuke ) +MACHINE_CONFIG_START(snk6502_state::sasuke) // basic machine hardware MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) // 700 kHz @@ -923,7 +923,7 @@ static MACHINE_CONFIG_START( sasuke ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( satansat, sasuke ) +MACHINE_CONFIG_DERIVED(snk6502_state::satansat, sasuke) // basic machine hardware MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(satansat_map) @@ -960,7 +960,7 @@ static MACHINE_CONFIG_DERIVED( satansat, sasuke ) MCFG_DEVICE_REMOVE("sn76477.3") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vanguard ) +MACHINE_CONFIG_START(snk6502_state::vanguard) // basic machine hardware MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) // adjusted using common divisor @@ -1036,7 +1036,7 @@ static MACHINE_CONFIG_START( vanguard ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fantasy, vanguard ) +MACHINE_CONFIG_DERIVED(snk6502_state::fantasy, vanguard) // basic machine hardware MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(fantasy_map) @@ -1073,13 +1073,13 @@ static MACHINE_CONFIG_DERIVED( fantasy, vanguard ) MCFG_DEVICE_REMOVE("sn76477.2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nibbler, fantasy ) +MACHINE_CONFIG_DERIVED(snk6502_state::nibbler, fantasy) // sound hardware MCFG_DEVICE_REMOVE("samples") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pballoon, nibbler ) +MACHINE_CONFIG_DERIVED(snk6502_state::pballoon, nibbler) // basic machine hardware MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pballoon_map) diff --git a/src/mame/drivers/snk68.cpp b/src/mame/drivers/snk68.cpp index fd58b97b34c..250f43346b9 100644 --- a/src/mame/drivers/snk68.cpp +++ b/src/mame/drivers/snk68.cpp @@ -588,7 +588,7 @@ void snk68_state::tile_callback_notpow(int &tile, int& fx, int& fy, int& region) region = 1; } -static MACHINE_CONFIG_START( pow ) +MACHINE_CONFIG_START(snk68_state::pow) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_18MHz/2) /* verified on pcb */ @@ -630,12 +630,12 @@ static MACHINE_CONFIG_START( pow ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( streetsm, pow ) +MACHINE_CONFIG_DERIVED(snk68_state::streetsm, pow) MCFG_DEVICE_MODIFY("sprites") MCFG_SNK68_SPR_SET_TILE_INDIRECT( snk68_state, tile_callback_notpow ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( searchar, streetsm ) +MACHINE_CONFIG_DERIVED(snk68_state::searchar, streetsm) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(searchar_map) diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp index 44e618fef70..1b4bc087770 100644 --- a/src/mame/drivers/snookr10.cpp +++ b/src/mame/drivers/snookr10.cpp @@ -1037,7 +1037,7 @@ GFXDECODE_END * Machine Drivers * **************************/ -static MACHINE_CONFIG_START( snookr10 ) +MACHINE_CONFIG_START(snookr10_state::snookr10) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65SC02, MASTER_CLOCK/8) /* 2 MHz (1.999 MHz measured) */ @@ -1067,7 +1067,7 @@ static MACHINE_CONFIG_START( snookr10 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( apple10, snookr10 ) +MACHINE_CONFIG_DERIVED(snookr10_state::apple10, snookr10) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1079,7 +1079,7 @@ static MACHINE_CONFIG_DERIVED( apple10, snookr10 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tenballs, snookr10 ) +MACHINE_CONFIG_DERIVED(snookr10_state::tenballs, snookr10) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1087,7 +1087,7 @@ static MACHINE_CONFIG_DERIVED( tenballs, snookr10 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( crystalc, snookr10 ) +MACHINE_CONFIG_DERIVED(snookr10_state::crystalc, snookr10) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/snowbros.cpp b/src/mame/drivers/snowbros.cpp index 284273284a4..74edb888fbe 100644 --- a/src/mame/drivers/snowbros.cpp +++ b/src/mame/drivers/snowbros.cpp @@ -1738,7 +1738,7 @@ MACHINE_RESET_MEMBER(snowbros_state,finalttr) m_hyperpac_ram[0x2000/2 + i] = PROTDATA[i]; } -static MACHINE_CONFIG_START( snowbros ) +MACHINE_CONFIG_START(snowbros_state::snowbros) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* 8 Mhz - confirmed */ @@ -1781,7 +1781,7 @@ static MACHINE_CONFIG_START( snowbros ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wintbob, snowbros ) +MACHINE_CONFIG_DERIVED(snowbros_state::wintbob, snowbros) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1798,7 +1798,7 @@ static MACHINE_CONFIG_DERIVED( wintbob, snowbros ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( semicom, snowbros ) +MACHINE_CONFIG_DERIVED(snowbros_state::semicom, snowbros) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1828,7 +1828,7 @@ static MACHINE_CONFIG_DERIVED( semicom, snowbros ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( semicom_mcu, semicom ) +MACHINE_CONFIG_DERIVED(snowbros_state::semicom_mcu, semicom) /* basic machine hardware */ @@ -1838,12 +1838,12 @@ static MACHINE_CONFIG_DERIVED( semicom_mcu, semicom ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( semiprot, semicom ) +MACHINE_CONFIG_DERIVED(snowbros_state::semiprot, semicom) MCFG_MACHINE_RESET_OVERRIDE (snowbros_state, semiprot ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( honeydol ) +MACHINE_CONFIG_START(snowbros_state::honeydol) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* MC68000P12 @ 12MHz */ @@ -1882,7 +1882,7 @@ static MACHINE_CONFIG_START( honeydol ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( twinadv ) +MACHINE_CONFIG_START(snowbros_state::twinadv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* 12MHz like Honey Dolls ? */ @@ -1940,7 +1940,7 @@ Intel P8752 (mcu) */ -static MACHINE_CONFIG_DERIVED( finalttr, semicom ) +MACHINE_CONFIG_DERIVED(snowbros_state::finalttr, semicom) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(XTAL_12MHz) @@ -1961,13 +1961,13 @@ static MACHINE_CONFIG_DERIVED( finalttr, semicom ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( _4in1, semicom ) +MACHINE_CONFIG_DERIVED(snowbros_state::_4in1, semicom) /* basic machine hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", snowbros) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( snowbro3 ) /* PCB has 16MHz & 12MHz OSCs */ +MACHINE_CONFIG_START(snowbros_state::snowbro3) /* PCB has 16MHz & 12MHz OSCs */ /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* MC68000P10 CPU @ 12mhz or 8MHz (16MHz/2) ? */ @@ -1997,7 +1997,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( yutnori ) +MACHINE_CONFIG_START(snowbros_state::yutnori) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) diff --git a/src/mame/drivers/socrates.cpp b/src/mame/drivers/socrates.cpp index 37709cbb85d..3450487fa1f 100644 --- a/src/mame/drivers/socrates.cpp +++ b/src/mame/drivers/socrates.cpp @@ -192,6 +192,8 @@ public: uint8_t count; } m_kb_queue; + void socrates_pal(machine_config &config); + void socrates(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -211,6 +213,7 @@ public: DECLARE_READ8_MEMBER( status_r ); DECLARE_INPUT_CHANGED_MEMBER( send_input ); + void iqunlimz(machine_config &config); protected: virtual void machine_reset() override; int get_color(int index, int y); @@ -1443,7 +1446,7 @@ TIMER_CALLBACK_MEMBER(socrates_state::kbmcu_sim_cb) } } -static MACHINE_CONFIG_START( socrates ) +MACHINE_CONFIG_START(socrates_state::socrates) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) /* Toshiba TMPZ84C00AP @ 3.579545 MHz, verified, xtal is divided by 6 */ MCFG_CPU_PROGRAM_MAP(z80_mem) @@ -1492,7 +1495,7 @@ static MACHINE_CONFIG_START( socrates ) MCFG_SOFTWARE_LIST_ADD("cart_list", "socrates") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( socrates_pal, socrates ) +MACHINE_CONFIG_DERIVED(socrates_state::socrates_pal, socrates) MCFG_CPU_REPLACE("maincpu", Z80, XTAL_26_601712MHz/8) MCFG_CPU_PROGRAM_MAP(z80_mem) MCFG_CPU_IO_MAP(z80_io) @@ -1510,7 +1513,7 @@ static MACHINE_CONFIG_DERIVED( socrates_pal, socrates ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( iqunlimz ) +MACHINE_CONFIG_START(iqunlim_state::iqunlimz) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) /* not accurate */ MCFG_CPU_PROGRAM_MAP(iqunlimz_mem) diff --git a/src/mame/drivers/softbox.cpp b/src/mame/drivers/softbox.cpp index 293fc9275d4..f0076c7125a 100644 --- a/src/mame/drivers/softbox.cpp +++ b/src/mame/drivers/softbox.cpp @@ -368,7 +368,7 @@ void softbox_state::ieee488_ifc(int state) // MACHINE_CONFIG( softbox ) //------------------------------------------------- -static MACHINE_CONFIG_START( softbox ) +MACHINE_CONFIG_START(softbox_state::softbox) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(softbox_mem) diff --git a/src/mame/drivers/solbourne.cpp b/src/mame/drivers/solbourne.cpp index f0ec941b5f0..720831e80c6 100644 --- a/src/mame/drivers/solbourne.cpp +++ b/src/mame/drivers/solbourne.cpp @@ -18,6 +18,7 @@ public: // , m_maincpu(*this, "maincpu") { } +void solbourne(machine_config &config); private: // required_device m_maincpu; }; @@ -28,7 +29,7 @@ private: static INPUT_PORTS_START( solbourne ) INPUT_PORTS_END -static MACHINE_CONFIG_START( solbourne ) +MACHINE_CONFIG_START(solbourne_state::solbourne) MACHINE_CONFIG_END ROM_START( sols5e ) diff --git a/src/mame/drivers/solomon.cpp b/src/mame/drivers/solomon.cpp index 52438b9c692..f12d8c45dca 100644 --- a/src/mame/drivers/solomon.cpp +++ b/src/mame/drivers/solomon.cpp @@ -206,7 +206,7 @@ INTERRUPT_GEN_MEMBER(solomon_state::vblank_irq) -static MACHINE_CONFIG_START( solomon ) +MACHINE_CONFIG_START(solomon_state::solomon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz (?????) */ diff --git a/src/mame/drivers/sonson.cpp b/src/mame/drivers/sonson.cpp index f7cc802a1c2..925d18881a3 100644 --- a/src/mame/drivers/sonson.cpp +++ b/src/mame/drivers/sonson.cpp @@ -223,7 +223,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( sonson ) +MACHINE_CONFIG_START(sonson_state::sonson) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_12MHz/2) // HD68B09P (/4 internally) diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp index 125c751ef8d..d5b00609e4c 100644 --- a/src/mame/drivers/sorcerer.cpp +++ b/src/mame/drivers/sorcerer.cpp @@ -413,7 +413,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( sorcerer ) +MACHINE_CONFIG_START(sorcerer_state::sorcerer) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, ES_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(sorcerer_mem) @@ -481,7 +481,7 @@ static MACHINE_CONFIG_START( sorcerer ) MCFG_RAM_EXTRA_OPTIONS("8K,16K,32K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sorcererd, sorcerer ) +MACHINE_CONFIG_DERIVED(sorcerer_state::sorcererd, sorcerer) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sorcererd_mem) diff --git a/src/mame/drivers/sothello.cpp b/src/mame/drivers/sothello.cpp index 28d1e676f80..fa9ef85f977 100644 --- a/src/mame/drivers/sothello.cpp +++ b/src/mame/drivers/sothello.cpp @@ -73,6 +73,7 @@ public: DECLARE_WRITE8_MEMBER(msm_cfg_w); DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void sothello(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -344,7 +345,7 @@ void sothello_state::machine_reset() m_msm_data = 0; } -static MACHINE_CONFIG_START( sothello ) +MACHINE_CONFIG_START(sothello_state::sothello) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz / 6) diff --git a/src/mame/drivers/spacefb.cpp b/src/mame/drivers/spacefb.cpp index 81eb57282c9..0e93c4f390e 100644 --- a/src/mame/drivers/spacefb.cpp +++ b/src/mame/drivers/spacefb.cpp @@ -328,7 +328,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( spacefb ) +MACHINE_CONFIG_START(spacefb_state::spacefb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, SPACEFB_MAIN_CPU_CLOCK) diff --git a/src/mame/drivers/spaceg.cpp b/src/mame/drivers/spaceg.cpp index b2deed988c9..961833917d5 100644 --- a/src/mame/drivers/spaceg.cpp +++ b/src/mame/drivers/spaceg.cpp @@ -214,6 +214,7 @@ public: uint8_t m_sound2; uint8_t m_sound3; + void spaceg(machine_config &config); protected: virtual void driver_start() override; }; @@ -497,7 +498,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( spaceg ) +MACHINE_CONFIG_START(spaceg_state::spaceg) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,2500000) /* 2.5 MHz */ diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp index d118c30ae5b..2b9a950fbba 100644 --- a/src/mame/drivers/spartanxtec.cpp +++ b/src/mame/drivers/spartanxtec.cpp @@ -68,6 +68,7 @@ public: DECLARE_WRITE8_MEMBER(a801_w); DECLARE_WRITE8_MEMBER(sound_irq_ack); DECLARE_WRITE8_MEMBER(irq_ack); + void spartanxtec(machine_config &config); }; @@ -349,7 +350,7 @@ PALETTE_INIT_MEMBER(spartanxtec_state, spartanxtec) -static MACHINE_CONFIG_START( spartanxtec ) +MACHINE_CONFIG_START(spartanxtec_state::spartanxtec) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */ diff --git a/src/mame/drivers/spbactn.cpp b/src/mame/drivers/spbactn.cpp index c3e8de86f14..e707c9d7bd3 100644 --- a/src/mame/drivers/spbactn.cpp +++ b/src/mame/drivers/spbactn.cpp @@ -402,7 +402,7 @@ static GFXDECODE_START( spbactnp ) GFXDECODE_END -static MACHINE_CONFIG_START( spbactn ) +MACHINE_CONFIG_START(spbactn_state::spbactn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) @@ -455,7 +455,7 @@ static MACHINE_CONFIG_START( spbactn ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( spbactnp ) +MACHINE_CONFIG_START(spbactn_state::spbactnp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp index 18a12f4a049..f68a8de3440 100644 --- a/src/mame/drivers/spc1000.cpp +++ b/src/mame/drivers/spc1000.cpp @@ -178,6 +178,7 @@ public: return m_p_videoram[0x1000 + (ch & 0x7f) * 16 + line]; } + void spc1000(machine_config &config); private: uint8_t m_IPLK; uint8_t m_GMODE; @@ -458,7 +459,7 @@ extern SLOT_INTERFACE_START(spc1000_exp) SLOT_INTERFACE("vdp", SPC1000_VDP_EXP) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( spc1000 ) +MACHINE_CONFIG_START(spc1000_state::spc1000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(spc1000_mem) diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp index 91e3263a0b1..ff5d5884b8a 100644 --- a/src/mame/drivers/spc1500.cpp +++ b/src/mame/drivers/spc1500.cpp @@ -291,6 +291,7 @@ public: MC6845_UPDATE_ROW(crtc_update_row); MC6845_RECONFIGURE(crtc_reconfig); TIMER_DEVICE_CALLBACK_MEMBER(timer); + void spc1500(machine_config &config); private: uint8_t *m_p_ram; uint8_t m_ipl; @@ -867,7 +868,7 @@ READ8_MEMBER( spc1500_state::porta_r ) return data; } -static MACHINE_CONFIG_START( spc1500 ) +MACHINE_CONFIG_START(spc1500_state::spc1500) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(spc1500_mem) diff --git a/src/mame/drivers/spcforce.cpp b/src/mame/drivers/spcforce.cpp index 496b1347dd0..54294b91e1a 100644 --- a/src/mame/drivers/spcforce.cpp +++ b/src/mame/drivers/spcforce.cpp @@ -279,7 +279,7 @@ INTERRUPT_GEN_MEMBER(spcforce_state::vblank_irq) device.execute().set_input_line(3, HOLD_LINE); } -static MACHINE_CONFIG_START( spcforce ) +MACHINE_CONFIG_START(spcforce_state::spcforce) /* basic machine hardware */ /* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */ @@ -331,7 +331,7 @@ static MACHINE_CONFIG_START( spcforce ) MCFG_SN76496_READY_HANDLER(WRITELINE(spcforce_state, write_sn3_ready)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( meteors, spcforce ) +MACHINE_CONFIG_DERIVED(spcforce_state::meteors, spcforce) MCFG_DEVICE_MODIFY("mainlatch") MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(spcforce_state, irq_mask_w)) // ?? diff --git a/src/mame/drivers/spdodgeb.cpp b/src/mame/drivers/spdodgeb.cpp index 49f0887f7f8..d8aba46e42c 100644 --- a/src/mame/drivers/spdodgeb.cpp +++ b/src/mame/drivers/spdodgeb.cpp @@ -403,7 +403,7 @@ void spdodgeb_state::machine_reset() m_last_dash[0] = m_last_dash[1] = 0; } -static MACHINE_CONFIG_START( spdodgeb ) +MACHINE_CONFIG_START(spdodgeb_state::spdodgeb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/6) /* 2MHz ? */ diff --git a/src/mame/drivers/spec128.cpp b/src/mame/drivers/spec128.cpp index d7d60e34e7c..c805c35465a 100644 --- a/src/mame/drivers/spec128.cpp +++ b/src/mame/drivers/spec128.cpp @@ -288,7 +288,7 @@ static GFXDECODE_START( spec128 ) GFXDECODE_END -MACHINE_CONFIG_DERIVED( spectrum_128, spectrum ) +MACHINE_CONFIG_DERIVED(spectrum_state::spectrum_128, spectrum) MCFG_DEVICE_REMOVE("maincpu") diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp index ae21548ffee..004cbf8f226 100644 --- a/src/mame/drivers/special.cpp +++ b/src/mame/drivers/special.cpp @@ -358,7 +358,7 @@ static SLOT_INTERFACE_START( specimx_floppies ) SLOT_INTERFACE_END /* Machine driver */ -static MACHINE_CONFIG_START( special ) +MACHINE_CONFIG_START(special_state::special) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, 2000000) MCFG_CPU_PROGRAM_MAP(specialist_mem) @@ -402,7 +402,7 @@ static MACHINE_CONFIG_START( special ) MCFG_SOFTWARE_LIST_ADD("cass_list","special_cass") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( specialp, special ) +MACHINE_CONFIG_DERIVED(special_state::specialp, special) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(specialp_mem) @@ -414,7 +414,7 @@ static MACHINE_CONFIG_DERIVED( specialp, special ) MCFG_VIDEO_START_OVERRIDE(special_state,specialp) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( specialm, special ) +MACHINE_CONFIG_DERIVED(special_state::specialm, special) MCFG_DEVICE_REMOVE("ppi8255") MCFG_DEVICE_ADD("ppi8255", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(special_state, specialist_8255_porta_r)) @@ -425,7 +425,7 @@ static MACHINE_CONFIG_DERIVED( specialm, special ) MCFG_I8255_OUT_PORTC_CB(WRITE8(special_state, specialist_8255_portc_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( specimx, special ) +MACHINE_CONFIG_DERIVED(special_state::specimx, special) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(specimx_mem) @@ -475,7 +475,7 @@ static MACHINE_CONFIG_DERIVED( specimx, special ) MCFG_RAM_DEFAULT_VALUE(0x00) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( erik ) +MACHINE_CONFIG_START(special_state::erik) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(erik_mem) diff --git a/src/mame/drivers/specpls3.cpp b/src/mame/drivers/specpls3.cpp index 8b91527e701..cd96c23a6b6 100644 --- a/src/mame/drivers/specpls3.cpp +++ b/src/mame/drivers/specpls3.cpp @@ -369,7 +369,7 @@ static GFXDECODE_START( specpls3 ) GFXDECODE_END -static MACHINE_CONFIG_DERIVED( spectrum_plus3, spectrum_128 ) +MACHINE_CONFIG_DERIVED(spectrum_state::spectrum_plus3, spectrum_128) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(spectrum_plus3_mem) MCFG_CPU_IO_MAP(spectrum_plus3_io) diff --git a/src/mame/drivers/spectra.cpp b/src/mame/drivers/spectra.cpp index 97e64decb75..02d1797478b 100644 --- a/src/mame/drivers/spectra.cpp +++ b/src/mame/drivers/spectra.cpp @@ -62,6 +62,7 @@ public: DECLARE_WRITE8_MEMBER(portb_w); TIMER_DEVICE_CALLBACK_MEMBER(nmitimer); TIMER_DEVICE_CALLBACK_MEMBER(outtimer); + void spectra(machine_config &config); private: uint8_t m_porta; uint8_t m_portb; @@ -221,7 +222,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( spectra_state::outtimer) } -static MACHINE_CONFIG_START( spectra ) +MACHINE_CONFIG_START(spectra_state::spectra) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_3_579545MHz/4) // actually a M6503 MCFG_CPU_PROGRAM_MAP(spectra_map) diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp index a4c465b56d6..39c7974919d 100644 --- a/src/mame/drivers/spectrum.cpp +++ b/src/mame/drivers/spectrum.cpp @@ -652,7 +652,7 @@ INTERRUPT_GEN_MEMBER(spectrum_state::spec_interrupt) timer_set(attotime::from_ticks(32, m_maincpu->clock()), 0, 0); } -MACHINE_CONFIG_START( spectrum_common ) +MACHINE_CONFIG_START(spectrum_state::spectrum_common) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, X1 / 4) /* This is verified only for the ZX Spectrum. Other clones are reported to have different clocks */ @@ -699,7 +699,7 @@ MACHINE_CONFIG_START( spectrum_common ) MCFG_SOFTWARE_LIST_ADD("cass_list", "spectrum_cass") MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( spectrum, spectrum_common ) +MACHINE_CONFIG_DERIVED(spectrum_state::spectrum, spectrum_common) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) // This configuration is verified only for the original ZX Spectrum. diff --git a/src/mame/drivers/speedatk.cpp b/src/mame/drivers/speedatk.cpp index a383be07d4b..58b6948154d 100644 --- a/src/mame/drivers/speedatk.cpp +++ b/src/mame/drivers/speedatk.cpp @@ -304,7 +304,7 @@ WRITE8_MEMBER(speedatk_state::output_w) logerror("%02x\n",data); } -static MACHINE_CONFIG_START( speedatk ) +MACHINE_CONFIG_START(speedatk_state::speedatk) MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/2) //divider is unknown MCFG_CPU_PROGRAM_MAP(speedatk_mem) diff --git a/src/mame/drivers/speedbal.cpp b/src/mame/drivers/speedbal.cpp index c20cfe8dbac..451143213b3 100644 --- a/src/mame/drivers/speedbal.cpp +++ b/src/mame/drivers/speedbal.cpp @@ -258,7 +258,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( speedbal ) +MACHINE_CONFIG_START(speedbal_state::speedbal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) // 4 MHz diff --git a/src/mame/drivers/speedspn.cpp b/src/mame/drivers/speedspn.cpp index 218b3b62634..5e2e6a86746 100644 --- a/src/mame/drivers/speedspn.cpp +++ b/src/mame/drivers/speedspn.cpp @@ -277,7 +277,7 @@ void speedspn_state::machine_start() } -static MACHINE_CONFIG_START( speedspn ) +MACHINE_CONFIG_START(speedspn_state::speedspn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,6000000) /* 6 MHz */ diff --git a/src/mame/drivers/speglsht.cpp b/src/mame/drivers/speglsht.cpp index 2a682f6e8dd..a1d29ea0526 100644 --- a/src/mame/drivers/speglsht.cpp +++ b/src/mame/drivers/speglsht.cpp @@ -144,6 +144,7 @@ public: required_device m_subcpu; DECLARE_WRITE8_MEMBER(st0016_rom_bank_w); + void speglsht(machine_config &config); }; @@ -395,7 +396,7 @@ uint32_t speglsht_state::screen_update_speglsht(screen_device &screen, bitmap_rg return 0; } -static MACHINE_CONFIG_START( speglsht ) +MACHINE_CONFIG_START(speglsht_state::speglsht) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",ST0016_CPU, 8000000) /* 8 MHz ? */ MCFG_CPU_PROGRAM_MAP(st0016_mem) diff --git a/src/mame/drivers/spiders.cpp b/src/mame/drivers/spiders.cpp index 617c3afc1f8..73a147bcfc3 100644 --- a/src/mame/drivers/spiders.cpp +++ b/src/mame/drivers/spiders.cpp @@ -536,7 +536,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( spiders ) +MACHINE_CONFIG_START(spiders_state::spiders) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, 2800000) diff --git a/src/mame/drivers/spinb.cpp b/src/mame/drivers/spinb.cpp index 8729910e145..6ab54ee7ac6 100644 --- a/src/mame/drivers/spinb.cpp +++ b/src/mame/drivers/spinb.cpp @@ -94,6 +94,9 @@ public: DECLARE_DRIVER_INIT(game2); DECLARE_PALETTE_INIT(spinb); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void jolypark(machine_config &config); + void vrnwrld(machine_config &config); + void spinb(machine_config &config); private: bool m_pc0a; bool m_pc0m; @@ -621,7 +624,7 @@ uint32_t spinb_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, return 0; } -static MACHINE_CONFIG_START( spinb ) +MACHINE_CONFIG_START(spinb_state::spinb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2) MCFG_CPU_PROGRAM_MAP(spinb_map) @@ -718,7 +721,7 @@ static MACHINE_CONFIG_START( spinb ) MCFG_74157_OUT_CB(DEVWRITE8("msm_m", msm5205_device, data_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jolypark, spinb ) +MACHINE_CONFIG_DERIVED(spinb_state::jolypark, spinb) MCFG_SOUND_REPLACE("msm_a", MSM6585, XTAL_640kHz) MCFG_MSM6585_VCK_CALLBACK(DEVWRITELINE("ic5a", ttl7474_device, clock_w)) MCFG_MSM6585_PRESCALER_SELECTOR(S40) @@ -729,7 +732,7 @@ static MACHINE_CONFIG_DERIVED( jolypark, spinb ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmmvol", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vrnwrld, jolypark ) +MACHINE_CONFIG_DERIVED(spinb_state::vrnwrld, jolypark) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(vrnwrld_map) diff --git a/src/mame/drivers/spirit76.cpp b/src/mame/drivers/spirit76.cpp index 85d1eda337d..8bf85d70ad1 100644 --- a/src/mame/drivers/spirit76.cpp +++ b/src/mame/drivers/spirit76.cpp @@ -40,6 +40,7 @@ public: DECLARE_READ8_MEMBER(portb_r); DECLARE_WRITE8_MEMBER(unk_w); DECLARE_READ8_MEMBER(unk_r); + void spirit76(machine_config &config); private: u8 m_t_c; virtual void machine_reset() override; @@ -116,7 +117,7 @@ void spirit76_state::machine_reset() m_t_c = 0; } -static MACHINE_CONFIG_START( spirit76 ) +MACHINE_CONFIG_START(spirit76_state::spirit76) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 500000) MCFG_CPU_PROGRAM_MAP(maincpu_map) diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp index 9029fe457f2..fa27f57e10b 100644 --- a/src/mame/drivers/splash.cpp +++ b/src/mame/drivers/splash.cpp @@ -471,7 +471,7 @@ MACHINE_RESET_MEMBER(splash_state,splash) m_ret = 0x100; } -static MACHINE_CONFIG_START( splash ) +MACHINE_CONFIG_START(splash_state::splash) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12MHz (24/2) */ @@ -533,7 +533,7 @@ INTERRUPT_GEN_MEMBER(splash_state::roldfrog_interrupt) roldfrog_update_irq(); } -static MACHINE_CONFIG_START( roldfrog ) +MACHINE_CONFIG_START(splash_state::roldfrog) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz - verified */ @@ -627,7 +627,7 @@ void funystrp_state::machine_start() save_item(NAME(m_snd_interrupt_enable2)); } -static MACHINE_CONFIG_START( funystrp ) +MACHINE_CONFIG_START(funystrp_state::funystrp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz (24/2) */ diff --git a/src/mame/drivers/splus.cpp b/src/mame/drivers/splus.cpp index 1191a8b4882..b9eb30b3bd4 100644 --- a/src/mame/drivers/splus.cpp +++ b/src/mame/drivers/splus.cpp @@ -120,6 +120,7 @@ public: DECLARE_DRIVER_INIT(splus); required_device m_maincpu; required_device m_i2cmem; + void splus(machine_config &config); }; /* Static Variables */ @@ -682,7 +683,7 @@ INPUT_PORTS_END * Machine Driver * *************************/ -static MACHINE_CONFIG_START( splus ) // basic machine hardware +MACHINE_CONFIG_START(splus_state::splus) // basic machine hardware MCFG_CPU_ADD("maincpu", I80C32, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(splus_map) MCFG_CPU_IO_MAP(splus_iomap) diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp index e62a5b1a4e9..8f805ca9154 100644 --- a/src/mame/drivers/spoker.cpp +++ b/src/mame/drivers/spoker.cpp @@ -97,6 +97,8 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void spoker(machine_config &config); + void _3super8(machine_config &config); }; @@ -589,7 +591,7 @@ void spoker_state::machine_reset() Machine Drivers ***************************************************************************/ -static MACHINE_CONFIG_START( spoker ) +MACHINE_CONFIG_START(spoker_state::spoker) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */ @@ -632,7 +634,7 @@ static MACHINE_CONFIG_START( spoker ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( 3super8, spoker ) +MACHINE_CONFIG_DERIVED(spoker_state::_3super8, spoker) MCFG_CPU_REPLACE("maincpu", Z80, XTAL_24MHz / 4) /* z840006, 24/4 MHz? */ MCFG_CPU_MODIFY("maincpu") @@ -969,4 +971,4 @@ GAME( 1993?, spk116itmx, spk306us, spoker, spoker, spoker_state, 0, GAME( 1993?, spk115it, spk306us, spoker, spoker, spoker_state, spk116it, ROT0, "IGS", "Super Poker (v115IT)", MACHINE_SUPPORTS_SAVE ) GAME( 1993?, spk114it, spk306us, spoker, spoker, spoker_state, 0, ROT0, "IGS", "Super Poker (v114IT)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // needs proper machine driver GAME( 1996, spk102ua, spk306us, spoker, spoker, spoker_state, spkleftover, ROT0, "IGS", "Super Poker (v102UA)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // needs proper machine driver -GAME( 1993?, 3super8, 0, 3super8, 3super8, spoker_state, 3super8, ROT0, "", "3 Super 8 (Italy)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) //roms are badly dumped +GAME( 1993?, 3super8, 0, _3super8,3super8, spoker_state, 3super8, ROT0, "", "3 Super 8 (Italy)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) //roms are badly dumped diff --git a/src/mame/drivers/spool99.cpp b/src/mame/drivers/spool99.cpp index f666619d9f8..b2f4a3bdb49 100644 --- a/src/mame/drivers/spool99.cpp +++ b/src/mame/drivers/spool99.cpp @@ -136,6 +136,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TILE_GET_INFO_MEMBER(get_tile_info); + void vcarn(machine_config &config); + void spool99(machine_config &config); }; TILE_GET_INFO_MEMBER(spool99_state::get_tile_info) @@ -355,7 +357,7 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( spool99 ) +MACHINE_CONFIG_START(spool99_state::spool99) MCFG_CPU_ADD("maincpu", Z80, 24000000/8) MCFG_CPU_PROGRAM_MAP(spool99_map) @@ -384,7 +386,7 @@ static MACHINE_CONFIG_START( spool99 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vcarn, spool99 ) +MACHINE_CONFIG_DERIVED(spool99_state::vcarn, spool99) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(vcarn_map) diff --git a/src/mame/drivers/sprcros2.cpp b/src/mame/drivers/sprcros2.cpp index 2ce28b64e2f..c174fe16724 100644 --- a/src/mame/drivers/sprcros2.cpp +++ b/src/mame/drivers/sprcros2.cpp @@ -104,6 +104,7 @@ public: bool m_slave_nmi_enable; bool m_screen_enable; uint8_t m_bg_scrollx, m_bg_scrolly; + void sprcros2(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -442,7 +443,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(sprcros2_state::master_scanline) m_master_cpu->set_input_line(0, HOLD_LINE); } -static MACHINE_CONFIG_START( sprcros2 ) +MACHINE_CONFIG_START(sprcros2_state::sprcros2) /* basic machine hardware */ MCFG_CPU_ADD("master_cpu",Z80,MAIN_CLOCK/4) diff --git a/src/mame/drivers/sprint2.cpp b/src/mame/drivers/sprint2.cpp index 73e075122e9..883e6171069 100644 --- a/src/mame/drivers/sprint2.cpp +++ b/src/mame/drivers/sprint2.cpp @@ -509,7 +509,7 @@ static GFXDECODE_START( sprint2 ) GFXDECODE_END -static MACHINE_CONFIG_START( sprint2 ) +MACHINE_CONFIG_START(sprint2_state::sprint2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz / 16) @@ -551,7 +551,7 @@ static MACHINE_CONFIG_START( sprint2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sprint1, sprint2 ) +MACHINE_CONFIG_DERIVED(sprint2_state::sprint1, sprint2) /* sound hardware */ MCFG_DEVICE_REMOVE("lspeaker") @@ -566,7 +566,7 @@ static MACHINE_CONFIG_DERIVED( sprint1, sprint2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dominos, sprint2 ) +MACHINE_CONFIG_DERIVED(sprint2_state::dominos, sprint2) /* sound hardware */ MCFG_DEVICE_REMOVE("lspeaker") @@ -580,7 +580,7 @@ static MACHINE_CONFIG_DERIVED( dominos, sprint2 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dominos4, dominos ) +MACHINE_CONFIG_DERIVED(sprint2_state::dominos4, dominos) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(sprint2_state, lamp3_w)) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(sprint2_state, lamp4_w)) diff --git a/src/mame/drivers/sprint4.cpp b/src/mame/drivers/sprint4.cpp index b65be1a2ca3..40ebcca3dc9 100644 --- a/src/mame/drivers/sprint4.cpp +++ b/src/mame/drivers/sprint4.cpp @@ -398,7 +398,7 @@ static GFXDECODE_START( sprint4 ) GFXDECODE_END -static MACHINE_CONFIG_START( sprint4 ) +MACHINE_CONFIG_START(sprint4_state::sprint4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, PIXEL_CLOCK / 8) diff --git a/src/mame/drivers/sprint8.cpp b/src/mame/drivers/sprint8.cpp index 45b5b4dc6ba..b390a1d80f3 100644 --- a/src/mame/drivers/sprint8.cpp +++ b/src/mame/drivers/sprint8.cpp @@ -454,7 +454,7 @@ static GFXDECODE_START( sprint8 ) GFXDECODE_END -static MACHINE_CONFIG_START( sprint8 ) +MACHINE_CONFIG_START(sprint8_state::sprint8) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 11055000 / 11) /* ? */ diff --git a/src/mame/drivers/spy.cpp b/src/mame/drivers/spy.cpp index 78d2534c52a..9524b1a65e3 100644 --- a/src/mame/drivers/spy.cpp +++ b/src/mame/drivers/spy.cpp @@ -492,7 +492,7 @@ void spy_state::machine_reset() m_old_3f90 = -1; } -static MACHINE_CONFIG_START( spy ) +MACHINE_CONFIG_START(spy_state::spy) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_24MHz / 8) // 3 MHz? (divided by 051961) diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp index 44b19bd104b..a090de95e11 100644 --- a/src/mame/drivers/spyhuntertec.cpp +++ b/src/mame/drivers/spyhuntertec.cpp @@ -111,6 +111,7 @@ public: uint8_t m_analog_select; uint8_t m_analog_count; + void spyhuntertec(machine_config &config); }; WRITE8_MEMBER(spyhuntertec_state::ay1_porta_w) @@ -657,7 +658,7 @@ void spyhuntertec_state::machine_reset() -static MACHINE_CONFIG_START( spyhuntertec ) +MACHINE_CONFIG_START(spyhuntertec_state::spyhuntertec) // note: no ctc, no nvram // 2*z80, 3*ay8912 diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp index 3e37cfceb16..bea032ace40 100644 --- a/src/mame/drivers/squale.cpp +++ b/src/mame/drivers/squale.cpp @@ -134,6 +134,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(squale_scanline); + void squale(machine_config &config); private: required_device m_acia; required_device m_ay8910; @@ -778,7 +779,7 @@ void squale_state::machine_reset() { } -static MACHINE_CONFIG_START( squale ) +MACHINE_CONFIG_START(squale_state::squale) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(squale_mem) diff --git a/src/mame/drivers/srmp2.cpp b/src/mame/drivers/srmp2.cpp index 85d59bd3fd5..d140428c000 100644 --- a/src/mame/drivers/srmp2.cpp +++ b/src/mame/drivers/srmp2.cpp @@ -1135,7 +1135,7 @@ static GFXDECODE_START( srmp3 ) GFXDECODE_END -static MACHINE_CONFIG_START( srmp2 ) +MACHINE_CONFIG_START(srmp2_state::srmp2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */ @@ -1179,7 +1179,7 @@ static MACHINE_CONFIG_START( srmp2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( srmp3 ) +MACHINE_CONFIG_START(srmp2_state::srmp3) /* basic machine hardware */ @@ -1225,7 +1225,7 @@ static MACHINE_CONFIG_START( srmp3 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rmgoldyh, srmp3 ) +MACHINE_CONFIG_DERIVED(srmp2_state::rmgoldyh, srmp3) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(rmgoldyh_map) @@ -1234,7 +1234,7 @@ static MACHINE_CONFIG_DERIVED( rmgoldyh, srmp3 ) MCFG_MACHINE_START_OVERRIDE(srmp2_state,rmgoldyh) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mjyuugi ) +MACHINE_CONFIG_START(srmp2_state::mjyuugi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */ diff --git a/src/mame/drivers/srmp5.cpp b/src/mame/drivers/srmp5.cpp index 8e8c6a5361e..ffc3269a664 100644 --- a/src/mame/drivers/srmp5.cpp +++ b/src/mame/drivers/srmp5.cpp @@ -123,6 +123,7 @@ public: DECLARE_WRITE8_MEMBER(st0016_rom_bank_w); + void srmp5(machine_config &config); }; @@ -551,7 +552,7 @@ static GFXDECODE_START( srmp5 ) //GFXDECODE_ENTRY( "gfx1", 0, tile_16x16x8_layout, 0x0, 0x800 ) GFXDECODE_END -static MACHINE_CONFIG_START( srmp5 ) +MACHINE_CONFIG_START(srmp5_state::srmp5) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",ST0016_CPU,8000000) diff --git a/src/mame/drivers/srmp6.cpp b/src/mame/drivers/srmp6.cpp index d3a8e48edd2..907849a9265 100644 --- a/src/mame/drivers/srmp6.cpp +++ b/src/mame/drivers/srmp6.cpp @@ -120,6 +120,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void srmp6(machine_config &config); }; #define VERBOSE 0 @@ -676,7 +677,7 @@ INPUT_PORTS_END Machine driver ***************************************************************************/ -static MACHINE_CONFIG_START( srmp6 ) +MACHINE_CONFIG_START(srmp6_state::srmp6) MCFG_CPU_ADD("maincpu", M68000, 16000000) MCFG_CPU_PROGRAM_MAP(srmp6_map) diff --git a/src/mame/drivers/srumbler.cpp b/src/mame/drivers/srumbler.cpp index 8a8eff46f4d..1cc161ba0c1 100644 --- a/src/mame/drivers/srumbler.cpp +++ b/src/mame/drivers/srumbler.cpp @@ -243,7 +243,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( srumbler ) +MACHINE_CONFIG_START(srumbler_state::srumbler) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, 6000000) /* HD68B09P at 6 MHz (?) */ diff --git a/src/mame/drivers/ssem.cpp b/src/mame/drivers/ssem.cpp index 7f6b1a85351..c48810e07bc 100644 --- a/src/mame/drivers/ssem.cpp +++ b/src/mame/drivers/ssem.cpp @@ -31,6 +31,7 @@ public: inline uint32_t reverse(uint32_t v); void strlower(char *buf); + void ssem(machine_config &config); private: template void glyph_print(bitmap_rgb32 &bitmap, int32_t x, int32_t y, Format &&fmt, Params &&...args); @@ -625,7 +626,7 @@ void ssem_state::machine_reset() m_store_line = 0; } -static MACHINE_CONFIG_START( ssem ) +MACHINE_CONFIG_START(ssem_state::ssem) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SSEMCPU, 700) MCFG_CPU_PROGRAM_MAP(ssem_map) diff --git a/src/mame/drivers/ssfindo.cpp b/src/mame/drivers/ssfindo.cpp index 5d4ff6492e3..b6c0d7096b6 100644 --- a/src/mame/drivers/ssfindo.cpp +++ b/src/mame/drivers/ssfindo.cpp @@ -296,6 +296,9 @@ public: void PS7500_reset(); void ssfindo_speedups(); void ppcar_speedups(); + void ssfindo(machine_config &config); + void ppcar(machine_config &config); + void tetfight(machine_config &config); }; @@ -782,7 +785,7 @@ static INPUT_PORTS_START( tetfight ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ssfindo ) +MACHINE_CONFIG_START(ssfindo_state::ssfindo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM7, 54000000) // guess... @@ -803,7 +806,7 @@ static MACHINE_CONFIG_START( ssfindo ) MCFG_PALETTE_ADD("palette", 256) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ppcar, ssfindo ) +MACHINE_CONFIG_DERIVED(ssfindo_state::ppcar, ssfindo) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -812,7 +815,7 @@ static MACHINE_CONFIG_DERIVED( ppcar, ssfindo ) MCFG_DEVICE_REMOVE("i2cmem") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tetfight, ppcar ) +MACHINE_CONFIG_DERIVED(ssfindo_state::tetfight, ppcar) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/sshangha.cpp b/src/mame/drivers/sshangha.cpp index 82079a606b6..b8e27cd950a 100644 --- a/src/mame/drivers/sshangha.cpp +++ b/src/mame/drivers/sshangha.cpp @@ -378,7 +378,7 @@ DECO16IC_BANK_CB_MEMBER(sshangha_state::bank_callback) return (bank >> 4) * 0x1000; } -static MACHINE_CONFIG_START( sshangha ) +MACHINE_CONFIG_START(sshangha_state::sshangha) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 28000000/2) @@ -442,7 +442,7 @@ static MACHINE_CONFIG_START( sshangha ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.27) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sshanghb, sshangha ) +MACHINE_CONFIG_DERIVED(sshangha_state::sshanghb, sshangha) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sshanghb_map) diff --git a/src/mame/drivers/sshot.cpp b/src/mame/drivers/sshot.cpp index 68c27d8fce9..acd2bd42b24 100644 --- a/src/mame/drivers/sshot.cpp +++ b/src/mame/drivers/sshot.cpp @@ -188,6 +188,7 @@ public: uint32_t screen_update_supershot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void supershot(machine_config &config); }; @@ -337,7 +338,7 @@ static GFXDECODE_START( supershot ) GFXDECODE_ENTRY( "gfx", 0, supershot_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( supershot ) +MACHINE_CONFIG_START(supershot_state::supershot) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SCMP, XTAL_11_289MHz/4) diff --git a/src/mame/drivers/ssingles.cpp b/src/mame/drivers/ssingles.cpp index d3c0f7e7e92..e5da51ab378 100644 --- a/src/mame/drivers/ssingles.cpp +++ b/src/mame/drivers/ssingles.cpp @@ -183,6 +183,8 @@ public: MC6845_UPDATE_ROW(ssingles_update_row); MC6845_UPDATE_ROW(atamanot_update_row); required_device m_maincpu; + void ssingles(machine_config &config); + void atamanot(machine_config &config); }; //fake palette @@ -536,7 +538,7 @@ static GFXDECODE_START( atamanot ) GFXDECODE_ENTRY( "kanji_lc", 0, layout_8x16, 0, 8 ) GFXDECODE_END -static MACHINE_CONFIG_START( ssingles ) +MACHINE_CONFIG_START(ssingles_state::ssingles) MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(ssingles_map) @@ -572,7 +574,7 @@ INTERRUPT_GEN_MEMBER(ssingles_state::atamanot_irq) // ... } -static MACHINE_CONFIG_DERIVED( atamanot, ssingles ) +MACHINE_CONFIG_DERIVED(ssingles_state::atamanot, ssingles) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(atamanot_map) MCFG_CPU_IO_MAP(atamanot_io_map) diff --git a/src/mame/drivers/sslam.cpp b/src/mame/drivers/sslam.cpp index f56ca6f9dec..70173c509b0 100644 --- a/src/mame/drivers/sslam.cpp +++ b/src/mame/drivers/sslam.cpp @@ -694,7 +694,7 @@ GFXDECODE_END /* Machine Driver */ -static MACHINE_CONFIG_START( sslam ) +MACHINE_CONFIG_START(sslam_state::sslam) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */ @@ -726,7 +726,7 @@ static MACHINE_CONFIG_START( sslam ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( powerbls ) +MACHINE_CONFIG_START(sslam_state::powerbls) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */ diff --git a/src/mame/drivers/ssozumo.cpp b/src/mame/drivers/ssozumo.cpp index 71f698dcaf9..bbec61e6eac 100644 --- a/src/mame/drivers/ssozumo.cpp +++ b/src/mame/drivers/ssozumo.cpp @@ -197,7 +197,7 @@ INTERRUPT_GEN_MEMBER(ssozumo_state::sound_timer_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( ssozumo ) +MACHINE_CONFIG_START(ssozumo_state::ssozumo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1200000) /* 1.2 MHz ???? */ diff --git a/src/mame/drivers/sspeedr.cpp b/src/mame/drivers/sspeedr.cpp index ea9be851d59..b03508c8ee6 100644 --- a/src/mame/drivers/sspeedr.cpp +++ b/src/mame/drivers/sspeedr.cpp @@ -190,7 +190,7 @@ static GFXDECODE_START( sspeedr ) GFXDECODE_END -static MACHINE_CONFIG_START( sspeedr ) +MACHINE_CONFIG_START(sspeedr_state::sspeedr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_19_968MHz/8) diff --git a/src/mame/drivers/ssrj.cpp b/src/mame/drivers/ssrj.cpp index 469f2aefb41..38790e0874d 100644 --- a/src/mame/drivers/ssrj.cpp +++ b/src/mame/drivers/ssrj.cpp @@ -139,7 +139,7 @@ static GFXDECODE_START( ssrj ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 0x10 ) GFXDECODE_END -static MACHINE_CONFIG_START( ssrj ) +MACHINE_CONFIG_START(ssrj_state::ssrj) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,8000000/2) diff --git a/src/mame/drivers/sstrangr.cpp b/src/mame/drivers/sstrangr.cpp index fb59e1a8c5a..908f6811745 100644 --- a/src/mame/drivers/sstrangr.cpp +++ b/src/mame/drivers/sstrangr.cpp @@ -35,6 +35,8 @@ public: uint32_t screen_update_sstrangr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_sstrngr2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void sstrngr2(machine_config &config); + void sstrangr(machine_config &config); }; @@ -184,7 +186,7 @@ static INPUT_PORTS_START( sstrangr ) INPUT_PORTS_END -static MACHINE_CONFIG_START( sstrangr ) +MACHINE_CONFIG_START(sstrangr_state::sstrangr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080,1996800) /* clock is a guess, taken from mw8080bw */ @@ -254,7 +256,7 @@ static INPUT_PORTS_START( sstrngr2 ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( sstrngr2, sstrangr ) +MACHINE_CONFIG_DERIVED(sstrangr_state::sstrngr2, sstrangr) /* basic machine hardware */ diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp index 366fcd49b8e..b8acd2bbebc 100644 --- a/src/mame/drivers/ssv.cpp +++ b/src/mame/drivers/ssv.cpp @@ -2553,7 +2553,7 @@ DRIVER_INIT_MEMBER(ssv_state,jsk) { init(0); save_item(NAME(m_latche #define SSV_VBEND 0 #define SSV_VBSTART 0xf0 -static MACHINE_CONFIG_START( ssv ) +MACHINE_CONFIG_START(ssv_state::ssv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V60, SSV_MASTER_CLOCK) /* Based on STA-0001 & STA-0001B System boards */ @@ -2585,7 +2585,7 @@ static MACHINE_CONFIG_START( ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( drifto94, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::drifto94, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2605,7 +2605,7 @@ static MACHINE_CONFIG_DERIVED( drifto94, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gdfs, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::gdfs, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2628,7 +2628,7 @@ static MACHINE_CONFIG_DERIVED( gdfs, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hypreact, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::hypreact, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2642,7 +2642,7 @@ static MACHINE_CONFIG_DERIVED( hypreact, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hypreac2, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::hypreac2, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2656,7 +2656,7 @@ static MACHINE_CONFIG_DERIVED( hypreac2, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( janjans1, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::janjans1, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2668,7 +2668,7 @@ static MACHINE_CONFIG_DERIVED( janjans1, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( keithlcy, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::keithlcy, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2680,7 +2680,7 @@ static MACHINE_CONFIG_DERIVED( keithlcy, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( meosism, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::meosism, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2696,7 +2696,7 @@ static MACHINE_CONFIG_DERIVED( meosism, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mslider, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::mslider, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2708,7 +2708,7 @@ static MACHINE_CONFIG_DERIVED( mslider, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ryorioh, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::ryorioh, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2721,7 +2721,7 @@ static MACHINE_CONFIG_DERIVED( ryorioh, ssv ) MCFG_SCREEN_VISIBLE_AREA(0, (0xcb-0x23)*2-1, 0, (0xfe - 0x0e)-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vasara, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::vasara, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2734,7 +2734,7 @@ static MACHINE_CONFIG_DERIVED( vasara, ssv ) MCFG_SCREEN_VISIBLE_AREA(0, (0xcc-0x24)*2-1, 0,(0xfe - 0x0e)-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( srmp4, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::srmp4, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2748,7 +2748,7 @@ static MACHINE_CONFIG_DERIVED( srmp4, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( srmp7, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::srmp7, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2762,7 +2762,7 @@ static MACHINE_CONFIG_DERIVED( srmp7, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( stmblade, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::stmblade, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2782,7 +2782,7 @@ static MACHINE_CONFIG_DERIVED( stmblade, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( survarts, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::survarts, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2796,7 +2796,7 @@ static MACHINE_CONFIG_DERIVED( survarts, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dynagear, survarts ) +MACHINE_CONFIG_DERIVED(ssv_state::dynagear, survarts) /* basic machine hardware */ /* video hardware */ @@ -2805,7 +2805,7 @@ static MACHINE_CONFIG_DERIVED( dynagear, survarts ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( eaglshot, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::eaglshot, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2829,7 +2829,7 @@ static MACHINE_CONFIG_DERIVED( eaglshot, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sxyreact, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::sxyreact, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2844,7 +2844,7 @@ static MACHINE_CONFIG_DERIVED( sxyreact, ssv ) MCFG_SCREEN_VISIBLE_AREA(0, (0xcb - 0x22)*2-1, 0, (0xfe - 0x0e)-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sxyreac2, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::sxyreac2, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2859,7 +2859,7 @@ static MACHINE_CONFIG_DERIVED( sxyreac2, ssv ) MCFG_SCREEN_VISIBLE_AREA(0, (0xcb - 0x23)*2-1, 0, (0xfe - 0x0e)-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cairblad, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::cairblad, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2874,7 +2874,7 @@ static MACHINE_CONFIG_DERIVED( cairblad, ssv ) MCFG_SCREEN_VISIBLE_AREA(0, (0xcb - 0x22)*2-1, 0, (0xfe - 0x0e)-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( twineag2, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::twineag2, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2894,7 +2894,7 @@ static MACHINE_CONFIG_DERIVED( twineag2, ssv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ultrax, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::ultrax, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2907,7 +2907,7 @@ static MACHINE_CONFIG_DERIVED( ultrax, ssv ) MCFG_SCREEN_VISIBLE_AREA(0, (0xd4 - 0x2c)*2-1, 0, (0x102 - 0x12)-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jsk, ssv ) +MACHINE_CONFIG_DERIVED(ssv_state::jsk, ssv) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/ssystem3.cpp b/src/mame/drivers/ssystem3.cpp index c4a41b818f8..a0216f6fc26 100644 --- a/src/mame/drivers/ssystem3.cpp +++ b/src/mame/drivers/ssystem3.cpp @@ -286,7 +286,7 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( ssystem3 ) +MACHINE_CONFIG_START(ssystem3_state::ssystem3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1000000) MCFG_CPU_PROGRAM_MAP(ssystem3_map) diff --git a/src/mame/drivers/st17xx.cpp b/src/mame/drivers/st17xx.cpp index 1358ce0ea78..993a3ad8374 100644 --- a/src/mame/drivers/st17xx.cpp +++ b/src/mame/drivers/st17xx.cpp @@ -53,6 +53,7 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void st17xx(machine_config &config); }; /* Memory Maps */ @@ -85,7 +86,7 @@ void st17xx_state::machine_start() /* Machine Driver */ -static MACHINE_CONFIG_START( st17xx ) +MACHINE_CONFIG_START(st17xx_state::st17xx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM7, 50000000) /* speed unknown */ MCFG_CPU_PROGRAM_MAP(cpu_map) diff --git a/src/mame/drivers/st_mp100.cpp b/src/mame/drivers/st_mp100.cpp index 7c172c497a0..b8507da14ba 100644 --- a/src/mame/drivers/st_mp100.cpp +++ b/src/mame/drivers/st_mp100.cpp @@ -58,6 +58,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(self_test); TIMER_DEVICE_CALLBACK_MEMBER(timer_x); TIMER_DEVICE_CALLBACK_MEMBER(u11_timer); + void st_mp100(machine_config &config); private: uint8_t m_u10a; uint8_t m_u10b; @@ -700,7 +701,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( st_mp100_state::u11_timer ) m_pia_u11->ca1_w(m_u11_timer); } -static MACHINE_CONFIG_START( st_mp100 ) +MACHINE_CONFIG_START(st_mp100_state::st_mp100) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) // no xtal, just 2 chips forming a random oscillator MCFG_CPU_PROGRAM_MAP(st_mp100_map) diff --git a/src/mame/drivers/st_mp200.cpp b/src/mame/drivers/st_mp200.cpp index 06db7b4222e..e98c0b5b68f 100644 --- a/src/mame/drivers/st_mp200.cpp +++ b/src/mame/drivers/st_mp200.cpp @@ -68,6 +68,8 @@ public: DECLARE_INPUT_CHANGED_MEMBER(self_test); TIMER_DEVICE_CALLBACK_MEMBER(timer_x); TIMER_DEVICE_CALLBACK_MEMBER(u11_timer); + void st_mp201(machine_config &config); + void st_mp200(machine_config &config); private: uint8_t m_u10a; uint8_t m_u10b; @@ -567,7 +569,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( st_mp200_state::u11_timer ) m_pia_u11->ca1_w(m_u11_timer); } -static MACHINE_CONFIG_START( st_mp200 ) +MACHINE_CONFIG_START(st_mp200_state::st_mp200) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 1000000) // no xtal, just 2 chips forming a random oscillator MCFG_CPU_PROGRAM_MAP(st_mp200_map) @@ -603,7 +605,7 @@ static MACHINE_CONFIG_START( st_mp200 ) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_d", st_mp200_state, u11_timer, attotime::from_hz(634)) // 555 timer*2 MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( st_mp201, st_mp200 ) +MACHINE_CONFIG_DERIVED(st_mp200_state::st_mp201, st_mp200) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("speech", S14001A, S14001_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/mame/drivers/stactics.cpp b/src/mame/drivers/stactics.cpp index 6868cb2582d..b0e8143762d 100644 --- a/src/mame/drivers/stactics.cpp +++ b/src/mame/drivers/stactics.cpp @@ -308,7 +308,7 @@ void stactics_state::machine_start() * *************************************/ -static MACHINE_CONFIG_START( stactics ) +MACHINE_CONFIG_START(stactics_state::stactics) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, 1933560) diff --git a/src/mame/drivers/stadhero.cpp b/src/mame/drivers/stadhero.cpp index 4507fd606e5..1eebb66324f 100644 --- a/src/mame/drivers/stadhero.cpp +++ b/src/mame/drivers/stadhero.cpp @@ -199,7 +199,7 @@ GFXDECODE_END /******************************************************************************/ -static MACHINE_CONFIG_START( stadhero ) +MACHINE_CONFIG_START(stadhero_state::stadhero) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) diff --git a/src/mame/drivers/starcrus.cpp b/src/mame/drivers/starcrus.cpp index 7948b81d008..9a11a3a6dd5 100644 --- a/src/mame/drivers/starcrus.cpp +++ b/src/mame/drivers/starcrus.cpp @@ -134,7 +134,7 @@ static const char *const starcrus_sample_names[] = }; -static MACHINE_CONFIG_START( starcrus ) +MACHINE_CONFIG_START(starcrus_state::starcrus) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080,9750000/9) /* 8224 chip is a divide by 9 */ diff --git a/src/mame/drivers/starfire.cpp b/src/mame/drivers/starfire.cpp index 51a4c427ddb..74f3b9208c7 100644 --- a/src/mame/drivers/starfire.cpp +++ b/src/mame/drivers/starfire.cpp @@ -327,7 +327,7 @@ INTERRUPT_GEN_MEMBER(starfire_state::vblank_int) } -static MACHINE_CONFIG_START( fireone ) +MACHINE_CONFIG_START(starfire_state::fireone) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, STARFIRE_CPU_CLOCK) @@ -343,7 +343,7 @@ static MACHINE_CONFIG_START( fireone ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( starfire, fireone ) +MACHINE_CONFIG_DERIVED(starfire_state::starfire, fireone) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/stargame.cpp b/src/mame/drivers/stargame.cpp index 83cc35821d2..74723a0c9dd 100644 --- a/src/mame/drivers/stargame.cpp +++ b/src/mame/drivers/stargame.cpp @@ -32,6 +32,7 @@ public: DECLARE_WRITE8_MEMBER(rint_w); DECLARE_MACHINE_RESET(stargame); + void stargame(machine_config &config); private: required_device m_maincpu; required_device m_audiocpu; @@ -92,7 +93,7 @@ static const z80_daisy_config daisy_chain[] = }; -static MACHINE_CONFIG_START( stargame ) +MACHINE_CONFIG_START(stargame_state::stargame) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 15000000 / 4) // clock line marked as CK4 and derived from 15MHz crystal MCFG_CPU_PROGRAM_MAP(maincpu_map) diff --git a/src/mame/drivers/starshp1.cpp b/src/mame/drivers/starshp1.cpp index 6d71cde804c..6d3519d3c5a 100644 --- a/src/mame/drivers/starshp1.cpp +++ b/src/mame/drivers/starshp1.cpp @@ -287,7 +287,7 @@ static GFXDECODE_START( starshp1 ) GFXDECODE_END -static MACHINE_CONFIG_START( starshp1 ) +MACHINE_CONFIG_START(starshp1_state::starshp1) /* basic machine hardware */ diff --git a/src/mame/drivers/starwars.cpp b/src/mame/drivers/starwars.cpp index 3166c409202..914fd07731b 100644 --- a/src/mame/drivers/starwars.cpp +++ b/src/mame/drivers/starwars.cpp @@ -299,7 +299,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( starwars ) +MACHINE_CONFIG_START(starwars_state::starwars) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK / 8) @@ -370,7 +370,7 @@ static MACHINE_CONFIG_START( starwars ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( esb, starwars ) +MACHINE_CONFIG_DERIVED(starwars_state::esb, starwars) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(esb_main_map) diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp index fb8ac5c9188..1c63f804059 100644 --- a/src/mame/drivers/statriv2.cpp +++ b/src/mame/drivers/statriv2.cpp @@ -122,6 +122,9 @@ public: DECLARE_VIDEO_START(vertical); uint32_t screen_update_statriv2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(statriv2_interrupt); + void statriv2(machine_config &config); + void funcsino(machine_config &config); + void statriv2v(machine_config &config); }; @@ -590,7 +593,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( statriv2 ) +MACHINE_CONFIG_START(statriv2_state::statriv2) /* basic machine hardware */ /* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */ MCFG_CPU_ADD("maincpu", I8085A, MASTER_CLOCK) @@ -629,7 +632,7 @@ static MACHINE_CONFIG_START( statriv2 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( statriv2v, statriv2 ) +MACHINE_CONFIG_DERIVED(statriv2_state::statriv2v, statriv2) /* basic machine hardware */ @@ -640,7 +643,7 @@ static MACHINE_CONFIG_DERIVED( statriv2v, statriv2 ) MCFG_GFXDECODE_MODIFY("gfxdecode", vertical) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( funcsino, statriv2 ) +MACHINE_CONFIG_DERIVED(statriv2_state::funcsino, statriv2) /* basic machine hardware */ diff --git a/src/mame/drivers/stellafr.cpp b/src/mame/drivers/stellafr.cpp index 80effac3586..55d7a51c13c 100644 --- a/src/mame/drivers/stellafr.cpp +++ b/src/mame/drivers/stellafr.cpp @@ -33,6 +33,7 @@ public: DECLARE_WRITE8_MEMBER(duart_output_w); DECLARE_WRITE8_MEMBER(ay8910_portb_w); + void stellafr(machine_config &config); protected: // devices @@ -86,7 +87,7 @@ static INPUT_PORTS_START( stellafr ) INPUT_PORTS_END -static MACHINE_CONFIG_START( stellafr ) +MACHINE_CONFIG_START(stellafr_state::stellafr) MCFG_CPU_ADD("maincpu", M68000, 10000000 ) //? MCFG_CPU_PROGRAM_MAP(stellafr_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(stellafr_state, irq_ack) diff --git a/src/mame/drivers/stfight.cpp b/src/mame/drivers/stfight.cpp index 3acabb812a2..94fc9a6459e 100644 --- a/src/mame/drivers/stfight.cpp +++ b/src/mame/drivers/stfight.cpp @@ -448,7 +448,7 @@ INPUT_PORTS_END -static MACHINE_CONFIG_START( stfight_base ) +MACHINE_CONFIG_START(stfight_state::stfight_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 4) @@ -492,7 +492,7 @@ static MACHINE_CONFIG_START( stfight_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( stfight, stfight_base ) +MACHINE_CONFIG_DERIVED(stfight_state::stfight, stfight_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(stfight_cpu1_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) @@ -502,7 +502,7 @@ static MACHINE_CONFIG_DERIVED( stfight, stfight_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cshooter, stfight_base ) +MACHINE_CONFIG_DERIVED(stfight_state::cshooter, stfight_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(cshooter_cpu1_map) MCFG_CPU_VBLANK_INT_DRIVER("airraid_vid:screen", stfight_state, stfight_vb_interrupt) diff --git a/src/mame/drivers/stlforce.cpp b/src/mame/drivers/stlforce.cpp index 418bdd09607..8dbfcf076e1 100644 --- a/src/mame/drivers/stlforce.cpp +++ b/src/mame/drivers/stlforce.cpp @@ -191,7 +191,7 @@ static GFXDECODE_START( stlforce ) GFXDECODE_END -static MACHINE_CONFIG_START( stlforce ) +MACHINE_CONFIG_START(stlforce_state::stlforce) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 15000000) @@ -220,7 +220,7 @@ static MACHINE_CONFIG_START( stlforce ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( twinbrat, stlforce ) +MACHINE_CONFIG_DERIVED(stlforce_state::twinbrat, stlforce) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/stratos.cpp b/src/mame/drivers/stratos.cpp index 68cc41299d6..00b704f9a72 100644 --- a/src/mame/drivers/stratos.cpp +++ b/src/mame/drivers/stratos.cpp @@ -37,6 +37,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(irq_timer); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void stratos(machine_config &config); private: std::unique_ptr nvram_data; uint8_t control, led_latch_control; @@ -343,7 +344,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( stratos ) INPUT_PORTS_END -static MACHINE_CONFIG_START( stratos ) +MACHINE_CONFIG_START(stratos_state::stratos) MCFG_CPU_ADD("maincpu", M65C02, 5670000) MCFG_CPU_PROGRAM_MAP(stratos_mem) diff --git a/src/mame/drivers/strkzn.cpp b/src/mame/drivers/strkzn.cpp index 5602d65002a..8b3d5ed3682 100644 --- a/src/mame/drivers/strkzn.cpp +++ b/src/mame/drivers/strkzn.cpp @@ -22,6 +22,7 @@ public: , m_lightcpu(*this, "lightcpu") { } + void strkzn(machine_config &config); private: required_device m_maincpu; required_device m_lightcpu; @@ -45,7 +46,7 @@ static ADDRESS_MAP_START( light_io, AS_IO, 8, strkzn_state ) AM_RANGE(0x0007, 0x0007) AM_READNOP ADDRESS_MAP_END -static MACHINE_CONFIG_START( strkzn ) +MACHINE_CONFIG_START(strkzn_state::strkzn) MCFG_CPU_ADD("maincpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(main_mem) MCFG_CPU_IO_MAP(main_io) diff --git a/src/mame/drivers/strnskil.cpp b/src/mame/drivers/strnskil.cpp index 9a791c9aa50..974f710237f 100644 --- a/src/mame/drivers/strnskil.cpp +++ b/src/mame/drivers/strnskil.cpp @@ -336,7 +336,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(strnskil_state::strnskil_irq) } -static MACHINE_CONFIG_START( strnskil ) +MACHINE_CONFIG_START(strnskil_state::strnskil) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */ @@ -375,7 +375,7 @@ static MACHINE_CONFIG_START( strnskil ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( banbam, strnskil ) +MACHINE_CONFIG_DERIVED(strnskil_state::banbam, strnskil) MCFG_CPU_ADD("mcu", MB8841, 8000000/2) // MCFG_MB88XX_READ_K_CB(READ8(strnskil_state, mcu_portk_r)) // MCFG_MB88XX_READ_R0_CB(READ8(strnskil_state, mcu_portr0_r)) diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp index a27ce2aa196..a8c0e77f2fc 100644 --- a/src/mame/drivers/studio2.cpp +++ b/src/mame/drivers/studio2.cpp @@ -246,6 +246,8 @@ public: /* keyboard state */ uint8_t m_keylatch; + void studio2_cartslot(machine_config &config); + void studio2(machine_config &config); }; class visicom_state : public studio2_state @@ -263,6 +265,7 @@ public: required_shared_ptr m_color1_ram; DECLARE_WRITE8_MEMBER( dma_w ); + void visicom(machine_config &config); }; class mpt02_state : public studio2_state @@ -288,6 +291,7 @@ public: /* video state */ required_shared_ptr m_color_ram; uint8_t m_color; + void mpt02(machine_config &config); }; @@ -613,7 +617,7 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load ) /* Machine Drivers */ -static MACHINE_CONFIG_START( studio2_cartslot ) +MACHINE_CONFIG_START(studio2_state::studio2_cartslot) MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "studio2_cart") MCFG_GENERIC_EXTENSIONS("st2,bin,rom") MCFG_GENERIC_LOAD(studio2_state, studio2_cart_load) @@ -622,7 +626,7 @@ static MACHINE_CONFIG_START( studio2_cartslot ) MCFG_SOFTWARE_LIST_ADD("cart_list", "studio2") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( studio2 ) +MACHINE_CONFIG_START(studio2_state::studio2) /* basic machine hardware */ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, 1760000) /* the real clock is derived from an oscillator circuit */ MCFG_CPU_PROGRAM_MAP(studio2_map) @@ -649,7 +653,7 @@ static MACHINE_CONFIG_START( studio2 ) MCFG_FRAGMENT_ADD( studio2_cartslot ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( visicom ) +MACHINE_CONFIG_START(visicom_state::visicom) /* basic machine hardware */ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_3_579545MHz/2) MCFG_CPU_PROGRAM_MAP(visicom_map) @@ -681,7 +685,7 @@ static MACHINE_CONFIG_START( visicom ) MCFG_SOFTWARE_LIST_ADD("cart_list", "visicom") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mpt02 ) +MACHINE_CONFIG_START(mpt02_state::mpt02) /* basic machine hardware */ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, CDP1864_CLOCK) MCFG_CPU_PROGRAM_MAP(mpt02_map) diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp index b7b3b9a0b68..3fe68361575 100644 --- a/src/mame/drivers/stuntair.cpp +++ b/src/mame/drivers/stuntair.cpp @@ -143,6 +143,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_stuntair(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_PALETTE_INIT(stuntair); + void stuntair(machine_config &config); }; @@ -506,7 +507,7 @@ void stuntair_state::machine_reset() { } -static MACHINE_CONFIG_START( stuntair ) +MACHINE_CONFIG_START(stuntair_state::stuntair) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* 3 MHz? */ diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index d419f91d2df..ab6a6b59e84 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -1058,7 +1058,7 @@ WRITE8_MEMBER( stv_state::pdr2_output_w ) } -static MACHINE_CONFIG_START( stv ) +MACHINE_CONFIG_START(stv_state::stv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz @@ -1125,7 +1125,7 @@ static MACHINE_CONFIG_START( stv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( stv_5881, stv ) +MACHINE_CONFIG_DERIVED(stv_state::stv_5881, stv) MCFG_DEVICE_ADD("315_5881", SEGA315_5881_CRYPT, 0) MCFG_SET_READ_CALLBACK(stv_state, crypt_read_callback) MACHINE_CONFIG_END @@ -1141,7 +1141,7 @@ uint16_t stv_state::crypt_read_callback_ch2(uint32_t addr) return m_maincpu->space().read_word(0x02000000 + 0x0000000 + (addr * 2)); } -static MACHINE_CONFIG_DERIVED( stv_5838, stv ) +MACHINE_CONFIG_DERIVED(stv_state::stv_5838, stv) MCFG_DEVICE_ADD("315_5838", SEGA315_5838_COMP, 0) MCFG_SET_5838_READ_CALLBACK_CH1(stv_state, crypt_read_callback_ch1) MCFG_SET_5838_READ_CALLBACK_CH2(stv_state, crypt_read_callback_ch2) @@ -1163,7 +1163,7 @@ WRITE32_MEMBER( stv_state::batmanfr_sound_comms_w ) } -static MACHINE_CONFIG_DERIVED( batmanfr, stv ) +MACHINE_CONFIG_DERIVED(stv_state::batmanfr, stv) MCFG_DEVICE_ADD("rax", ACCLAIM_RAX, 0) MACHINE_CONFIG_END @@ -1172,7 +1172,7 @@ MACHINE_CONFIG_END MCFG_GENERIC_CARTSLOT_ADD(_tag, generic_plain_slot, "stv_cart") \ MCFG_GENERIC_LOAD(stv_state, _load) -MACHINE_CONFIG_START( stv_cartslot ) +MACHINE_CONFIG_START(stv_state::stv_cartslot) MCFG_STV_CARTSLOT_ADD("stv_slot1", stv_cart1) MCFG_STV_CARTSLOT_ADD("stv_slot2", stv_cart2) @@ -1182,11 +1182,11 @@ MACHINE_CONFIG_START( stv_cartslot ) MCFG_SOFTWARE_LIST_ADD("cart_list","stv") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( stv_slot, stv ) +MACHINE_CONFIG_DERIVED(stv_state::stv_slot, stv) MCFG_FRAGMENT_ADD( stv_cartslot ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hopper, stv ) +MACHINE_CONFIG_DERIVED(stv_state::hopper, stv) MCFG_HOPPER_ADD("hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH) MACHINE_CONFIG_END diff --git a/src/mame/drivers/su2000.cpp b/src/mame/drivers/su2000.cpp index 51501fe3dc7..a1c0f0534e0 100644 --- a/src/mame/drivers/su2000.cpp +++ b/src/mame/drivers/su2000.cpp @@ -65,6 +65,7 @@ public: su2000_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag){ } + void su2000(machine_config &config); }; @@ -119,7 +120,7 @@ static void ide_interrupt(device_t *device, int state) * *************************************/ -static MACHINE_CONFIG_START( su2000 ) +MACHINE_CONFIG_START(su2000_state::su2000) /* Basic machine hardware */ MCFG_CPU_ADD("maincpu", I486, I486_CLOCK) MCFG_CPU_PROGRAM_MAP(pcat_map) diff --git a/src/mame/drivers/sub.cpp b/src/mame/drivers/sub.cpp index c03cf9d2685..4383df8c90d 100644 --- a/src/mame/drivers/sub.cpp +++ b/src/mame/drivers/sub.cpp @@ -159,6 +159,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(main_irq); INTERRUPT_GEN_MEMBER(sound_irq); + void sub(machine_config &config); }; void sub_state::machine_start() @@ -452,7 +453,7 @@ INTERRUPT_GEN_MEMBER(sub_state::sound_irq) m_soundcpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -static MACHINE_CONFIG_START( sub ) +MACHINE_CONFIG_START(sub_state::sub) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/6) /* ? MHz */ diff --git a/src/mame/drivers/subhuntr.cpp b/src/mame/drivers/subhuntr.cpp index a905b3315aa..4972188309b 100644 --- a/src/mame/drivers/subhuntr.cpp +++ b/src/mame/drivers/subhuntr.cpp @@ -43,6 +43,7 @@ public: virtual void video_start() override; DECLARE_PALETTE_INIT(subhuntr); uint32_t screen_update_subhuntr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void subhuntr(machine_config &config); }; @@ -130,7 +131,7 @@ static GFXDECODE_START( subhuntr ) GFXDECODE_END -static MACHINE_CONFIG_START( subhuntr ) +MACHINE_CONFIG_START(subhuntr_state::subhuntr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 14318180/4/2) diff --git a/src/mame/drivers/subs.cpp b/src/mame/drivers/subs.cpp index 70faf483713..03d00679188 100644 --- a/src/mame/drivers/subs.cpp +++ b/src/mame/drivers/subs.cpp @@ -172,7 +172,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( subs ) +MACHINE_CONFIG_START(subs_state::subs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,12096000/16) /* clock input is the "4H" signal */ diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp index f76bc13a099..0740a2ab9b5 100644 --- a/src/mame/drivers/subsino.cpp +++ b/src/mame/drivers/subsino.cpp @@ -329,6 +329,14 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void mtrainnv(machine_config &config); + void stbsub(machine_config &config); + void tisub(machine_config &config); + void crsbingo(machine_config &config); + void srider(machine_config &config); + void victor21(machine_config &config); + void sharkpy(machine_config &config); + void victor5(machine_config &config); }; void subsino_state::machine_start() @@ -2748,7 +2756,7 @@ GFXDECODE_END * Machine Drivers * ***************************************************************************/ -static MACHINE_CONFIG_START( victor21 ) +MACHINE_CONFIG_START(subsino_state::victor21) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */ MCFG_CPU_PROGRAM_MAP(victor21_map) @@ -2790,7 +2798,7 @@ static MACHINE_CONFIG_START( victor21 ) MACHINE_CONFIG_END /* same but with an additional protection. */ -static MACHINE_CONFIG_DERIVED( victor5, victor21 ) +MACHINE_CONFIG_DERIVED(subsino_state::victor5, victor21) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2798,7 +2806,7 @@ static MACHINE_CONFIG_DERIVED( victor5, victor21 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( crsbingo ) +MACHINE_CONFIG_START(subsino_state::crsbingo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown CPU and clock */ MCFG_CPU_PROGRAM_MAP(crsbingo_map) @@ -2830,7 +2838,7 @@ static MACHINE_CONFIG_START( crsbingo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( srider ) +MACHINE_CONFIG_START(subsino_state::srider) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */ MCFG_CPU_PROGRAM_MAP(srider_map) @@ -2875,14 +2883,14 @@ static MACHINE_CONFIG_START( srider ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sharkpy, srider ) +MACHINE_CONFIG_DERIVED(subsino_state::sharkpy, srider) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sharkpy_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tisub ) +MACHINE_CONFIG_START(subsino_state::tisub) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown CPU and clock */ MCFG_CPU_PROGRAM_MAP(tisub_map) @@ -2923,7 +2931,7 @@ static MACHINE_CONFIG_START( tisub ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( stbsub ) +MACHINE_CONFIG_START(subsino_state::stbsub) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */ MCFG_CPU_PROGRAM_MAP(stbsub_map) @@ -2966,7 +2974,7 @@ static MACHINE_CONFIG_START( stbsub ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mtrainnv, stbsub ) +MACHINE_CONFIG_DERIVED(subsino_state::mtrainnv, stbsub) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp index 03ce8617aa3..1a128e27402 100644 --- a/src/mame/drivers/subsino2.cpp +++ b/src/mame/drivers/subsino2.cpp @@ -183,6 +183,14 @@ public: required_device m_palette; optional_device m_hopper; + void bishjan(machine_config &config); + void saklove(machine_config &config); + void mtrain(machine_config &config); + void humlan(machine_config &config); + void new2001(machine_config &config); + void expcard(machine_config &config); + void xplan(machine_config &config); + void xtrain(machine_config &config); private: inline void ss9601_get_tile_info(layer_t *l, tile_data &tileinfo, tilemap_memory_index tile_index); }; @@ -2332,7 +2340,7 @@ INPUT_PORTS_END Bishou Jan ***************************************************************************/ -static MACHINE_CONFIG_START( bishjan ) +MACHINE_CONFIG_START(subsino2_state::bishjan) MCFG_CPU_ADD("maincpu", H83044, XTAL_44_1MHz / 3) MCFG_CPU_PROGRAM_MAP( bishjan_map ) MCFG_CPU_VBLANK_INT_DRIVER("screen", subsino2_state, irq0_line_hold) @@ -2359,7 +2367,7 @@ static MACHINE_CONFIG_START( bishjan ) // SS9904 MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( new2001, bishjan ) +MACHINE_CONFIG_DERIVED(subsino2_state::new2001, bishjan) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP( new2001_map ) @@ -2368,7 +2376,7 @@ static MACHINE_CONFIG_DERIVED( new2001, bishjan ) MCFG_SCREEN_VISIBLE_AREA( 0, 640-1, 0, 256-16-1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( humlan, bishjan ) +MACHINE_CONFIG_DERIVED(subsino2_state::humlan, bishjan) MCFG_CPU_REPLACE("maincpu", H83044, XTAL_48MHz / 3) MCFG_CPU_PROGRAM_MAP( humlan_map ) MCFG_CPU_VBLANK_INT_DRIVER("screen", subsino2_state, irq0_line_hold) @@ -2381,7 +2389,7 @@ MACHINE_CONFIG_END Magic Train ***************************************************************************/ -static MACHINE_CONFIG_START( mtrain ) +MACHINE_CONFIG_START(subsino2_state::mtrain) MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */ MCFG_CPU_PROGRAM_MAP( mtrain_map ) MCFG_CPU_IO_MAP( mtrain_io ) @@ -2415,7 +2423,7 @@ MACHINE_CONFIG_END Sakura Love - Ying Hua Lian ***************************************************************************/ -static MACHINE_CONFIG_START( saklove ) +MACHINE_CONFIG_START(subsino2_state::saklove) MCFG_CPU_ADD("maincpu", I80188, XTAL_20MHz*2 ) // !! AMD AM188-EM !! MCFG_CPU_PROGRAM_MAP( saklove_map ) MCFG_CPU_IO_MAP( saklove_io ) @@ -2452,7 +2460,7 @@ MACHINE_CONFIG_END X-Plan ***************************************************************************/ -static MACHINE_CONFIG_START( xplan ) +MACHINE_CONFIG_START(subsino2_state::xplan) MCFG_CPU_ADD("maincpu", I80188, XTAL_20MHz*2 ) // !! AMD AM188-EM !! MCFG_CPU_PROGRAM_MAP( xplan_map ) MCFG_CPU_IO_MAP( xplan_io ) @@ -2483,12 +2491,12 @@ static MACHINE_CONFIG_START( xplan ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( xtrain, xplan ) +MACHINE_CONFIG_DERIVED(subsino2_state::xtrain, xplan) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(xtrain_io) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( expcard, xplan ) +MACHINE_CONFIG_DERIVED(subsino2_state::expcard, xplan) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(expcard_io) MACHINE_CONFIG_END diff --git a/src/mame/drivers/summit.cpp b/src/mame/drivers/summit.cpp index a8dc78e162d..c3af6cdfaf0 100644 --- a/src/mame/drivers/summit.cpp +++ b/src/mame/drivers/summit.cpp @@ -42,6 +42,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void summit(machine_config &config); }; @@ -304,7 +305,7 @@ PALETTE_INIT_MEMBER(summit_state, summit) { } -static MACHINE_CONFIG_START( summit ) +MACHINE_CONFIG_START(summit_state::summit) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,4000000) MCFG_CPU_PROGRAM_MAP(mainmap) diff --git a/src/mame/drivers/sumt8035.cpp b/src/mame/drivers/sumt8035.cpp index 8702b86a2b5..fe3270039af 100644 --- a/src/mame/drivers/sumt8035.cpp +++ b/src/mame/drivers/sumt8035.cpp @@ -24,6 +24,7 @@ public: m_maincpu(*this, "maincpu") { } + void summit(machine_config &config); protected: // devices @@ -233,7 +234,7 @@ static INPUT_PORTS_START( summit ) INPUT_PORTS_END -static MACHINE_CONFIG_START( summit ) +MACHINE_CONFIG_START(sumt8035_state::summit) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8035,5000000) MCFG_CPU_PROGRAM_MAP(sumt_map) diff --git a/src/mame/drivers/sun1.cpp b/src/mame/drivers/sun1.cpp index 5ba37f222b6..790d36d094a 100644 --- a/src/mame/drivers/sun1.cpp +++ b/src/mame/drivers/sun1.cpp @@ -75,6 +75,7 @@ public: { } + void sun1(machine_config &config); protected: virtual void machine_reset() override; @@ -110,7 +111,7 @@ void sun1_state::machine_reset() } -static MACHINE_CONFIG_START( sun1 ) +MACHINE_CONFIG_START(sun1_state::sun1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz / 2) MCFG_CPU_PROGRAM_MAP(sun1_mem) diff --git a/src/mame/drivers/sun2.cpp b/src/mame/drivers/sun2.cpp index 5ad02d4b2d8..9c86bcdfa36 100644 --- a/src/mame/drivers/sun2.cpp +++ b/src/mame/drivers/sun2.cpp @@ -174,6 +174,8 @@ public: uint32_t bw2_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void sun2mbus(machine_config &config); + void sun2vme(machine_config &config); private: uint16_t *m_rom_ptr, *m_ram_ptr; uint8_t *m_idprom_ptr; @@ -587,7 +589,7 @@ void sun2_state::machine_reset() m_maincpu->reset(); } -static MACHINE_CONFIG_START( sun2vme ) +MACHINE_CONFIG_START(sun2_state::sun2vme) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, XTAL_19_6608MHz / 2) // or XTAL_24MHz / 2 by jumper setting MCFG_CPU_PROGRAM_MAP(sun2_mem) @@ -659,7 +661,7 @@ static MACHINE_CONFIG_START( sun2vme ) MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsb_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sun2mbus ) +MACHINE_CONFIG_START(sun2_state::sun2mbus) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, XTAL_39_3216MHz / 4) MCFG_CPU_PROGRAM_MAP(sun2_mem) diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp index 868bf01ff74..55b2140798b 100644 --- a/src/mame/drivers/sun3.cpp +++ b/src/mame/drivers/sun3.cpp @@ -267,6 +267,11 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(sun3_timer); + void sun3(machine_config &config); + void sun3e(machine_config &config); + void sun3_60(machine_config &config); + void sun3200(machine_config &config); + void sun3_50(machine_config &config); private: uint32_t *m_rom_ptr, *m_ram_ptr; uint8_t *m_idprom_ptr; @@ -951,7 +956,7 @@ void sun3_state::machine_reset() } // The base Sun 3004 CPU board -static MACHINE_CONFIG_START( sun3 ) +MACHINE_CONFIG_START(sun3_state::sun3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68020, 16670000) MCFG_CPU_PROGRAM_MAP(sun3_mem) @@ -1021,7 +1026,7 @@ static MACHINE_CONFIG_START( sun3 ) MACHINE_CONFIG_END // Sun 3/60 -static MACHINE_CONFIG_DERIVED( sun3_60, sun3 ) +MACHINE_CONFIG_DERIVED(sun3_state::sun3_60, sun3) MCFG_CPU_REPLACE("maincpu", M68020, 20000000) MCFG_CPU_PROGRAM_MAP(sun3_mem) @@ -1033,13 +1038,13 @@ static MACHINE_CONFIG_DERIVED( sun3_60, sun3 ) MACHINE_CONFIG_END // Sun 3/E -static MACHINE_CONFIG_DERIVED( sun3e, sun3 ) +MACHINE_CONFIG_DERIVED(sun3_state::sun3e, sun3) MCFG_CPU_REPLACE("maincpu", M68020, 20000000) MCFG_CPU_PROGRAM_MAP(sun3_mem) MACHINE_CONFIG_END // 3/260 and 3/280 (the Sun 3200 board) -static MACHINE_CONFIG_DERIVED( sun3200, sun3 ) +MACHINE_CONFIG_DERIVED(sun3_state::sun3200, sun3) MCFG_CPU_REPLACE("maincpu", M68020, 25000000) MCFG_CPU_PROGRAM_MAP(sun3_mem) @@ -1054,7 +1059,7 @@ static MACHINE_CONFIG_DERIVED( sun3200, sun3 ) MCFG_RAM_EXTRA_OPTIONS("64M,96M,128M") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sun3_50 ) +MACHINE_CONFIG_START(sun3_state::sun3_50) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68020, 15700000) MCFG_CPU_PROGRAM_MAP(sun3_mem) diff --git a/src/mame/drivers/sun3x.cpp b/src/mame/drivers/sun3x.cpp index bf395085001..67c0d474dfd 100644 --- a/src/mame/drivers/sun3x.cpp +++ b/src/mame/drivers/sun3x.cpp @@ -208,6 +208,8 @@ public: uint32_t bw2_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void sun3_80(machine_config &config); + void sun3_460(machine_config &config); private: uint32_t m_enable, m_buserr, m_diag, m_printer, m_irqctrl, m_memreg, m_memerraddr; uint32_t m_iommu[0x800]; @@ -575,7 +577,7 @@ static SLOT_INTERFACE_START( sun_floppies ) SLOT_INTERFACE( "35hd", FLOPPY_35_HD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( sun3_80 ) +MACHINE_CONFIG_START(sun3x_state::sun3_80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68030, 20000000) MCFG_CPU_PROGRAM_MAP(sun3_80_mem) @@ -622,7 +624,7 @@ static MACHINE_CONFIG_START( sun3_80 ) MCFG_SCREEN_REFRESH_RATE(72) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sun3_460 ) +MACHINE_CONFIG_START(sun3x_state::sun3_460) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68030, 33000000) MCFG_CPU_PROGRAM_MAP(sun3_460_mem) diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp index 6470413eafe..e862872eb56 100644 --- a/src/mame/drivers/sun4.cpp +++ b/src/mame/drivers/sun4.cpp @@ -591,6 +591,9 @@ public: uint32_t bw2_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + static void ncr5390(device_t *device); + void sun4c(machine_config &config); + void sun4(machine_config &config); protected: required_device m_maincpu; @@ -1884,13 +1887,16 @@ static SLOT_INTERFACE_START( sun_scsi_devices ) SLOT_INTERFACE_INTERNAL("ncr5390", NCR5390) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( ncr5390 ) +void sun4_state::ncr5390(device_t *device) +{ + devcb_base *devcb; + (void)devcb; MCFG_DEVICE_CLOCK(10000000) MCFG_NCR5390_IRQ_HANDLER(DEVWRITELINE(":", sun4_state, scsi_irq)) MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":", sun4_state, scsi_drq)) -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_START( sun4 ) +MACHINE_CONFIG_START(sun4_state::sun4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MB86901, 16670000) MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, sun4_mem) @@ -1955,7 +1961,7 @@ static MACHINE_CONFIG_START( sun4 ) MCFG_DEVICE_CARD_MACHINE_CONFIG("ncr5390", ncr5390) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sun4c ) +MACHINE_CONFIG_START(sun4_state::sun4c) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MB86901, 16670000) MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, sun4c_mem) diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp index a78eb534179..512910df2eb 100644 --- a/src/mame/drivers/suna16.cpp +++ b/src/mame/drivers/suna16.cpp @@ -796,7 +796,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(suna16_state::bssoccer_interrupt) m_maincpu->set_input_line(2, HOLD_LINE); // does RAM to sprite buffer copy here } -static MACHINE_CONFIG_START( bssoccer ) +MACHINE_CONFIG_START(suna16_state::bssoccer) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/4) /* 8MHz */ @@ -859,7 +859,7 @@ MACHINE_CONFIG_END Ultra Balloon ***************************************************************************/ -static MACHINE_CONFIG_START( uballoon ) +MACHINE_CONFIG_START(suna16_state::uballoon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/4) /* 8MHz */ @@ -914,7 +914,7 @@ MACHINE_CONFIG_END Suna Quiz 6000 Academy ***************************************************************************/ -static MACHINE_CONFIG_START( sunaq ) +MACHINE_CONFIG_START(suna16_state::sunaq) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 6MHz */ @@ -975,7 +975,7 @@ WRITE8_MEMBER(suna16_state::bestbest_ay8910_port_a_w) // ? } -static MACHINE_CONFIG_START( bestbest ) +MACHINE_CONFIG_START(suna16_state::bestbest) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 6MHz */ diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp index 4c8d782a2b2..58cf5539e41 100644 --- a/src/mame/drivers/suna8.cpp +++ b/src/mame/drivers/suna8.cpp @@ -1867,7 +1867,7 @@ GFXDECODE_END /* 1 x 24 MHz crystal */ -static MACHINE_CONFIG_START( hardhead ) +MACHINE_CONFIG_START(suna8_state::hardhead) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* verified on pcb */ @@ -1925,7 +1925,7 @@ MACHINE_CONFIG_END /* 1 x 24 MHz crystal */ /* 2203 + 8910 */ -static MACHINE_CONFIG_START( rranger ) +MACHINE_CONFIG_START(suna8_state::rranger) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */ @@ -1993,7 +1993,7 @@ MACHINE_RESET_MEMBER(suna8_state,brickzn) m_bank1d->set_entry(0); } -static MACHINE_CONFIG_START( brickzn11 ) +MACHINE_CONFIG_START(suna8_state::brickzn11) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* SUNA PROTECTION BLOCK */ @@ -2049,7 +2049,7 @@ static MACHINE_CONFIG_START( brickzn11 ) MCFG_SOUND_ROUTE_EX(0, "rdac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "rdac2", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( brickzn, brickzn11 ) +MACHINE_CONFIG_DERIVED(suna8_state::brickzn, brickzn11) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(brickzn_map) MCFG_CPU_IO_MAP(brickzn_io_map) @@ -2079,7 +2079,7 @@ MACHINE_RESET_MEMBER(suna8_state,hardhea2) hardhea2_rambank_0_w(space,0,0); } -static MACHINE_CONFIG_DERIVED( hardhea2, brickzn ) +MACHINE_CONFIG_DERIVED(suna8_state::hardhea2, brickzn) MCFG_DEVICE_REMOVE("maincpu") MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* SUNA T568009 */ @@ -2094,7 +2094,7 @@ static MACHINE_CONFIG_DERIVED( hardhea2, brickzn ) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hardhea2b, hardhea2 ) +MACHINE_CONFIG_DERIVED(suna8_state::hardhea2b, hardhea2) MCFG_DEVICE_REMOVE("maincpu") MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) //bootleg clock not verified (?) @@ -2106,7 +2106,7 @@ MACHINE_CONFIG_END Star Fighter ***************************************************************************/ -static MACHINE_CONFIG_START( starfigh ) +MACHINE_CONFIG_START(suna8_state::starfigh) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */ @@ -2161,7 +2161,7 @@ MACHINE_CONFIG_END Spark Man ***************************************************************************/ -static MACHINE_CONFIG_START( sparkman ) +MACHINE_CONFIG_START(suna8_state::sparkman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */ diff --git a/src/mame/drivers/supbtime.cpp b/src/mame/drivers/supbtime.cpp index 2d7e8381759..db24b000ea7 100644 --- a/src/mame/drivers/supbtime.cpp +++ b/src/mame/drivers/supbtime.cpp @@ -95,6 +95,9 @@ public: uint32_t screen_update_supbtime(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_tumblep(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void chinatwn(machine_config &config); + void supbtime(machine_config &config); + void tumblep(machine_config &config); private: required_shared_ptr m_spriteram; required_shared_ptr m_pf1_rowscroll; @@ -427,7 +430,7 @@ GFXDECODE_END // MACHINE DEFINITIONS //************************************************************************** -static MACHINE_CONFIG_START( supbtime ) +MACHINE_CONFIG_START(supbtime_state::supbtime) MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2) MCFG_CPU_PROGRAM_MAP(supbtime_map) @@ -477,12 +480,12 @@ static MACHINE_CONFIG_START( supbtime ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( chinatwn, supbtime ) +MACHINE_CONFIG_DERIVED(supbtime_state::chinatwn, supbtime) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(chinatwn_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tumblep, supbtime ) +MACHINE_CONFIG_DERIVED(supbtime_state::tumblep, supbtime) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tumblep_map) diff --git a/src/mame/drivers/supdrapo.cpp b/src/mame/drivers/supdrapo.cpp index a1ae624f62a..cda8f1278ec 100644 --- a/src/mame/drivers/supdrapo.cpp +++ b/src/mame/drivers/supdrapo.cpp @@ -109,6 +109,7 @@ public: DECLARE_PALETTE_INIT(supdrapo); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void supdrapo(machine_config &config); }; @@ -449,7 +450,7 @@ WRITE8_MEMBER(supdrapo_state::ay8910_outputb_w) Machine Driver **********************************************************************/ -static MACHINE_CONFIG_START( supdrapo ) +MACHINE_CONFIG_START(supdrapo_state::supdrapo) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* guess */ MCFG_CPU_PROGRAM_MAP(sdpoker_mem) diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp index a595d213563..df071869d3f 100644 --- a/src/mame/drivers/supduck.cpp +++ b/src/mame/drivers/supduck.cpp @@ -81,6 +81,7 @@ public: DECLARE_WRITE8_MEMBER(okibank_w); + void supduck(machine_config &config); protected: // driver_device overrides @@ -433,7 +434,7 @@ void supduck_state::machine_reset() } -static MACHINE_CONFIG_START( supduck ) +MACHINE_CONFIG_START(supduck_state::supduck) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* Verified on PCB */ diff --git a/src/mame/drivers/super6.cpp b/src/mame/drivers/super6.cpp index af0c70056b0..00e6ac729c9 100644 --- a/src/mame/drivers/super6.cpp +++ b/src/mame/drivers/super6.cpp @@ -475,7 +475,7 @@ void super6_state::machine_reset() // MACHINE_CONFIG( super6 ) //------------------------------------------------- -static MACHINE_CONFIG_START( super6 ) +MACHINE_CONFIG_START(super6_state::super6) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_24MHz/4) MCFG_CPU_PROGRAM_MAP(super6_mem) diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp index 5195bf9b5a7..b1368fc8f04 100644 --- a/src/mame/drivers/super80.cpp +++ b/src/mame/drivers/super80.cpp @@ -692,7 +692,7 @@ static const char *const relay_sample_names[] = }; -static MACHINE_CONFIG_START( super80 ) +MACHINE_CONFIG_START(super80_state::super80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */ MCFG_CPU_PROGRAM_MAP(super80_map) @@ -753,13 +753,13 @@ static MACHINE_CONFIG_START( super80 ) MCFG_SOFTWARE_LIST_ADD("cass_list", "super80_cass") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( super80d, super80 ) +MACHINE_CONFIG_DERIVED(super80_state::super80d, super80) MCFG_GFXDECODE_MODIFY("gfxdecode", super80d) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80d) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( super80e, super80 ) +MACHINE_CONFIG_DERIVED(super80_state::super80e, super80) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(super80e_io) MCFG_GFXDECODE_MODIFY("gfxdecode", super80e) @@ -767,7 +767,7 @@ static MACHINE_CONFIG_DERIVED( super80e, super80 ) MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80e) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( super80m, super80 ) +MACHINE_CONFIG_DERIVED(super80_state::super80m, super80) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(super80m_map) @@ -778,7 +778,7 @@ static MACHINE_CONFIG_DERIVED( super80m, super80 ) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(super80_state, screen_vblank_super80m)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( super80v ) +MACHINE_CONFIG_START(super80_state::super80v) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */ MCFG_CPU_PROGRAM_MAP(super80v_map) @@ -839,7 +839,7 @@ static MACHINE_CONFIG_START( super80v ) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_k", super80_state, timer_k, attotime::from_hz(300)) // keyb scan MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( super80r, super80v ) +MACHINE_CONFIG_DERIVED(super80_state::super80r, super80v) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(super80r_io) diff --git a/src/mame/drivers/superchs.cpp b/src/mame/drivers/superchs.cpp index 0e4d7026daf..4dc7ee82093 100644 --- a/src/mame/drivers/superchs.cpp +++ b/src/mame/drivers/superchs.cpp @@ -237,7 +237,7 @@ GFXDECODE_END MACHINE DRIVERS ***********************************************************/ -static MACHINE_CONFIG_START( superchs ) +MACHINE_CONFIG_START(superchs_state::superchs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_40MHz/2) /* 20MHz - verified */ @@ -286,7 +286,7 @@ static MACHINE_CONFIG_START( superchs ) MCFG_DEVICE_ADD("taito_en", TAITO_EN, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( chase3, superchs ) +MACHINE_CONFIG_DERIVED(superchs_state::chase3, superchs) MCFG_CPU_MODIFY("sub") MCFG_CPU_PROGRAM_MAP(chase3_cpub_map) diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp index a292ef0af6a..6e695fb5d4b 100644 --- a/src/mame/drivers/supercrd.cpp +++ b/src/mame/drivers/supercrd.cpp @@ -194,6 +194,7 @@ public: uint32_t screen_update_supercrd(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void supercrd(machine_config &config); }; @@ -412,7 +413,7 @@ GFXDECODE_END * Machine Drivers * **************************/ -static MACHINE_CONFIG_START( supercrd ) +MACHINE_CONFIG_START(supercrd_state::supercrd) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 2MHz, guess */ MCFG_CPU_PROGRAM_MAP(supercrd_map) diff --git a/src/mame/drivers/superdq.cpp b/src/mame/drivers/superdq.cpp index 80e0a4d70da..311d4792e8b 100644 --- a/src/mame/drivers/superdq.cpp +++ b/src/mame/drivers/superdq.cpp @@ -62,6 +62,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void superdq(machine_config &config); }; TILE_GET_INFO_MEMBER(superdq_state::get_tile_info) @@ -325,7 +326,7 @@ void superdq_state::machine_start() } -static MACHINE_CONFIG_START( superdq ) +MACHINE_CONFIG_START(superdq_state::superdq) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp index 6fbcd7c21a2..3614167c199 100644 --- a/src/mame/drivers/superqix.cpp +++ b/src/mame/drivers/superqix.cpp @@ -1358,7 +1358,7 @@ INTERRUPT_GEN_MEMBER(superqix_state::sqix_timer_irq) -static MACHINE_CONFIG_START( pbillian ) +MACHINE_CONFIG_START(hotsmash_state::pbillian) MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* 6 MHz, ROHM Z80B */ MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_IO_MAP(pbillian_port_map) @@ -1400,7 +1400,7 @@ static MACHINE_CONFIG_START( pbillian ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sqix ) +MACHINE_CONFIG_START(superqix_state::sqix) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Z80B, 12 MHz / 2 (6 MHz), verified from pcb tracing */ @@ -1446,13 +1446,13 @@ static MACHINE_CONFIG_START( sqix ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sqix_8031, sqix ) +MACHINE_CONFIG_DERIVED(superqix_state::sqix_8031, sqix) MCFG_CPU_MODIFY("mcu") /* p8031ah, clock not verified */ MCFG_CPU_IO_MAP(sqix_8031_mcu_io_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sqix_nomcu ) +MACHINE_CONFIG_START(superqix_state::sqix_nomcu) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 12000000/2) /* 6 MHz */ diff --git a/src/mame/drivers/superslave.cpp b/src/mame/drivers/superslave.cpp index 6c45a221ede..57828c250b6 100644 --- a/src/mame/drivers/superslave.cpp +++ b/src/mame/drivers/superslave.cpp @@ -66,6 +66,7 @@ public: DECLARE_READ8_MEMBER( status_r ); DECLARE_WRITE8_MEMBER( cmd_w ); + void superslave(machine_config &config); private: required_device m_maincpu; required_device m_dbrg; @@ -371,7 +372,7 @@ void superslave_state::machine_reset() // MACHINE_CONFIG( superslave ) //------------------------------------------------- -static MACHINE_CONFIG_START( superslave ) +MACHINE_CONFIG_START(superslave_state::superslave) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(superslave_mem) diff --git a/src/mame/drivers/supertnk.cpp b/src/mame/drivers/supertnk.cpp index f1bb64dda51..d8716b5f371 100644 --- a/src/mame/drivers/supertnk.cpp +++ b/src/mame/drivers/supertnk.cpp @@ -135,6 +135,7 @@ public: uint32_t screen_update_supertnk(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(supertnk_interrupt); required_device m_maincpu; + void supertnk(machine_config &config); }; @@ -422,7 +423,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( supertnk ) +MACHINE_CONFIG_START(supertnk_state::supertnk) // CPU TMS9980A; no line connections MCFG_TMS99xx_ADD("maincpu", TMS9980A, 2598750, supertnk_map, supertnk_io_map) diff --git a/src/mame/drivers/superwng.cpp b/src/mame/drivers/superwng.cpp index 5841fbec7b6..92918947de0 100644 --- a/src/mame/drivers/superwng.cpp +++ b/src/mame/drivers/superwng.cpp @@ -97,6 +97,7 @@ public: uint32_t screen_update_superwng(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(superwng_nmi_interrupt); INTERRUPT_GEN_MEMBER(superwng_sound_nmi_assert); + void superwng(machine_config &config); }; WRITE8_MEMBER(superwng_state::superwng_unk_a187_w) @@ -470,7 +471,7 @@ void superwng_state::machine_reset() m_nmi_enable = 0; } -static MACHINE_CONFIG_START( superwng ) +MACHINE_CONFIG_START(superwng_state::superwng) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4) diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp index 8d33114b3be..f7a7f6ddd14 100644 --- a/src/mame/drivers/supracan.cpp +++ b/src/mame/drivers/supracan.cpp @@ -233,6 +233,7 @@ public: void supracan_suprnova_draw_roz(bitmap_ind16 &bitmap, const rectangle &cliprect, tilemap_t *tmap, uint32_t startx, uint32_t starty, int incxx, int incxy, int incyx, int incyy, int wraparound/*, int columnscroll, uint32_t* scrollram*/, int transmask); required_device m_gfxdecode; required_device m_palette; + void supracan(machine_config &config); }; @@ -1884,7 +1885,7 @@ INTERRUPT_GEN_MEMBER(supracan_state::supracan_sound_irq) } } -static MACHINE_CONFIG_START( supracan ) +MACHINE_CONFIG_START(supracan_state::supracan) MCFG_CPU_ADD( "maincpu", M68000, XTAL_10_738635MHz ) /* Correct frequency unknown */ MCFG_CPU_PROGRAM_MAP( supracan_mem ) diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp index 603afb8aa96..07a3f818c4e 100644 --- a/src/mame/drivers/suprgolf.cpp +++ b/src/mame/drivers/suprgolf.cpp @@ -90,6 +90,7 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void suprgolf(machine_config &config); }; TILE_GET_INFO_MEMBER(suprgolf_state::get_tile_info) @@ -486,7 +487,7 @@ void suprgolf_state::machine_reset() #define MASTER_CLOCK XTAL_12MHz -static MACHINE_CONFIG_START( suprgolf ) +MACHINE_CONFIG_START(suprgolf_state::suprgolf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/2) /* guess */ diff --git a/src/mame/drivers/suprloco.cpp b/src/mame/drivers/suprloco.cpp index 77656e33ce1..54215a0f147 100644 --- a/src/mame/drivers/suprloco.cpp +++ b/src/mame/drivers/suprloco.cpp @@ -173,7 +173,7 @@ static GFXDECODE_START( suprloco ) GFXDECODE_END -static MACHINE_CONFIG_START( suprloco ) +MACHINE_CONFIG_START(suprloco_state::suprloco) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", SEGA_315_5015, 4000000) /* 4 MHz (?) */ diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp index 502d889b45a..c3cbd460882 100644 --- a/src/mame/drivers/suprnova.cpp +++ b/src/mame/drivers/suprnova.cpp @@ -786,7 +786,7 @@ GFXDECODE_END /***** MACHINE DRIVER *****/ -static MACHINE_CONFIG_START( skns ) +MACHINE_CONFIG_START(skns_state::skns) MCFG_CPU_ADD("maincpu", SH2,28638000) MCFG_CPU_PROGRAM_MAP(skns_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", skns_state, irq, "screen", 0, 1) @@ -855,23 +855,23 @@ MACHINE_RESET_MEMBER(skns_state,sknsk) } -static MACHINE_CONFIG_DERIVED( sknsa, skns ) +MACHINE_CONFIG_DERIVED(skns_state::sknsa, skns) MCFG_MACHINE_RESET_OVERRIDE(skns_state,sknsa) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sknsj, skns ) +MACHINE_CONFIG_DERIVED(skns_state::sknsj, skns) MCFG_MACHINE_RESET_OVERRIDE(skns_state,sknsj) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sknsu, skns ) +MACHINE_CONFIG_DERIVED(skns_state::sknsu, skns) MCFG_MACHINE_RESET_OVERRIDE(skns_state,sknsu) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sknse, skns ) +MACHINE_CONFIG_DERIVED(skns_state::sknse, skns) MCFG_MACHINE_RESET_OVERRIDE(skns_state,sknse) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sknsk, skns ) +MACHINE_CONFIG_DERIVED(skns_state::sknsk, skns) MCFG_MACHINE_RESET_OVERRIDE(skns_state,sknsk) MACHINE_CONFIG_END diff --git a/src/mame/drivers/suprridr.cpp b/src/mame/drivers/suprridr.cpp index ac47f4aefe0..8324e92c13b 100644 --- a/src/mame/drivers/suprridr.cpp +++ b/src/mame/drivers/suprridr.cpp @@ -317,7 +317,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( suprridr ) +MACHINE_CONFIG_START(suprridr_state::suprridr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_49_152MHz/16) /* 3 MHz */ diff --git a/src/mame/drivers/suprslam.cpp b/src/mame/drivers/suprslam.cpp index b21f088bc71..172df26e98a 100644 --- a/src/mame/drivers/suprslam.cpp +++ b/src/mame/drivers/suprslam.cpp @@ -265,7 +265,7 @@ void suprslam_state::machine_reset() m_bg_bank = 0; } -static MACHINE_CONFIG_START( suprslam ) +MACHINE_CONFIG_START(suprslam_state::suprslam) MCFG_CPU_ADD("maincpu", M68000, 16000000) MCFG_CPU_PROGRAM_MAP(suprslam_map) diff --git a/src/mame/drivers/supstarf.cpp b/src/mame/drivers/supstarf.cpp index 1cdf084d30b..fc598cee171 100644 --- a/src/mame/drivers/supstarf.cpp +++ b/src/mame/drivers/supstarf.cpp @@ -38,6 +38,7 @@ public: DECLARE_WRITE8_MEMBER(lights_a_w); DECLARE_WRITE8_MEMBER(lights_b_w); + void supstarf(machine_config &config); protected: virtual void machine_start() override; @@ -163,7 +164,7 @@ void supstarf_state::machine_start() save_item(NAME(m_port1_data)); } -static MACHINE_CONFIG_START(supstarf) +MACHINE_CONFIG_START(supstarf_state::supstarf) MCFG_CPU_ADD("maincpu", I8085A, XTAL_5_0688MHz) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_IO_MAP(main_io_map) diff --git a/src/mame/drivers/surpratk.cpp b/src/mame/drivers/surpratk.cpp index 5aad4f22404..a7c8412cd49 100644 --- a/src/mame/drivers/surpratk.cpp +++ b/src/mame/drivers/surpratk.cpp @@ -166,7 +166,7 @@ WRITE8_MEMBER( surpratk_state::banking_callback ) membank("bank1")->set_entry(data & 0x1f); } -static MACHINE_CONFIG_START( surpratk ) +MACHINE_CONFIG_START(surpratk_state::surpratk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 053248, the clock input is 12MHz, and internal CPU divider of 4 */ diff --git a/src/mame/drivers/sv8000.cpp b/src/mame/drivers/sv8000.cpp index b79f28139ad..908d1135730 100644 --- a/src/mame/drivers/sv8000.cpp +++ b/src/mame/drivers/sv8000.cpp @@ -67,6 +67,7 @@ public: DECLARE_READ8_MEMBER( mc6847_videoram_r ); + void sv8000(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -368,7 +369,7 @@ READ8_MEMBER( sv8000_state::mc6847_videoram_r ) return data; } -static MACHINE_CONFIG_START( sv8000 ) +MACHINE_CONFIG_START(sv8000_state::sv8000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_10_738635MHz/3) /* Not verified */ MCFG_CPU_PROGRAM_MAP(sv8000_mem) diff --git a/src/mame/drivers/svi318.cpp b/src/mame/drivers/svi318.cpp index 58890dc1278..8c1e56f354b 100644 --- a/src/mame/drivers/svi318.cpp +++ b/src/mame/drivers/svi318.cpp @@ -91,6 +91,10 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cartridge); + void svi328n(machine_config &config); + void svi318(machine_config &config); + void svi318n(machine_config &config); + void svi328(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -518,7 +522,7 @@ DEVICE_IMAGE_LOAD_MEMBER( svi3x8_state, cartridge ) // MACHINE DEFINTIONS //************************************************************************** -static MACHINE_CONFIG_START( svi318 ) +MACHINE_CONFIG_START(svi3x8_state::svi318) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz / 3) MCFG_CPU_PROGRAM_MAP(svi3x8_mem) @@ -579,7 +583,7 @@ static MACHINE_CONFIG_START( svi318 ) MCFG_SVI_EXPANDER_EXCSW_HANDLER(WRITE8(svi3x8_state, excs_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( svi318n, svi318 ) +MACHINE_CONFIG_DERIVED(svi3x8_state::svi318n, svi318) MCFG_DEVICE_REMOVE("vdp") MCFG_DEVICE_REMOVE("screen") MCFG_DEVICE_ADD("vdp", TMS9928A, XTAL_10_738635MHz / 2) @@ -589,13 +593,13 @@ static MACHINE_CONFIG_DERIVED( svi318n, svi318 ) MCFG_SCREEN_UPDATE_DEVICE("vdp", tms9928a_device, screen_update) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( svi328, svi318 ) +MACHINE_CONFIG_DERIVED(svi3x8_state::svi328, svi318) MCFG_DEVICE_REMOVE(RAM_TAG) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("64K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( svi328n, svi318n ) +MACHINE_CONFIG_DERIVED(svi3x8_state::svi328n, svi318n) MCFG_DEVICE_REMOVE(RAM_TAG) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("64K") diff --git a/src/mame/drivers/svision.cpp b/src/mame/drivers/svision.cpp index c24cbe4c8e8..908159c3fc9 100644 --- a/src/mame/drivers/svision.cpp +++ b/src/mame/drivers/svision.cpp @@ -512,7 +512,7 @@ MACHINE_RESET_MEMBER(svision_state,tvlink) m_tvlink.palette[3] = MAKE24_RGB32(svisionp_palette[(PALETTE_START+3)*3+0], svisionp_palette[(PALETTE_START+3)*3+1], svisionp_palette[(PALETTE_START+3)*3+2]); } -static MACHINE_CONFIG_START( svision ) +MACHINE_CONFIG_START(svision_state::svision) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65C02, 4000000) /* ? stz used! speed? */ MCFG_CPU_PROGRAM_MAP(svision_mem) @@ -548,11 +548,11 @@ static MACHINE_CONFIG_START( svision ) MCFG_SOFTWARE_LIST_ADD("cart_list", "svision") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( svisions, svision ) +MACHINE_CONFIG_DERIVED(svision_state::svisions, svision) MCFG_TIMER_DRIVER_ADD_PERIODIC("pet_timer", svision_state, svision_pet_timer_dev, attotime::from_seconds(8)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( svisionp, svision ) +MACHINE_CONFIG_DERIVED(svision_state::svisionp, svision) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(4430000) MCFG_SCREEN_MODIFY("screen") @@ -561,7 +561,7 @@ static MACHINE_CONFIG_DERIVED( svisionp, svision ) MCFG_PALETTE_INIT_OWNER(svision_state, svisionp) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( svisionn, svision ) +MACHINE_CONFIG_DERIVED(svision_state::svisionn, svision) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(3560000/*?*/) MCFG_SCREEN_MODIFY("screen") @@ -570,7 +570,7 @@ static MACHINE_CONFIG_DERIVED( svisionn, svision ) MCFG_PALETTE_INIT_OWNER(svision_state, svisionn) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tvlinkp, svisionp ) +MACHINE_CONFIG_DERIVED(svision_state::tvlinkp, svisionp) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tvlink_mem) diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp index 94659c29695..f55a0e6ba76 100644 --- a/src/mame/drivers/svmu.cpp +++ b/src/mame/drivers/svmu.cpp @@ -54,6 +54,7 @@ public: DECLARE_READ8_MEMBER(p7_r); DECLARE_QUICKLOAD_LOAD_MEMBER( svmu ); + void svmu(machine_config &config); private: uint8_t m_page; }; @@ -300,7 +301,7 @@ QUICKLOAD_LOAD_MEMBER( svmu_state, svmu ) } -static MACHINE_CONFIG_START( svmu ) +MACHINE_CONFIG_START(svmu_state::svmu) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", LC8670, XTAL_32_768kHz) MCFG_CPU_PROGRAM_MAP(svmu_mem) diff --git a/src/mame/drivers/swtpc.cpp b/src/mame/drivers/swtpc.cpp index cd7acfc2461..6343835d496 100644 --- a/src/mame/drivers/swtpc.cpp +++ b/src/mame/drivers/swtpc.cpp @@ -58,6 +58,8 @@ public: virtual void machine_start() override; + void swtpcm(machine_config &config); + void swtpc(machine_config &config); private: required_device m_maincpu; required_device m_ram; @@ -91,7 +93,7 @@ void swtpc_state::machine_start() m_maincpu->space(AS_PROGRAM).install_ram(0, m_ram->size() - 1, m_ram->pointer()); } -static MACHINE_CONFIG_START( swtpc ) +MACHINE_CONFIG_START(swtpc_state::swtpc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_1_8432MHz / 2) MCFG_CPU_PROGRAM_MAP(mem_map) @@ -173,7 +175,7 @@ static MACHINE_CONFIG_START( swtpc ) MCFG_RAM_EXTRA_OPTIONS("4K,8K,12K,16K,20K,24K,28K,32K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( swtpcm, swtpc ) +MACHINE_CONFIG_DERIVED(swtpc_state::swtpcm, swtpc) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(XTAL_1_7971MHz / 2) diff --git a/src/mame/drivers/swtpc09.cpp b/src/mame/drivers/swtpc09.cpp index 4f94d66128c..3d8aecee168 100644 --- a/src/mame/drivers/swtpc09.cpp +++ b/src/mame/drivers/swtpc09.cpp @@ -159,7 +159,7 @@ SLOT_INTERFACE_END /* Machine driver */ /* MPU09, MPID, MPS2 DMF2 */ -static MACHINE_CONFIG_START( swtpc09_base ) +MACHINE_CONFIG_START(swtpc09_state::swtpc09_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(mp09_mem) @@ -201,14 +201,14 @@ static MACHINE_CONFIG_START( swtpc09_base ) MCFG_FLOPPY_DRIVE_ADD("fdc:3", swtpc09_floppies, "dd", swtpc09_state::floppy_formats) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( swtpc09, swtpc09_base ) +MACHINE_CONFIG_DERIVED(swtpc09_state::swtpc09, swtpc09_base) MCFG_DEVICE_MODIFY("fdc") MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(swtpc09_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(swtpc09_state, fdc_drq_w)) MACHINE_CONFIG_END /* MPU09, MPID, MPS2 DC4 PIAIDE*/ -static MACHINE_CONFIG_DERIVED( swtpc09i, swtpc09_base ) +MACHINE_CONFIG_DERIVED(swtpc09_state::swtpc09i, swtpc09_base) MCFG_DEVICE_MODIFY("bankdev") MCFG_DEVICE_PROGRAM_MAP(flex_dc4_piaide_mem) @@ -223,14 +223,14 @@ static MACHINE_CONFIG_DERIVED( swtpc09i, swtpc09_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( swtpc09u, swtpc09 ) +MACHINE_CONFIG_DERIVED(swtpc09_state::swtpc09u, swtpc09) MCFG_DEVICE_MODIFY("bankdev") MCFG_DEVICE_PROGRAM_MAP(uniflex_dmf2_mem) MACHINE_CONFIG_END /* MPU09, MPID, MPS2 DMF3 */ -static MACHINE_CONFIG_DERIVED( swtpc09d3, swtpc09_base ) +MACHINE_CONFIG_DERIVED(swtpc09_state::swtpc09d3, swtpc09_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(XTAL_8MHz) diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp index 43efd78e461..8bcd3da7b8f 100644 --- a/src/mame/drivers/swyft.cpp +++ b/src/mame/drivers/swyft.cpp @@ -379,6 +379,7 @@ public: uint8_t m_keyboard_line; uint8_t m_floppy_control; + void swyft(machine_config &config); //protected: //virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; @@ -768,7 +769,7 @@ WRITE_LINE_MEMBER( swyft_state::write_acia_clock ) m_acia6850->write_rxc(state); } -static MACHINE_CONFIG_START( swyft ) +MACHINE_CONFIG_START(swyft_state::swyft) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68008, XTAL_15_8976MHz/2) //MC68008P8, Y1=15.8976Mhz, clock GUESSED at Y1 / 2 diff --git a/src/mame/drivers/sym1.cpp b/src/mame/drivers/sym1.cpp index ec2c06434de..05538b9a907 100644 --- a/src/mame/drivers/sym1.cpp +++ b/src/mame/drivers/sym1.cpp @@ -77,6 +77,7 @@ public: DECLARE_WRITE8_MEMBER(riot_b_w); DECLARE_WRITE8_MEMBER(via3_a_w); + void sym1(machine_config &config); protected: required_device m_maincpu; required_device m_ram; @@ -317,7 +318,7 @@ ADDRESS_MAP_END // MACHINE DRIVERS //************************************************************************** -static MACHINE_CONFIG_START( sym1 ) +MACHINE_CONFIG_START(sym1_state::sym1) // basic machine hardware MCFG_CPU_ADD("maincpu", M6502, SYM1_CLOCK) MCFG_CPU_PROGRAM_MAP(sym1_map) diff --git a/src/mame/drivers/symbolics.cpp b/src/mame/drivers/symbolics.cpp index 91ccaa94adf..98e665b3d2d 100644 --- a/src/mame/drivers/symbolics.cpp +++ b/src/mame/drivers/symbolics.cpp @@ -105,6 +105,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void symbolics(machine_config &config); //protected: // virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -314,7 +315,7 @@ void symbolics_state::machine_reset() */ } -static MACHINE_CONFIG_START( symbolics ) +MACHINE_CONFIG_START(symbolics_state::symbolics) /* basic machine hardware */ // per page 159 of http://bitsavers.trailing-edge.com/pdf/symbolics/3600_series/Lisp_Machine_Hardware_Memos.pdf: //XTALS: 16MHz @H11 (68k CPU clock) diff --git a/src/mame/drivers/sys2900.cpp b/src/mame/drivers/sys2900.cpp index 2693762f1c8..ccd7351e419 100644 --- a/src/mame/drivers/sys2900.cpp +++ b/src/mame/drivers/sys2900.cpp @@ -64,6 +64,7 @@ public: DECLARE_DRIVER_INIT(sys2900); uint32_t screen_update_sys2900(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void sys2900(machine_config &config); private: virtual void machine_reset() override; virtual void video_start() override; @@ -133,7 +134,7 @@ uint32_t sys2900_state::screen_update_sys2900(screen_device &screen, bitmap_ind1 return 0; } -static MACHINE_CONFIG_START( sys2900 ) +MACHINE_CONFIG_START(sys2900_state::sys2900) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/sys9002.cpp b/src/mame/drivers/sys9002.cpp index bab16aa5c48..e89b373e273 100644 --- a/src/mame/drivers/sys9002.cpp +++ b/src/mame/drivers/sys9002.cpp @@ -38,6 +38,7 @@ public: MC6845_UPDATE_ROW(crtc_update_row); + void sys9002(machine_config &config); private: required_device m_maincpu; required_shared_ptr m_p_videoram; @@ -115,7 +116,7 @@ static DEVICE_INPUT_DEFAULTS_START( uart2 ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END -static MACHINE_CONFIG_START( sys9002 ) +MACHINE_CONFIG_START(sys9002_state::sys9002) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A, XTAL_2MHz) // XTAL not visible on images MCFG_CPU_PROGRAM_MAP(sys9002_mem) diff --git a/src/mame/drivers/systec.cpp b/src/mame/drivers/systec.cpp index 037c63dc831..3aa5cc42d62 100644 --- a/src/mame/drivers/systec.cpp +++ b/src/mame/drivers/systec.cpp @@ -48,6 +48,7 @@ public: , m_maincpu(*this, "maincpu") { } + void systec(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -77,7 +78,7 @@ void systec_state::machine_reset() } -static MACHINE_CONFIG_START( systec ) +MACHINE_CONFIG_START(systec_state::systec) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(systec_mem) diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp index beb843a2ca4..2c6c3482db4 100644 --- a/src/mame/drivers/system1.cpp +++ b/src/mame/drivers/system1.cpp @@ -2144,7 +2144,7 @@ GFXDECODE_END *************************************/ /* original board with 64kbit ROMs and an 8255 PPI for outputs */ -static MACHINE_CONFIG_START( sys1ppi ) +MACHINE_CONFIG_START(system1_state::sys1ppi) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* not really, see notes above */ @@ -2190,7 +2190,7 @@ MACHINE_CONFIG_END /* reduced visible area for scrolling games */ -static MACHINE_CONFIG_DERIVED( sys1ppis, sys1ppi ) +MACHINE_CONFIG_DERIVED(system1_state::sys1ppis, sys1ppi) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -2203,7 +2203,7 @@ MACHINE_CONFIG_END /* revised board with 128kbit ROMs and a Z80 PIO for outputs */ -static MACHINE_CONFIG_DERIVED( sys1pio, sys1ppi ) +MACHINE_CONFIG_DERIVED(system1_state::sys1pio, sys1ppi) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(system1_pio_io_map) @@ -2234,162 +2234,162 @@ MACHINE_CONFIG_END MCFG_CPU_VBLANK_INT_DRIVER("screen", system1_state, irq0_line_hold) -static MACHINE_CONFIG_DERIVED( sys1pioxb, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1pioxb, sys1pio) MCFG_CPU_REPLACE("maincpu", MC8123, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1ppix_315_5178, sys1ppi ) +MACHINE_CONFIG_DERIVED(system1_state::sys1ppix_315_5178, sys1ppi) MCFG_CPU_REPLACE("maincpu", SEGA_315_5178, MASTER_CLOCK) ENCRYPTED_SYS1PPI_MAPS MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1ppix_315_5179, sys1ppi ) +MACHINE_CONFIG_DERIVED(system1_state::sys1ppix_315_5179, sys1ppi) MCFG_CPU_REPLACE("maincpu", SEGA_315_5179, MASTER_CLOCK) ENCRYPTED_SYS1PPI_MAPS MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1ppix_315_5051, sys1ppi ) +MACHINE_CONFIG_DERIVED(system1_state::sys1ppix_315_5051, sys1ppi) MCFG_CPU_REPLACE("maincpu", SEGA_315_5051, MASTER_CLOCK) ENCRYPTED_SYS1PPI_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1ppix_315_5048, sys1ppi ) +MACHINE_CONFIG_DERIVED(system1_state::sys1ppix_315_5048, sys1ppi) MCFG_CPU_REPLACE("maincpu", SEGA_315_5048, MASTER_CLOCK) ENCRYPTED_SYS1PPI_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1ppix_315_5033, sys1ppi ) +MACHINE_CONFIG_DERIVED(system1_state::sys1ppix_315_5033, sys1ppi) MCFG_CPU_REPLACE("maincpu", SEGA_315_5033, MASTER_CLOCK) ENCRYPTED_SYS1PPI_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1ppix_315_5065, sys1ppi ) +MACHINE_CONFIG_DERIVED(system1_state::sys1ppix_315_5065, sys1ppi) MCFG_CPU_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK) ENCRYPTED_SYS1PPI_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1ppix_315_5098, sys1ppi ) +MACHINE_CONFIG_DERIVED(system1_state::sys1ppix_315_5098, sys1ppi) MCFG_CPU_REPLACE("maincpu", SEGA_315_5098, MASTER_CLOCK) ENCRYPTED_SYS1PPI_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piox_315_5177, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piox_315_5177, sys1pio) MCFG_CPU_REPLACE("maincpu", SEGA_315_5177, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piox_315_5162, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piox_315_5162, sys1pio) MCFG_CPU_REPLACE("maincpu", SEGA_315_5162, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piox_317_0006, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piox_317_0006, sys1pio) MCFG_CPU_REPLACE("maincpu", SEGA_317_0006, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piox_315_5135, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piox_315_5135, sys1pio) MCFG_CPU_REPLACE("maincpu", SEGA_315_5135, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piox_315_5132, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piox_315_5132, sys1pio) MCFG_CPU_REPLACE("maincpu", SEGA_315_5132, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piox_315_5155, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piox_315_5155, sys1pio) MCFG_CPU_REPLACE("maincpu", SEGA_315_5155, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piox_315_5110, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piox_315_5110, sys1pio) MCFG_CPU_REPLACE("maincpu", SEGA_315_5110, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piox_315_5051, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piox_315_5051, sys1pio) MCFG_CPU_REPLACE("maincpu", SEGA_315_5051, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piox_315_5098, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piox_315_5098, sys1pio) MCFG_CPU_REPLACE("maincpu", SEGA_315_5098, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piox_315_5102, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piox_315_5102, sys1pio) MCFG_CPU_REPLACE("maincpu", SEGA_315_5102, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piox_315_5133, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piox_315_5133, sys1pio) MCFG_CPU_REPLACE("maincpu", SEGA_315_5133, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piox_315_5093, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piox_315_5093, sys1pio) MCFG_CPU_REPLACE("maincpu", SEGA_315_5093, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piox_315_5065, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piox_315_5065, sys1pio) MCFG_CPU_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END /* reduced visible area for scrolling games */ -static MACHINE_CONFIG_DERIVED( sys1pios, sys1pio ) +MACHINE_CONFIG_DERIVED(system1_state::sys1pios, sys1pio) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(2*(0*8+8), 2*(32*8-1-8), 0*8, 28*8-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piosx_315_5099, sys1pios ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piosx_315_5099, sys1pios) MCFG_CPU_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1piosx_315_spat, sys1pios ) +MACHINE_CONFIG_DERIVED(system1_state::sys1piosx_315_spat, sys1pios) MCFG_CPU_REPLACE("maincpu", SEGA_315_SPAT, MASTER_CLOCK) ENCRYPTED_SYS1PIO_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1ppisx_315_5064, sys1ppis ) +MACHINE_CONFIG_DERIVED(system1_state::sys1ppisx_315_5064, sys1ppis) MCFG_CPU_REPLACE("maincpu", SEGA_315_5064, MASTER_CLOCK) ENCRYPTED_SYS1PPI_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys1ppisx_315_5041, sys1ppis ) +MACHINE_CONFIG_DERIVED(system1_state::sys1ppisx_315_5041, sys1ppis) MCFG_CPU_REPLACE("maincpu", SEGA_315_5041, MASTER_CLOCK) ENCRYPTED_SYS1PPI_MAPS MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") @@ -2401,7 +2401,7 @@ MACHINE_CONFIG_END /* this describes the additional 8751 MCU when present */ -static MACHINE_CONFIG_START( mcu ) +MACHINE_CONFIG_START(system1_state::mcu) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2417,14 +2417,14 @@ MACHINE_CONFIG_END /* alternate program map with RAM/collision swapped */ -static MACHINE_CONFIG_DERIVED( nob, sys1ppi ) +MACHINE_CONFIG_DERIVED(system1_state::nob, sys1ppi) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(nobo_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nobm, nob ) +MACHINE_CONFIG_DERIVED(system1_state::nobm, nob) /* basic machine hardware */ MCFG_CPU_ADD("mcu", I8751, SOUND_CLOCK) @@ -2434,7 +2434,7 @@ MACHINE_CONFIG_END /* system2 video */ -static MACHINE_CONFIG_DERIVED( sys2, sys1ppi ) +MACHINE_CONFIG_DERIVED(system1_state::sys2, sys1ppi) MCFG_MACHINE_START_OVERRIDE(system1_state,system2) @@ -2444,69 +2444,69 @@ static MACHINE_CONFIG_DERIVED( sys2, sys1ppi ) MCFG_SCREEN_UPDATE_DRIVER(system1_state, screen_update_system2) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys2x, sys2 ) +MACHINE_CONFIG_DERIVED(system1_state::sys2x, sys2) MCFG_DEVICE_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys2_315_5177, sys2 ) +MACHINE_CONFIG_DERIVED(system1_state::sys2_315_5177, sys2) MCFG_CPU_REPLACE("maincpu", SEGA_315_5177, MASTER_CLOCK) ENCRYPTED_SYS1PPI_MAPS MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys2_315_5176, sys2 ) +MACHINE_CONFIG_DERIVED(system1_state::sys2_315_5176, sys2) MCFG_CPU_REPLACE("maincpu", SEGA_315_5176, MASTER_CLOCK) ENCRYPTED_SYS1PPI_MAPS MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys2_317_0006, sys2 ) +MACHINE_CONFIG_DERIVED(system1_state::sys2_317_0006, sys2) MCFG_CPU_REPLACE("maincpu", SEGA_317_0006, MASTER_CLOCK) ENCRYPTED_SYS1PPI_MAPS MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys2_317_0007, sys2 ) +MACHINE_CONFIG_DERIVED(system1_state::sys2_317_0007, sys2) MCFG_CPU_REPLACE("maincpu", SEGA_317_0007, MASTER_CLOCK) ENCRYPTED_SYS1PPI_MAPS MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys2xb, sys2 ) +MACHINE_CONFIG_DERIVED(system1_state::sys2xb, sys2) MCFG_CPU_REPLACE("maincpu", MC8123, MASTER_CLOCK) ENCRYPTED_SYS2_MC8123_MAPS MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys2xboot, sys2 ) +MACHINE_CONFIG_DERIVED(system1_state::sys2xboot, sys2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(banked_decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys2m, sys2 ) +MACHINE_CONFIG_DERIVED(system1_state::sys2m, sys2) MCFG_FRAGMENT_ADD( mcu ) MACHINE_CONFIG_END /* system2 with rowscroll */ -static MACHINE_CONFIG_DERIVED( sys2row, sys2 ) +MACHINE_CONFIG_DERIVED(system1_state::sys2row, sys2) /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(system1_state, screen_update_system2_rowscroll) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys2rowxb, sys2row ) +MACHINE_CONFIG_DERIVED(system1_state::sys2rowxb, sys2row) MCFG_CPU_REPLACE("maincpu", MC8123, MASTER_CLOCK) ENCRYPTED_SYS2_MC8123_MAPS MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys2rowxboot, sys2row ) +MACHINE_CONFIG_DERIVED(system1_state::sys2rowxboot, sys2row) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(banked_decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys2rowm, sys2row ) +MACHINE_CONFIG_DERIVED(system1_state::sys2rowm, sys2row) MCFG_FRAGMENT_ADD( mcu ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index dc7335f1252..381b618ef8c 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -2047,7 +2047,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( z80_ym2151 ) +MACHINE_CONFIG_START(segas1x_bootleg_state::z80_ym2151) MCFG_CPU_ADD("soundcpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(sound_map) @@ -2067,7 +2067,7 @@ WRITE_LINE_MEMBER(segas1x_bootleg_state::sound_cause_nmi) m_soundcpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( z80_ym2151_upd7759 ) +MACHINE_CONFIG_START(segas1x_bootleg_state::z80_ym2151_upd7759) MCFG_CPU_ADD("soundcpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(sound_7759_map) @@ -2086,7 +2086,7 @@ static MACHINE_CONFIG_START( z80_ym2151_upd7759 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.48) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( datsu_ym2151_msm5205 ) +MACHINE_CONFIG_START(segas1x_bootleg_state::datsu_ym2151_msm5205) /* TODO: - other games might use this sound configuration - speaker is likely to be mono for the bootlegs, not stereo. @@ -2109,7 +2109,7 @@ static MACHINE_CONFIG_START( datsu_ym2151_msm5205 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( datsu_2x_ym2203_msm5205 ) +MACHINE_CONFIG_START(segas1x_bootleg_state::datsu_2x_ym2203_msm5205) MCFG_CPU_ADD("soundcpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(shinobi_datsu_sound_map) @@ -2146,7 +2146,7 @@ MACHINE_CONFIG_END *************************************/ /* System 16A/B Bootlegs */ -static MACHINE_CONFIG_START( system16_base ) +MACHINE_CONFIG_START(segas1x_bootleg_state::system16_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) @@ -2169,7 +2169,7 @@ static MACHINE_CONFIG_START( system16_base ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shinobi_datsu, system16_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::shinobi_datsu, system16_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2186,7 +2186,7 @@ static MACHINE_CONFIG_DERIVED( shinobi_datsu, system16_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( passshtb, system16_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::passshtb, system16_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2204,7 +2204,7 @@ static MACHINE_CONFIG_DERIVED( passshtb, system16_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( passsht4b, system16_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::passsht4b, system16_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2224,7 +2224,7 @@ static MACHINE_CONFIG_DERIVED( passsht4b, system16_base ) MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wb3bb, system16_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::wb3bb, system16_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2243,7 +2243,7 @@ static MACHINE_CONFIG_DERIVED( wb3bb, system16_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( goldnaxeb_base ) +MACHINE_CONFIG_START(segas1x_bootleg_state::goldnaxeb_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) @@ -2273,12 +2273,12 @@ static MACHINE_CONFIG_START( goldnaxeb_base ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( goldnaxeb1, goldnaxeb_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::goldnaxeb1, goldnaxeb_base) MCFG_FRAGMENT_ADD(z80_ym2151_upd7759) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( goldnaxeb2, goldnaxeb_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::goldnaxeb2, goldnaxeb_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2289,14 +2289,14 @@ static MACHINE_CONFIG_DERIVED( goldnaxeb2, goldnaxeb_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bayrouteb1, goldnaxeb1 ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::bayrouteb1, goldnaxeb1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bayrouteb1_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bayrouteb2, goldnaxeb_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::bayrouteb2, goldnaxeb_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2310,7 +2310,7 @@ static MACHINE_CONFIG_DERIVED( bayrouteb2, goldnaxeb_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tturfbl, system16_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::tturfbl, system16_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2322,7 +2322,7 @@ static MACHINE_CONFIG_DERIVED( tturfbl, system16_base ) MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-107) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dduxbl, system16_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::dduxbl, system16_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2334,7 +2334,7 @@ static MACHINE_CONFIG_DERIVED( dduxbl, system16_base ) MCFG_FRAGMENT_ADD(z80_ym2151) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( eswatbl, system16_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::eswatbl, system16_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2346,7 +2346,7 @@ static MACHINE_CONFIG_DERIVED( eswatbl, system16_base ) MCFG_FRAGMENT_ADD(z80_ym2151_upd7759) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( eswatbl2, system16_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::eswatbl2, system16_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2358,7 +2358,7 @@ static MACHINE_CONFIG_DERIVED( eswatbl2, system16_base ) MCFG_FRAGMENT_ADD(datsu_2x_ym2203_msm5205) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tetrisbl, system16_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::tetrisbl, system16_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2370,7 +2370,7 @@ static MACHINE_CONFIG_DERIVED( tetrisbl, system16_base ) MCFG_FRAGMENT_ADD(z80_ym2151) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( altbeastbl, system16_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::altbeastbl, system16_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tetrisbl_map) @@ -2383,7 +2383,7 @@ static MACHINE_CONFIG_DERIVED( altbeastbl, system16_base ) MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( beautyb, system16_base ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::beautyb, system16_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2396,7 +2396,7 @@ MACHINE_CONFIG_END /* System 18 Bootlegs */ -static MACHINE_CONFIG_START( system18 ) +MACHINE_CONFIG_START(segas1x_bootleg_state::system18) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) @@ -2446,14 +2446,14 @@ static MACHINE_CONFIG_START( system18 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( astormbl, system18 ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::astormbl, system18) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(astormbl_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( astormb2 ) +MACHINE_CONFIG_START(segas1x_bootleg_state::astormb2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12MHz */ @@ -2491,7 +2491,7 @@ static MACHINE_CONFIG_START( astormb2 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mwalkbl, astormb2 ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::mwalkbl, astormb2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2499,7 +2499,7 @@ static MACHINE_CONFIG_DERIVED( mwalkbl, astormb2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shdancbl, system18 ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::shdancbl, system18) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2517,7 +2517,7 @@ static MACHINE_CONFIG_DERIVED( shdancbl, system18 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shdancbla, system18 ) +MACHINE_CONFIG_DERIVED(segas1x_bootleg_state::shdancbla, system18) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2548,7 +2548,7 @@ MACHINE_RESET_MEMBER(segas1x_bootleg_state,ddcrewbl) } -static MACHINE_CONFIG_START( ddcrewbl ) +MACHINE_CONFIG_START(segas1x_bootleg_state::ddcrewbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) diff --git a/src/mame/drivers/tagteam.cpp b/src/mame/drivers/tagteam.cpp index ef0ec8f9a5f..bcea6a720ed 100644 --- a/src/mame/drivers/tagteam.cpp +++ b/src/mame/drivers/tagteam.cpp @@ -207,7 +207,7 @@ INTERRUPT_GEN_MEMBER(tagteam_state::sound_timer_irq) } -static MACHINE_CONFIG_START( tagteam ) +MACHINE_CONFIG_START(tagteam_state::tagteam) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/8) diff --git a/src/mame/drivers/tail2nos.cpp b/src/mame/drivers/tail2nos.cpp index f153dc1827e..cdd1bf8a2f8 100644 --- a/src/mame/drivers/tail2nos.cpp +++ b/src/mame/drivers/tail2nos.cpp @@ -228,7 +228,7 @@ void tail2nos_state::machine_reset() { } -static MACHINE_CONFIG_START( tail2nos ) +MACHINE_CONFIG_START(tail2nos_state::tail2nos) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,XTAL_20MHz/2) /* verified on pcb */ diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp index b41184813d5..1cabcd3c4bb 100644 --- a/src/mame/drivers/taito.cpp +++ b/src/mame/drivers/taito.cpp @@ -77,6 +77,13 @@ public: DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); DECLARE_WRITE_LINE_MEMBER(votrax_request); TIMER_DEVICE_CALLBACK_MEMBER(timer_a); + void taito2(machine_config &config); + void taito6(machine_config &config); + void taito(machine_config &config); + void shock(machine_config &config); + void taito4(machine_config &config); + void taito5(machine_config &config); + void taito_ay_audio(machine_config &config); private: uint8_t m_out_offs; uint8_t m_sndcmd; @@ -325,7 +332,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( taito_state::timer_a ) output().set_digit_value(++digit, patterns[m_p_ram[m_out_offs++]&15]); } -static MACHINE_CONFIG_START( taito ) +MACHINE_CONFIG_START(taito_state::taito) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, 19000000/9) MCFG_CPU_PROGRAM_MAP(taito_map) @@ -357,20 +364,20 @@ static MACHINE_CONFIG_START( taito ) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_a", taito_state, timer_a, attotime::from_hz(200)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shock, taito ) +MACHINE_CONFIG_DERIVED(taito_state::shock, taito) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(shock_map) MCFG_CPU_MODIFY( "audiocpu" ) MCFG_CPU_PROGRAM_MAP(shock_sub_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( taito2, taito ) +MACHINE_CONFIG_DERIVED(taito_state::taito2, taito) MCFG_CPU_MODIFY( "audiocpu" ) MCFG_CPU_PROGRAM_MAP(taito_sub_map2) MACHINE_CONFIG_END // add vox -static MACHINE_CONFIG_DERIVED( taito4, taito ) +MACHINE_CONFIG_DERIVED(taito_state::taito4, taito) MCFG_SPEAKER_STANDARD_MONO("voxsnd") MCFG_DEVICE_ADD("votrax", VOTRAX_SC01, 720000) // guess MCFG_VOTRAX_SC01_REQUEST_CB(WRITELINE(taito_state, votrax_request)) @@ -380,7 +387,7 @@ static MACHINE_CONFIG_DERIVED( taito4, taito ) MCFG_PIA_CB2_HANDLER(WRITELINE(taito_state, pia_cb2_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( taito_ay_audio ) +MACHINE_CONFIG_START(taito_state::taito_ay_audio) MCFG_CPU_MODIFY( "audiocpu" ) MCFG_CPU_PROGRAM_MAP(taito_sub_map5) @@ -392,12 +399,12 @@ static MACHINE_CONFIG_START( taito_ay_audio ) MACHINE_CONFIG_END // add ay -static MACHINE_CONFIG_DERIVED( taito5, taito ) +MACHINE_CONFIG_DERIVED(taito_state::taito5, taito) MCFG_FRAGMENT_ADD( taito_ay_audio ) MACHINE_CONFIG_END // add vox and ay -static MACHINE_CONFIG_DERIVED( taito6, taito4 ) +MACHINE_CONFIG_DERIVED(taito_state::taito6, taito4) MCFG_FRAGMENT_ADD( taito_ay_audio ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp index 766f29dc897..e3ee1e7cb06 100644 --- a/src/mame/drivers/taito_b.cpp +++ b/src/mame/drivers/taito_b.cpp @@ -1904,7 +1904,7 @@ void taitob_state::machine_reset() } -static MACHINE_CONFIG_START( rastsag2 ) +MACHINE_CONFIG_START(taitob_state::rastsag2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ @@ -1961,7 +1961,7 @@ static MACHINE_CONFIG_START( rastsag2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( masterw ) +MACHINE_CONFIG_START(taitob_state::masterw) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ @@ -2020,7 +2020,7 @@ static MACHINE_CONFIG_START( masterw ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tetrist, rastsag2 ) /* Nastar conversion kit with slightly different memory map */ +MACHINE_CONFIG_DERIVED(taitob_state::tetrist, rastsag2) /* Nastar conversion kit with slightly different memory map */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tetrist_map) @@ -2030,14 +2030,14 @@ static MACHINE_CONFIG_DERIVED( tetrist, rastsag2 ) /* Nastar conversion kit with MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tetrista, masterw ) /* Master of Weapon conversion kit with slightly different memory map */ +MACHINE_CONFIG_DERIVED(taitob_state::tetrista, masterw) /* Master of Weapon conversion kit with slightly different memory map */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tetrista_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ashura ) +MACHINE_CONFIG_START(taitob_state::ashura) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ @@ -2094,7 +2094,7 @@ static MACHINE_CONFIG_START( ashura ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( crimec ) +MACHINE_CONFIG_START(taitob_state::crimec) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ @@ -2152,7 +2152,7 @@ static MACHINE_CONFIG_START( crimec ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hitice ) +MACHINE_CONFIG_START(taitob_state::hitice) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ @@ -2215,7 +2215,7 @@ static MACHINE_CONFIG_START( hitice ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rambo3p ) +MACHINE_CONFIG_START(taitob_state::rambo3p) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */ @@ -2273,7 +2273,7 @@ static MACHINE_CONFIG_START( rambo3p ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rambo3 ) +MACHINE_CONFIG_START(taitob_state::rambo3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12MHz verified on pcb */ @@ -2330,7 +2330,7 @@ static MACHINE_CONFIG_START( rambo3 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pbobble ) +MACHINE_CONFIG_START(taitob_state::pbobble) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ @@ -2393,7 +2393,7 @@ static MACHINE_CONFIG_START( pbobble ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( spacedx ) +MACHINE_CONFIG_START(taitob_state::spacedx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ @@ -2456,7 +2456,7 @@ static MACHINE_CONFIG_START( spacedx ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( spacedxo ) +MACHINE_CONFIG_START(taitob_state::spacedxo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ @@ -2513,7 +2513,7 @@ static MACHINE_CONFIG_START( spacedxo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( qzshowby ) +MACHINE_CONFIG_START(taitob_state::qzshowby) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz according to the readme*/ @@ -2576,7 +2576,7 @@ static MACHINE_CONFIG_START( qzshowby ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( viofight ) +MACHINE_CONFIG_START(taitob_state::viofight) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ @@ -2638,7 +2638,7 @@ static MACHINE_CONFIG_START( viofight ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( silentd ) +MACHINE_CONFIG_START(taitob_state::silentd) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ @@ -2695,7 +2695,7 @@ static MACHINE_CONFIG_START( silentd ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( selfeena ) +MACHINE_CONFIG_START(taitob_state::selfeena) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ @@ -2761,7 +2761,7 @@ void taitob_state::ryujin_patch(void) } #endif -static MACHINE_CONFIG_START( ryujin ) +MACHINE_CONFIG_START(taitob_state::ryujin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ @@ -2825,7 +2825,7 @@ void taitob_state::sbm_patch(void) } #endif -static MACHINE_CONFIG_START( sbm ) +MACHINE_CONFIG_START(taitob_state::sbm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */ @@ -2881,7 +2881,7 @@ static MACHINE_CONFIG_START( sbm ) MCFG_TC0140SYT_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( realpunc ) +MACHINE_CONFIG_START(taitob_c_state::realpunc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp index a477a26012b..c2cb7773a32 100644 --- a/src/mame/drivers/taito_f2.cpp +++ b/src/mame/drivers/taito_f2.cpp @@ -2804,7 +2804,7 @@ MACHINE_START_MEMBER(taitof2_state,f2) membank("bank2")->configure_entries(0, 8, memregion("audiocpu")->base() + 0x10000, 0x4000); } -static MACHINE_CONFIG_START( taito_f2 ) +MACHINE_CONFIG_START(taitof2_state::taito_f2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 24000000/2) /* 12 MHz */ @@ -2848,7 +2848,7 @@ static MACHINE_CONFIG_START( taito_f2 ) MCFG_TC0140SYT_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( taito_f2_tc0220ioc, taito_f2 ) +MACHINE_CONFIG_DERIVED(taitof2_state::taito_f2_tc0220ioc, taito_f2 ) /* basic machine hardware */ MCFG_DEVICE_REMOVE("watchdog") @@ -2861,7 +2861,7 @@ static MACHINE_CONFIG_DERIVED( taito_f2_tc0220ioc, taito_f2 ) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( taito_f2_tc0510nio, taito_f2 ) +MACHINE_CONFIG_DERIVED(taitof2_state::taito_f2_tc0510nio, taito_f2 ) /* basic machine hardware */ MCFG_DEVICE_REMOVE("watchdog") @@ -2876,7 +2876,7 @@ static MACHINE_CONFIG_DERIVED( taito_f2_tc0510nio, taito_f2 ) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( taito_f2_te7750, taito_f2 ) +MACHINE_CONFIG_DERIVED(taitof2_state::taito_f2_te7750, taito_f2 ) MCFG_DEVICE_ADD("te7750", TE7750, 0) MCFG_TE7750_IN_PORT1_CB(IOPORT("DSWA")) MCFG_TE7750_IN_PORT2_CB(IOPORT("DSWB")) @@ -2889,7 +2889,7 @@ static MACHINE_CONFIG_DERIVED( taito_f2_te7750, taito_f2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( finalb, taito_f2_tc0220ioc ) +MACHINE_CONFIG_DERIVED(taitof2_state::finalb, taito_f2_tc0220ioc) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2913,7 +2913,7 @@ static MACHINE_CONFIG_DERIVED( finalb, taito_f2_tc0220ioc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dondokod, taito_f2_tc0220ioc ) +MACHINE_CONFIG_DERIVED(taitof2_state::dondokod, taito_f2_tc0220ioc) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2941,7 +2941,7 @@ static MACHINE_CONFIG_DERIVED( dondokod, taito_f2_tc0220ioc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( megab, taito_f2_tc0220ioc ) +MACHINE_CONFIG_DERIVED(taitof2_state::megab, taito_f2_tc0220ioc) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2965,7 +2965,7 @@ static MACHINE_CONFIG_DERIVED( megab, taito_f2_tc0220ioc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( thundfox, taito_f2_tc0220ioc ) +MACHINE_CONFIG_DERIVED(taitof2_state::thundfox, taito_f2_tc0220ioc) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3002,7 +3002,7 @@ static MACHINE_CONFIG_DERIVED( thundfox, taito_f2_tc0220ioc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cameltry, taito_f2_tc0220ioc ) +MACHINE_CONFIG_DERIVED(taitof2_state::cameltry, taito_f2_tc0220ioc) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3029,7 +3029,7 @@ static MACHINE_CONFIG_DERIVED( cameltry, taito_f2_tc0220ioc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( qtorimon, taito_f2_tc0220ioc ) +MACHINE_CONFIG_DERIVED(taitof2_state::qtorimon, taito_f2_tc0220ioc) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3051,7 +3051,7 @@ static MACHINE_CONFIG_DERIVED( qtorimon, taito_f2_tc0220ioc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( liquidk, taito_f2_tc0220ioc ) +MACHINE_CONFIG_DERIVED(taitof2_state::liquidk, taito_f2_tc0220ioc) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3074,7 +3074,7 @@ static MACHINE_CONFIG_DERIVED( liquidk, taito_f2_tc0220ioc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quizhq, taito_f2 ) +MACHINE_CONFIG_DERIVED(taitof2_state::quizhq, taito_f2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3096,7 +3096,7 @@ static MACHINE_CONFIG_DERIVED( quizhq, taito_f2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ssi, taito_f2_tc0510nio ) +MACHINE_CONFIG_DERIVED(taitof2_state::ssi, taito_f2_tc0510nio) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3120,7 +3120,7 @@ static MACHINE_CONFIG_DERIVED( ssi, taito_f2_tc0510nio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gunfront, taito_f2_tc0510nio ) +MACHINE_CONFIG_DERIVED(taitof2_state::gunfront, taito_f2_tc0510nio) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3146,7 +3146,7 @@ static MACHINE_CONFIG_DERIVED( gunfront, taito_f2_tc0510nio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( growl, taito_f2 ) +MACHINE_CONFIG_DERIVED(taitof2_state::growl, taito_f2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3168,7 +3168,7 @@ static MACHINE_CONFIG_DERIVED( growl, taito_f2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mjnquest, taito_f2 ) +MACHINE_CONFIG_DERIVED(taitof2_state::mjnquest, taito_f2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3188,7 +3188,7 @@ static MACHINE_CONFIG_DERIVED( mjnquest, taito_f2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( footchmp, taito_f2_te7750 ) +MACHINE_CONFIG_DERIVED(taitof2_state::footchmp, taito_f2_te7750) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3212,14 +3212,14 @@ static MACHINE_CONFIG_DERIVED( footchmp, taito_f2_te7750 ) MCFG_TC0360PRI_ADD("tc0360pri") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( footchmpbl, footchmp ) +MACHINE_CONFIG_DERIVED(taitof2_state::footchmpbl, footchmp) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", footchmpbl) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( hthero, taito_f2_te7750 ) +MACHINE_CONFIG_DERIVED(taitof2_state::hthero, taito_f2_te7750) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3244,7 +3244,7 @@ static MACHINE_CONFIG_DERIVED( hthero, taito_f2_te7750 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( koshien, taito_f2_tc0510nio ) +MACHINE_CONFIG_DERIVED(taitof2_state::koshien, taito_f2_tc0510nio) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3269,7 +3269,7 @@ static MACHINE_CONFIG_DERIVED( koshien, taito_f2_tc0510nio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( yuyugogo, taito_f2_tc0510nio ) +MACHINE_CONFIG_DERIVED(taitof2_state::yuyugogo, taito_f2_tc0510nio) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3293,7 +3293,7 @@ static MACHINE_CONFIG_DERIVED( yuyugogo, taito_f2_tc0510nio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ninjak, taito_f2 ) +MACHINE_CONFIG_DERIVED(taitof2_state::ninjak, taito_f2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3325,7 +3325,7 @@ static MACHINE_CONFIG_DERIVED( ninjak, taito_f2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( solfigtr, taito_f2 ) +MACHINE_CONFIG_DERIVED(taitof2_state::solfigtr, taito_f2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3349,7 +3349,7 @@ static MACHINE_CONFIG_DERIVED( solfigtr, taito_f2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( qzquest, taito_f2_tc0510nio ) +MACHINE_CONFIG_DERIVED(taitof2_state::qzquest, taito_f2_tc0510nio) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3367,7 +3367,7 @@ static MACHINE_CONFIG_DERIVED( qzquest, taito_f2_tc0510nio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pulirula, taito_f2_tc0510nio ) +MACHINE_CONFIG_DERIVED(taitof2_state::pulirula, taito_f2_tc0510nio) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3394,7 +3394,7 @@ static MACHINE_CONFIG_DERIVED( pulirula, taito_f2_tc0510nio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( metalb, taito_f2_tc0510nio ) +MACHINE_CONFIG_DERIVED(taitof2_state::metalb, taito_f2_tc0510nio) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3422,7 +3422,7 @@ static MACHINE_CONFIG_DERIVED( metalb, taito_f2_tc0510nio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( qzchikyu, taito_f2_tc0510nio ) +MACHINE_CONFIG_DERIVED(taitof2_state::qzchikyu, taito_f2_tc0510nio) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3444,7 +3444,7 @@ static MACHINE_CONFIG_DERIVED( qzchikyu, taito_f2_tc0510nio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( yesnoj, taito_f2 ) +MACHINE_CONFIG_DERIVED(taitof2_state::yesnoj, taito_f2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3467,7 +3467,7 @@ static MACHINE_CONFIG_DERIVED( yesnoj, taito_f2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( deadconx, taito_f2_te7750 ) +MACHINE_CONFIG_DERIVED(taitof2_state::deadconx, taito_f2_te7750) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3491,7 +3491,7 @@ static MACHINE_CONFIG_DERIVED( deadconx, taito_f2_te7750 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( deadconxj, taito_f2_te7750 ) +MACHINE_CONFIG_DERIVED(taitof2_state::deadconxj, taito_f2_te7750) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3515,7 +3515,7 @@ static MACHINE_CONFIG_DERIVED( deadconxj, taito_f2_te7750 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dinorex, taito_f2_tc0510nio ) +MACHINE_CONFIG_DERIVED(taitof2_state::dinorex, taito_f2_tc0510nio) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3540,7 +3540,7 @@ static MACHINE_CONFIG_DERIVED( dinorex, taito_f2_tc0510nio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( qjinsei, taito_f2_tc0510nio ) +MACHINE_CONFIG_DERIVED(taitof2_state::qjinsei, taito_f2_tc0510nio) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3565,7 +3565,7 @@ static MACHINE_CONFIG_DERIVED( qjinsei, taito_f2_tc0510nio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( qcrayon, taito_f2_tc0510nio ) +MACHINE_CONFIG_DERIVED(taitof2_state::qcrayon, taito_f2_tc0510nio) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3590,7 +3590,7 @@ static MACHINE_CONFIG_DERIVED( qcrayon, taito_f2_tc0510nio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( qcrayon2, taito_f2_tc0510nio ) +MACHINE_CONFIG_DERIVED(taitof2_state::qcrayon2, taito_f2_tc0510nio) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3615,7 +3615,7 @@ static MACHINE_CONFIG_DERIVED( qcrayon2, taito_f2_tc0510nio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( driftout, taito_f2_tc0510nio ) +MACHINE_CONFIG_DERIVED(taitof2_state::driftout, taito_f2_tc0510nio) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -3642,7 +3642,7 @@ static MACHINE_CONFIG_DERIVED( driftout, taito_f2_tc0510nio ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cameltrya ) +MACHINE_CONFIG_START(taitof2_state::cameltrya) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* verified on pcb */ @@ -3711,7 +3711,7 @@ static MACHINE_CONFIG_START( cameltrya ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( driveout ) +MACHINE_CONFIG_START(taitof2_state::driveout) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */ diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp index 1d1c7e777c3..82f77df9123 100644 --- a/src/mame/drivers/taito_f3.cpp +++ b/src/mame/drivers/taito_f3.cpp @@ -457,7 +457,7 @@ MACHINE_RESET_MEMBER(taito_f3_state,f3) m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } -static MACHINE_CONFIG_START( f3 ) +MACHINE_CONFIG_START(taito_f3_state::f3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz) @@ -493,30 +493,30 @@ MACHINE_CONFIG_END of the games change the registers during the game (to do so would probably require monitor recalibration.) */ -static MACHINE_CONFIG_DERIVED( f3_224a, f3 ) +MACHINE_CONFIG_DERIVED(taito_f3_state::f3_224a, f3) 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 ) +MACHINE_CONFIG_DERIVED(taito_f3_state::f3_224b, f3) 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 ) +MACHINE_CONFIG_DERIVED(taito_f3_state::f3_224c, f3) 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 ) +MACHINE_CONFIG_DERIVED(taito_f3_state::f3_eeprom, f3) MCFG_DEVICE_REMOVE("eeprom") MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_EEPROM_SERIAL_DATA(recalh_eeprom, 128) //TODO: convert this into ROM MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( f3_224b_eeprom, f3_224b ) +MACHINE_CONFIG_DERIVED(taito_f3_state::f3_224b_eeprom, f3_224b) MCFG_DEVICE_REMOVE("eeprom") MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -553,7 +553,7 @@ static GFXDECODE_START( bubsympb ) GFXDECODE_ENTRY( nullptr, 0x000000, pivotlayout, 0, 64 ) /* Dynamically modified */ GFXDECODE_END -static MACHINE_CONFIG_START( bubsympb ) +MACHINE_CONFIG_START(taito_f3_state::bubsympb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(bubsympb_map) diff --git a/src/mame/drivers/taito_h.cpp b/src/mame/drivers/taito_h.cpp index ac49ec34cb3..54955513f8a 100644 --- a/src/mame/drivers/taito_h.cpp +++ b/src/mame/drivers/taito_h.cpp @@ -635,7 +635,7 @@ void taitoh_state::machine_start() } -static MACHINE_CONFIG_START( syvalion ) +MACHINE_CONFIG_START(taitoh_state::syvalion) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz */ @@ -691,7 +691,7 @@ static MACHINE_CONFIG_START( syvalion ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( recordbr ) +MACHINE_CONFIG_START(taitoh_state::recordbr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz */ @@ -747,7 +747,7 @@ static MACHINE_CONFIG_START( recordbr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tetristh, recordbr ) +MACHINE_CONFIG_DERIVED(taitoh_state::tetristh, recordbr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -755,7 +755,7 @@ static MACHINE_CONFIG_DERIVED( tetristh, recordbr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dleague ) +MACHINE_CONFIG_START(taitoh_state::dleague) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz */ diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index d7434a48787..d53c6345ab0 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -1520,7 +1520,7 @@ WRITE8_MEMBER(fhawk_state::portA_w) } -static MACHINE_CONFIG_START( l_system_video ) +MACHINE_CONFIG_START(taitol_state::l_system_video) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -1539,7 +1539,7 @@ static MACHINE_CONFIG_START( l_system_video ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fhawk ) +MACHINE_CONFIG_START(fhawk_state::fhawk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */ @@ -1586,7 +1586,7 @@ static MACHINE_CONFIG_START( fhawk ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( champwr, fhawk ) +MACHINE_CONFIG_DERIVED(champwr_state::champwr, fhawk) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1612,7 +1612,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( raimais ) +MACHINE_CONFIG_START(taitol_2cpu_state::raimais) MCFG_CPU_ADD("maincpu", Z80, 13330560/2) // needs verification from pin122 of TC0090LVC MCFG_CPU_PROGRAM_MAP(raimais_map) @@ -1658,7 +1658,7 @@ static MACHINE_CONFIG_START( raimais ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( kurikint ) +MACHINE_CONFIG_START(taitol_2cpu_state::kurikint) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */ @@ -1698,7 +1698,7 @@ static MACHINE_CONFIG_START( kurikint ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( plotting ) +MACHINE_CONFIG_START(taitol_1cpu_state::plotting) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */ @@ -1732,7 +1732,7 @@ static MACHINE_CONFIG_START( plotting ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( puzznic, plotting ) +MACHINE_CONFIG_DERIVED(taitol_1cpu_state::puzznic, plotting) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1741,7 +1741,7 @@ static MACHINE_CONFIG_DERIVED( puzznic, plotting ) MCFG_DEVICE_ADD("mcu", ARKANOID_68705P3, XTAL_3MHz) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( puzznici, plotting ) +MACHINE_CONFIG_DERIVED(taitol_1cpu_state::puzznici, plotting) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1749,7 +1749,7 @@ static MACHINE_CONFIG_DERIVED( puzznici, plotting ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( horshoes, plotting ) +MACHINE_CONFIG_DERIVED(horshoes_state::horshoes, plotting) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1761,7 +1761,7 @@ static MACHINE_CONFIG_DERIVED( horshoes, plotting ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( palamed, plotting ) +MACHINE_CONFIG_DERIVED(taitol_1cpu_state::palamed, plotting) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1781,7 +1781,7 @@ static MACHINE_CONFIG_DERIVED( palamed, plotting ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cachat, plotting ) +MACHINE_CONFIG_DERIVED(taitol_1cpu_state::cachat, plotting) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1800,7 +1800,7 @@ static MACHINE_CONFIG_DERIVED( cachat, plotting ) MCFG_DEVICE_REMOVE("inmux") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( evilston ) +MACHINE_CONFIG_START(taitol_2cpu_state::evilston) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* not verified */ diff --git a/src/mame/drivers/taito_o.cpp b/src/mame/drivers/taito_o.cpp index 539bfa9d0a2..f0b95b59c3f 100644 --- a/src/mame/drivers/taito_o.cpp +++ b/src/mame/drivers/taito_o.cpp @@ -232,7 +232,7 @@ void taitoo_state::machine_start() { } -static MACHINE_CONFIG_START( parentj ) +MACHINE_CONFIG_START(taitoo_state::parentj) MCFG_CPU_ADD("maincpu", M68000,12000000 ) /*?? MHz */ MCFG_CPU_PROGRAM_MAP(parentj_map) diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp index 2a38a48065d..7e91e6cd3ad 100644 --- a/src/mame/drivers/taito_x.cpp +++ b/src/mame/drivers/taito_x.cpp @@ -917,7 +917,7 @@ MACHINE_START_MEMBER(taitox_state,superman) /**************************************************************************/ -static MACHINE_CONFIG_START( superman ) +MACHINE_CONFIG_START(taitox_state::superman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */ @@ -966,7 +966,7 @@ static MACHINE_CONFIG_START( superman ) MCFG_TC0140SYT_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( daisenpu ) +MACHINE_CONFIG_START(taitox_state::daisenpu) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */ @@ -1011,7 +1011,7 @@ static MACHINE_CONFIG_START( daisenpu ) MCFG_PC060HA_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( gigandes ) +MACHINE_CONFIG_START(taitox_state::gigandes) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */ @@ -1058,7 +1058,7 @@ static MACHINE_CONFIG_START( gigandes ) MCFG_TC0140SYT_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ballbros ) +MACHINE_CONFIG_START(taitox_state::ballbros) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */ diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp index 395fad448f7..93301fd0f4b 100644 --- a/src/mame/drivers/taito_z.cpp +++ b/src/mame/drivers/taito_z.cpp @@ -2946,7 +2946,7 @@ MACHINE_RESET_MEMBER(taitoz_state,taitoz) /* Contcirc vis area seems narrower than the other games... */ -static MACHINE_CONFIG_START( contcirc ) +MACHINE_CONFIG_START(taitoz_state::contcirc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ @@ -3025,7 +3025,7 @@ static MACHINE_CONFIG_START( contcirc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( chasehq ) +MACHINE_CONFIG_START(taitoz_state::chasehq) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ @@ -3104,7 +3104,7 @@ static MACHINE_CONFIG_START( chasehq ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( enforce ) +MACHINE_CONFIG_START(taitoz_state::enforce) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ @@ -3184,7 +3184,7 @@ static MACHINE_CONFIG_START( enforce ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bshark ) +MACHINE_CONFIG_START(taitoz_state::bshark) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ @@ -3253,7 +3253,7 @@ static MACHINE_CONFIG_START( bshark ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bsharkjjs, bshark ) +MACHINE_CONFIG_DERIVED(taitoz_state::bsharkjjs, bshark) /* basic machine hardware */ @@ -3263,7 +3263,7 @@ static MACHINE_CONFIG_DERIVED( bsharkjjs, bshark ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sci ) +MACHINE_CONFIG_START(taitoz_state::sci) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ @@ -3340,7 +3340,7 @@ static MACHINE_CONFIG_START( sci ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( nightstr ) +MACHINE_CONFIG_START(taitoz_state::nightstr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ @@ -3421,7 +3421,7 @@ static MACHINE_CONFIG_START( nightstr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( aquajack ) +MACHINE_CONFIG_START(taitoz_state::aquajack) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ @@ -3501,7 +3501,7 @@ static MACHINE_CONFIG_START( aquajack ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( spacegun ) +MACHINE_CONFIG_START(taitoz_state::spacegun) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */ @@ -3573,7 +3573,7 @@ static MACHINE_CONFIG_START( spacegun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( dblaxle ) +MACHINE_CONFIG_START(taitoz_state::dblaxle) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) @@ -3651,7 +3651,7 @@ static MACHINE_CONFIG_START( dblaxle ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( racingb ) +MACHINE_CONFIG_START(taitoz_state::racingb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) diff --git a/src/mame/drivers/taitoair.cpp b/src/mame/drivers/taitoair.cpp index e7e6a29a8d0..9acf88f733e 100644 --- a/src/mame/drivers/taitoair.cpp +++ b/src/mame/drivers/taitoair.cpp @@ -697,7 +697,7 @@ void taitoair_state::machine_reset() } } -static MACHINE_CONFIG_START( airsys ) +MACHINE_CONFIG_START(taitoair_state::airsys) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) // MC68000P12 diff --git a/src/mame/drivers/taitogn.cpp b/src/mame/drivers/taitogn.cpp index 0adb428d762..2c69c345847 100644 --- a/src/mame/drivers/taitogn.cpp +++ b/src/mame/drivers/taitogn.cpp @@ -357,7 +357,7 @@ public: m_cat702_2(*this, "cat702_2"), m_znmcu(*this, "znmcu"), m_maincpu(*this, "maincpu"), - m_mn10200(*this, "mn10200"), + m_mn10200(*this, "taito_zoom:mn10200"), m_flashbank(*this, "flashbank"), m_mb3773(*this, "mb3773"), m_zoom(*this, "taito_zoom"), @@ -396,6 +396,12 @@ public: DECLARE_READ32_MEMBER(zsg2_ext_r); DECLARE_DRIVER_INIT(coh3002t_nz); + void coh3002t_t2_mp(machine_config &config); + void coh3002t(machine_config &config); + void coh3002t_t1_mp(machine_config &config); + void coh3002t_cf(machine_config &config); + void coh3002t_t2(machine_config &config); + void coh3002t_t1(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -675,7 +681,7 @@ static ADDRESS_MAP_START( taitogn_mp_map, AS_PROGRAM, 32, taitogn_state ) ADDRESS_MAP_END static ADDRESS_MAP_START( taitogn_mn_map, AS_PROGRAM, 16, taitogn_state ) - AM_RANGE(0x080000, 0x0fffff) AM_DEVREAD("pgmflash", intelfsh16_device, read) + AM_RANGE(0x080000, 0x0fffff) AM_DEVREAD(":pgmflash", intelfsh16_device, read) AM_IMPORT_FROM( taitozoom_mn_map ) ADDRESS_MAP_END @@ -686,7 +692,7 @@ SLOT_INTERFACE_START(slot_ataflash) SLOT_INTERFACE("ataflash", ATA_FLASH_PCCARD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( coh3002t ) +MACHINE_CONFIG_START(taitogn_state::coh3002t) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", CXD8661R, XTAL_100MHz ) @@ -746,42 +752,39 @@ static MACHINE_CONFIG_START( coh3002t ) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) - MCFG_FRAGMENT_ADD( taito_zoom_sound ) - MCFG_CPU_MODIFY("mn10200") + MCFG_TAITO_ZOOM_ADD("taito_zoom") + MCFG_CPU_MODIFY("taito_zoom:mn10200") MCFG_CPU_PROGRAM_MAP(taitogn_mn_map) - MCFG_SOUND_REPLACE("zsg2", ZSG2, XTAL_25MHz) + MCFG_DEVICE_MODIFY("taito_zoom:zsg2") MCFG_ZSG2_EXT_READ_HANDLER(READ32(taitogn_state, zsg2_ext_r)) - - MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(coh3002t_t1, coh3002t) +MACHINE_CONFIG_DERIVED(taitogn_state::coh3002t_t1, coh3002t) MCFG_DEVICE_MODIFY("pccard") MCFG_SLOT_DEFAULT_OPTION("taitopccard1") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(coh3002t_t2, coh3002t) +MACHINE_CONFIG_DERIVED(taitogn_state::coh3002t_t2, coh3002t) MCFG_DEVICE_MODIFY("pccard") MCFG_SLOT_DEFAULT_OPTION("taitopccard2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( coh3002t_t1_mp, coh3002t_t1 ) +MACHINE_CONFIG_DERIVED(taitogn_state::coh3002t_t1_mp, coh3002t_t1) /* basic machine hardware */ MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(taitogn_mp_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( coh3002t_t2_mp, coh3002t_t2 ) +MACHINE_CONFIG_DERIVED(taitogn_state::coh3002t_t2_mp, coh3002t_t2) /* basic machine hardware */ MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(taitogn_mp_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(coh3002t_cf, coh3002t) +MACHINE_CONFIG_DERIVED(taitogn_state::coh3002t_cf, coh3002t) MCFG_DEVICE_MODIFY("pccard") MCFG_SLOT_DEFAULT_OPTION("taitocf") MACHINE_CONFIG_END @@ -952,9 +955,9 @@ INPUT_PORTS_END ROM_LOAD16_WORD_SWAP_BIOS( 0, "f35-01_m27c800_v1.bin", 0x000000, 0x100000, CRC(cd15cc30) SHA1(78361f46fa7186d5058937c86c66247a86b1257f) ) /* hand made */ \ ROM_SYSTEM_BIOS( 1, "v2", "G-NET Bios v2 flasher" ) \ ROM_LOAD16_WORD_SWAP_BIOS( 1, "f35-01_m27c800.bin", 0x000000, 0x100000, CRC(6225ec11) SHA1(047852d456b6ff85f8e640887caa03cf3e63ffad) ) \ - ROM_REGION( 0x80000, "mn10200", 0 ) \ + ROM_REGION( 0x80000, "taito_zoom:mn10200", 0 ) \ ROM_FILL( 0, 0x80000, 0xff ) \ - ROM_REGION32_LE( 0x600000, "zsg2", 0 ) \ + ROM_REGION32_LE( 0x600000, "taito_zoom:zsg2", 0 ) \ ROM_FILL( 0, 0x600000, 0xff ) ROM_START( coh3002t ) diff --git a/src/mame/drivers/taitojc.cpp b/src/mame/drivers/taitojc.cpp index 2e0a878e395..f9ccc9ced09 100644 --- a/src/mame/drivers/taitojc.cpp +++ b/src/mame/drivers/taitojc.cpp @@ -1068,7 +1068,7 @@ void taitojc_state::machine_start() } -static MACHINE_CONFIG_START( taitojc ) +MACHINE_CONFIG_START(taitojc_state::taitojc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68040, XTAL_10MHz*2) // 20MHz, clock source = CY7C991 @@ -1112,7 +1112,7 @@ static MACHINE_CONFIG_START( taitojc ) MCFG_DEVICE_ADD("taito_en", TAITO_EN, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( dendego, taitojc ) +MACHINE_CONFIG_DERIVED(taitojc_state::dendego, taitojc) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp index 412c13cf36b..46fa3a83a05 100644 --- a/src/mame/drivers/taitopjc.cpp +++ b/src/mame/drivers/taitopjc.cpp @@ -160,6 +160,7 @@ public: uint32_t m_video_address; uint32_t m_dsp_rom_address; + void taitopjc(machine_config &config); }; void taitopjc_state::video_exit() @@ -752,7 +753,7 @@ INTERRUPT_GEN_MEMBER(taitopjc_state::taitopjc_vbi) } -static MACHINE_CONFIG_START( taitopjc ) +MACHINE_CONFIG_START(taitopjc_state::taitopjc) MCFG_CPU_ADD("maincpu", PPC603E, 100000000) MCFG_PPC_BUS_FREQUENCY(XTAL_66_6667MHz) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */ MCFG_CPU_PROGRAM_MAP(ppc603e_mem) diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp index c1d4346cbe4..d921d0923c2 100644 --- a/src/mame/drivers/taitosj.cpp +++ b/src/mame/drivers/taitosj.cpp @@ -1752,7 +1752,7 @@ WRITE8_MEMBER(taitosj_state::taitosj_dacvol_w) m_dacvol->write(space, NODE_01, data ^ 0xff); // 7416 hex inverter } -static MACHINE_CONFIG_START( nomcu ) +MACHINE_CONFIG_START(taitosj_state::nomcu) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz/2) /* 8 MHz / 2, on CPU board */ @@ -1827,7 +1827,7 @@ MACHINE_CONFIG_END /* same as above, but with additional 68705 MCU */ -static MACHINE_CONFIG_DERIVED( mcu, nomcu ) +MACHINE_CONFIG_DERIVED(taitosj_state::mcu, nomcu) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1844,7 +1844,7 @@ static MACHINE_CONFIG_DERIVED( mcu, nomcu ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kikstart, mcu ) +MACHINE_CONFIG_DERIVED(taitosj_state::kikstart, mcu) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/taitottl.cpp b/src/mame/drivers/taitottl.cpp index d2070fee7c9..f6ffb7d9c1d 100644 --- a/src/mame/drivers/taitottl.cpp +++ b/src/mame/drivers/taitottl.cpp @@ -99,6 +99,7 @@ public: required_device m_maincpu; required_device m_video; + void taitottl(machine_config &config); protected: // driver_device overrides @@ -139,7 +140,7 @@ void taitottl_state::video_start() { } -static MACHINE_CONFIG_START( taitottl ) +MACHINE_CONFIG_START(taitottl_state::taitottl) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/taitotx.cpp b/src/mame/drivers/taitotx.cpp index 85a95cb312d..129bd64b5db 100644 --- a/src/mame/drivers/taitotx.cpp +++ b/src/mame/drivers/taitotx.cpp @@ -134,6 +134,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_taito_type_x(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void taito_type_x(machine_config &config); }; @@ -166,7 +167,7 @@ void taito_type_x_state::machine_reset() } // todo: different configs for the different machine types. -static MACHINE_CONFIG_START( taito_type_x ) +MACHINE_CONFIG_START(taito_type_x_state::taito_type_x) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM3, 733333333) /* Wrong, much newer processors, much faster. */ diff --git a/src/mame/drivers/taitotz.cpp b/src/mame/drivers/taitotz.cpp index e8e292988d9..9017564c1e0 100644 --- a/src/mame/drivers/taitotz.cpp +++ b/src/mame/drivers/taitotz.cpp @@ -617,6 +617,8 @@ public: void video_reg_w(uint32_t reg, uint32_t data); void init_taitotz_152(); void init_taitotz_111a(); + void taitotz(machine_config &config); + void landhigh(machine_config &config); }; class taitotz_renderer : public poly_manager @@ -2557,7 +2559,7 @@ WRITE_LINE_MEMBER(taitotz_state::ide_interrupt) m_iocpu->set_input_line(TLCS900_INT2, state); } -static MACHINE_CONFIG_START( taitotz ) +MACHINE_CONFIG_START(taitotz_state::taitotz) /* IBM EMPPC603eBG-100 */ MCFG_CPU_ADD("maincpu", PPC603E, 100000000) MCFG_PPC_BUS_FREQUENCY(XTAL_66_6667MHz) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */ @@ -2599,7 +2601,7 @@ static MACHINE_CONFIG_START( taitotz ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( landhigh, taitotz ) +MACHINE_CONFIG_DERIVED(taitotz_state::landhigh, taitotz) MCFG_CPU_MODIFY("iocpu") MCFG_CPU_PROGRAM_MAP(landhigh_tlcs900h_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/taitowlf.cpp b/src/mame/drivers/taitowlf.cpp index 4110306b98c..66ba1a24349 100644 --- a/src/mame/drivers/taitowlf.cpp +++ b/src/mame/drivers/taitowlf.cpp @@ -65,6 +65,7 @@ public: #endif uint32_t screen_update_taitowlf(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void intel82439tx_init(); + void taitowlf(machine_config &config); }; #if !ENABLE_VGA @@ -365,7 +366,7 @@ PALETTE_INIT_MEMBER(taitowlf_state, taitowlf) } #endif -static MACHINE_CONFIG_START( taitowlf ) +MACHINE_CONFIG_START(taitowlf_state::taitowlf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM, 200000000) diff --git a/src/mame/drivers/tamag1.cpp b/src/mame/drivers/tamag1.cpp index 1dfec3b1038..7fcb96359ec 100644 --- a/src/mame/drivers/tamag1.cpp +++ b/src/mame/drivers/tamag1.cpp @@ -36,6 +36,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(input_changed); E0C6S46_PIXEL_UPDATE(pixel_update); + void tama(machine_config &config); protected: virtual void machine_start() override; }; @@ -131,7 +132,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( tama ) +MACHINE_CONFIG_START(tamag1_state::tama) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", E0C6S46, XTAL_32_768kHz) diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index 18144b4e3b9..d6de74fa4df 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -129,6 +129,17 @@ public: uint8_t m_tandy_bios_bank; /* I/O port FFEAh */ uint8_t m_tandy_ppi_portb, m_tandy_ppi_portc; uint8_t m_vram_bank; + static void cfg_fdc_35(device_t *device); + static void cfg_fdc_525(device_t *device); + void tandy1000_common(machine_config &config); + void tandy1000_90key(machine_config &config); + void tandy1000_101key(machine_config &config); + void t1000tl(machine_config &config); + void t1000sx(machine_config &config); + void t1000rl(machine_config &config); + void t1000sl2(machine_config &config); + void t1000hx(machine_config &config); + void t1000tx(machine_config &config); }; /* tandy 1000 eeprom @@ -601,26 +612,25 @@ static const gfx_layout t1000_charlayout = 8 }; -static MACHINE_CONFIG_START( cfg_fdc_35 ) - MCFG_DEVICE_MODIFY("fdc:0") - MCFG_SLOT_DEFAULT_OPTION("35dd") - MCFG_SLOT_FIXED(true) - MCFG_DEVICE_REMOVE("fdc:1") -MACHINE_CONFIG_END - -static MACHINE_CONFIG_START( cfg_fdc_525 ) - MCFG_DEVICE_MODIFY("fdc:0") - MCFG_SLOT_FIXED(true) +void tandy1000_state::cfg_fdc_35(device_t *device) +{ + device_slot_interface::static_set_default_option(*device->subdevice("fdc:0"), "35dd"); + device_slot_interface::static_set_fixed(*device->subdevice("fdc:0"), true); + device_slot_interface::static_set_default_option(*device->subdevice("fdc:1"), ""); +} - MCFG_DEVICE_REMOVE("fdc:1") -MACHINE_CONFIG_END +void tandy1000_state::cfg_fdc_525(device_t *device) +{ + device_slot_interface::static_set_fixed(*device->subdevice("fdc:0"), true); + device_slot_interface::static_set_default_option(*device->subdevice("fdc:1"), ""); +} static GFXDECODE_START( t1000 ) GFXDECODE_ENTRY( "gfx1", 0x0000, t1000_charlayout, 3, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START(tandy1000_common) +MACHINE_CONFIG_START(tandy1000_state::tandy1000_common) MCFG_DEVICE_ADD("mb", T1000_MOTHERBOARD, 0) t1000_mb_device::static_set_cputag(*device, "^maincpu"); @@ -651,15 +661,15 @@ static MACHINE_CONFIG_START(tandy1000_common) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("pc_list","ibm5150") MACHINE_CONFIG_END -static MACHINE_CONFIG_START(tandy1000_90key) +MACHINE_CONFIG_START(tandy1000_state::tandy1000_90key) MCFG_PC_KEYB_ADD("pc_keyboard", DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START(tandy1000_101key) +MACHINE_CONFIG_START(tandy1000_state::tandy1000_101key) MCFG_AT_KEYB_ADD("pc_keyboard", 1, DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( t1000hx ) +MACHINE_CONFIG_START(tandy1000_state::t1000hx) MCFG_CPU_ADD("maincpu", I8088, 8000000) MCFG_CPU_PROGRAM_MAP(tandy1000_map) MCFG_CPU_IO_MAP(tandy1000_io) @@ -675,7 +685,7 @@ static MACHINE_CONFIG_START( t1000hx ) MCFG_RAM_EXTRA_OPTIONS("256K, 384K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( t1000sx, t1000hx ) +MACHINE_CONFIG_DERIVED(tandy1000_state::t1000sx, t1000hx) MCFG_DEVICE_MODIFY("isa_fdc") MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc_xt", cfg_fdc_525) @@ -689,7 +699,7 @@ static MACHINE_CONFIG_DERIVED( t1000sx, t1000hx ) MCFG_RAM_EXTRA_OPTIONS("384K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( t1000rl ) +MACHINE_CONFIG_START(tandy1000_state::t1000rl) MCFG_CPU_ADD("maincpu", I8086, XTAL_28_63636MHz / 3) MCFG_CPU_PROGRAM_MAP(tandy1000_bank_map) MCFG_CPU_IO_MAP(tandy1000_bank_io) @@ -711,7 +721,7 @@ static MACHINE_CONFIG_START( t1000rl ) MCFG_RAM_EXTRA_OPTIONS("384K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( t1000sl2, t1000rl ) +MACHINE_CONFIG_DERIVED(tandy1000_state::t1000sl2, t1000rl) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_CLOCK( XTAL_24MHz / 3 ) @@ -721,7 +731,7 @@ static MACHINE_CONFIG_DERIVED( t1000sl2, t1000rl ) MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, nullptr, false) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( t1000tl ) +MACHINE_CONFIG_START(tandy1000_state::t1000tl) MCFG_CPU_ADD("maincpu", I80286, XTAL_28_63636MHz / 2) MCFG_CPU_PROGRAM_MAP(tandy1000_286_map) MCFG_CPU_IO_MAP(tandy1000_16_io) @@ -738,7 +748,7 @@ static MACHINE_CONFIG_START( t1000tl ) MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, nullptr, false) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( t1000tx, t1000tl ) +MACHINE_CONFIG_DERIVED(tandy1000_state::t1000tx, t1000tl) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_IO_MAP(tandy1000tx_io) diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp index 5e2425a9190..f6a38fefee9 100644 --- a/src/mame/drivers/tandy2k.cpp +++ b/src/mame/drivers/tandy2k.cpp @@ -764,7 +764,7 @@ void tandy2k_state::device_reset_after_children() // Machine Driver -static MACHINE_CONFIG_START( tandy2k ) +MACHINE_CONFIG_START(tandy2k_state::tandy2k) // basic machine hardware MCFG_CPU_ADD(I80186_TAG, I80186, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(tandy2k_mem) @@ -881,7 +881,7 @@ static MACHINE_CONFIG_START( tandy2k ) MCFG_RAM_EXTRA_OPTIONS("256K,384K,512K,640K,768K,896K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tandy2k_hd, tandy2k ) +MACHINE_CONFIG_DERIVED(tandy2k_state::tandy2k_hd, tandy2k) // basic machine hardware MCFG_CPU_MODIFY(I80186_TAG) MCFG_CPU_IO_MAP(tandy2k_hd_io) diff --git a/src/mame/drivers/tank8.cpp b/src/mame/drivers/tank8.cpp index ca612beadeb..6dd97588f5b 100644 --- a/src/mame/drivers/tank8.cpp +++ b/src/mame/drivers/tank8.cpp @@ -326,7 +326,7 @@ static GFXDECODE_START( tank8 ) GFXDECODE_END -static MACHINE_CONFIG_START( tank8 ) +MACHINE_CONFIG_START(tank8_state::tank8) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 11055000 / 10) /* ? */ diff --git a/src/mame/drivers/tankbatt.cpp b/src/mame/drivers/tankbatt.cpp index dbeb8659c49..69bf7dbf355 100644 --- a/src/mame/drivers/tankbatt.cpp +++ b/src/mame/drivers/tankbatt.cpp @@ -277,7 +277,7 @@ static const char *const tankbatt_sample_names[] = }; -static MACHINE_CONFIG_START( tankbatt ) +MACHINE_CONFIG_START(tankbatt_state::tankbatt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */ diff --git a/src/mame/drivers/tankbust.cpp b/src/mame/drivers/tankbust.cpp index f6159d67440..a482bbdf151 100644 --- a/src/mame/drivers/tankbust.cpp +++ b/src/mame/drivers/tankbust.cpp @@ -330,7 +330,7 @@ INTERRUPT_GEN_MEMBER(tankbust_state::vblank_irq) device.execute().set_input_line(0, HOLD_LINE); } -static MACHINE_CONFIG_START( tankbust ) +MACHINE_CONFIG_START(tankbust_state::tankbust) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_14_31818MHz/2) /* Verified on PCB */ diff --git a/src/mame/drivers/taotaido.cpp b/src/mame/drivers/taotaido.cpp index 2696b58bad4..c2e2b50e5da 100644 --- a/src/mame/drivers/taotaido.cpp +++ b/src/mame/drivers/taotaido.cpp @@ -344,7 +344,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( taotaido ) +MACHINE_CONFIG_START(taotaido_state::taotaido) MCFG_CPU_ADD("maincpu", M68000, 32000000/2) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", taotaido_state, irq1_line_hold) diff --git a/src/mame/drivers/tapatune.cpp b/src/mame/drivers/tapatune.cpp index 17038a80aa3..553042b1ff2 100644 --- a/src/mame/drivers/tapatune.cpp +++ b/src/mame/drivers/tapatune.cpp @@ -106,6 +106,8 @@ public: MC6845_BEGIN_UPDATE(crtc_begin_update); MC6845_UPDATE_ROW(crtc_update_row); + void tapatune(machine_config &config); + void tapatune_base(machine_config &config); }; @@ -509,7 +511,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( tapatune_base ) +MACHINE_CONFIG_START(tapatune_state::tapatune_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 4) MCFG_CPU_PROGRAM_MAP(maincpu_map) @@ -528,7 +530,7 @@ static MACHINE_CONFIG_START( tapatune_base ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tapatune, tapatune_base ) +MACHINE_CONFIG_DERIVED(tapatune_state::tapatune, tapatune_base) MCFG_CPU_ADD("videocpu", M68000, XTAL_24MHz / 2) MCFG_CPU_PROGRAM_MAP(video_map) diff --git a/src/mame/drivers/targeth.cpp b/src/mame/drivers/targeth.cpp index 9b9751282c7..dc4bc12b6ee 100644 --- a/src/mame/drivers/targeth.cpp +++ b/src/mame/drivers/targeth.cpp @@ -268,7 +268,7 @@ static INPUT_PORTS_START( targeth ) INPUT_PORTS_END -static MACHINE_CONFIG_START( targeth ) +MACHINE_CONFIG_START(targeth_state::targeth) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */ diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp index c2ad4663d43..63f3d7e2be0 100644 --- a/src/mame/drivers/tasman.cpp +++ b/src/mame/drivers/tasman.cpp @@ -80,6 +80,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(kongambl_vblank); K056832_CB_MEMBER(tile_callback); K053246_CB_MEMBER(sprite_callback); + void kongambl(machine_config &config); }; @@ -634,7 +635,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(kongambl_state::kongambl_vblank) } -static MACHINE_CONFIG_START( kongambl ) +MACHINE_CONFIG_START(kongambl_state::kongambl) MCFG_CPU_ADD("maincpu", M68EC020, 25000000) MCFG_CPU_PROGRAM_MAP(kongambl_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kongambl_state, kongambl_vblank, "screen", 0, 1) diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp index 2600373ed22..48c068a4cfd 100644 --- a/src/mame/drivers/tatsumi.cpp +++ b/src/mame/drivers/tatsumi.cpp @@ -842,7 +842,7 @@ MACHINE_RESET_MEMBER(apache3_state,apache3) } -static MACHINE_CONFIG_START( apache3 ) +MACHINE_CONFIG_START(apache3_state::apache3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30, CLOCK_1 / 2) @@ -898,7 +898,7 @@ static MACHINE_CONFIG_START( apache3 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( roundup5 ) +MACHINE_CONFIG_START(roundup5_state::roundup5) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30, CLOCK_1 / 2) @@ -946,7 +946,7 @@ static MACHINE_CONFIG_START( roundup5 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cyclwarr ) +MACHINE_CONFIG_START(cyclwarr_state::cyclwarr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, CLOCK_2 / 4) @@ -1004,7 +1004,7 @@ static MACHINE_CONFIG_START( cyclwarr ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bigfight ) +MACHINE_CONFIG_START(cyclwarr_state::bigfight) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, CLOCK_2 / 4) diff --git a/src/mame/drivers/tattack.cpp b/src/mame/drivers/tattack.cpp index 26c6949e021..9bbd563fe82 100644 --- a/src/mame/drivers/tattack.cpp +++ b/src/mame/drivers/tattack.cpp @@ -77,6 +77,7 @@ public: DECLARE_PALETTE_INIT(tattack); uint32_t screen_update_tattack(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void tattack(machine_config &config); protected: virtual void video_start() override; private: @@ -397,7 +398,7 @@ static const char *const tattack_sample_names[] = nullptr }; -static MACHINE_CONFIG_START( tattack ) +MACHINE_CONFIG_START(tattack_state::tattack) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 8000000 / 2) /* 4 MHz ? */ diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp index 9a0f0477f1a..00bc322a94a 100644 --- a/src/mame/drivers/tavernie.cpp +++ b/src/mame/drivers/tavernie.cpp @@ -97,6 +97,8 @@ public: DECLARE_MACHINE_RESET(ivg09); MC6845_UPDATE_ROW(crtc_update_row); + void ivg09(machine_config &config); + void cpu09(machine_config &config); private: uint8_t m_term_data; uint8_t m_pa; @@ -286,7 +288,7 @@ void tavernie_state::kbd_put(u8 data) m_pia_ivg->cb1_w(1); } -static MACHINE_CONFIG_START( cpu09 ) +MACHINE_CONFIG_START(tavernie_state::cpu09) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(cpu09_mem) @@ -327,7 +329,7 @@ static MACHINE_CONFIG_START( cpu09 ) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia", acia6850_device, write_rxc)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ivg09, cpu09 ) +MACHINE_CONFIG_DERIVED(tavernie_state::ivg09, cpu09) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(ivg09_mem) diff --git a/src/mame/drivers/taxidriv.cpp b/src/mame/drivers/taxidriv.cpp index eefc733634c..9d7b1387d1c 100644 --- a/src/mame/drivers/taxidriv.cpp +++ b/src/mame/drivers/taxidriv.cpp @@ -330,7 +330,7 @@ PALETTE_INIT_MEMBER(taxidriv_state, taxidriv) } } -static MACHINE_CONFIG_START( taxidriv ) +MACHINE_CONFIG_START(taxidriv_state::taxidriv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz ??? */ diff --git a/src/mame/drivers/tb303.cpp b/src/mame/drivers/tb303.cpp index 27826b6288d..9fe622af24f 100644 --- a/src/mame/drivers/tb303.cpp +++ b/src/mame/drivers/tb303.cpp @@ -45,6 +45,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(tp3_clear) { m_maincpu->set_input_line(0, CLEAR_LINE); } virtual void machine_start() override; + void tb303(machine_config &config); }; // TP2 to MCU CLK: LC circuit(TI S74230), stable sine wave, 2.2us interval @@ -246,7 +247,7 @@ void tb303_state::machine_start() save_item(NAME(m_ram_we)); } -static MACHINE_CONFIG_START( tb303 ) +MACHINE_CONFIG_START(tb303_state::tb303) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D650, TP2_HZ) diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp index bcaa3cf9a76..3d9afc4b2c9 100644 --- a/src/mame/drivers/tbowl.cpp +++ b/src/mame/drivers/tbowl.cpp @@ -427,7 +427,7 @@ void tbowl_state::machine_reset() m_soundlatch->acknowledge_w(machine().dummy_space(), 0, 0); } -static MACHINE_CONFIG_START( tbowl ) +MACHINE_CONFIG_START(tbowl_state::tbowl) /* CPU on Board '6206B' */ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */ diff --git a/src/mame/drivers/tceptor.cpp b/src/mame/drivers/tceptor.cpp index 0b03349fc0a..e4b073e9b9d 100644 --- a/src/mame/drivers/tceptor.cpp +++ b/src/mame/drivers/tceptor.cpp @@ -339,7 +339,7 @@ void tceptor_state::machine_reset() /*******************************************************************/ -static MACHINE_CONFIG_START( tceptor ) +MACHINE_CONFIG_START(tceptor_state::tceptor) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, XTAL_49_152MHz/32) diff --git a/src/mame/drivers/tcl.cpp b/src/mame/drivers/tcl.cpp index d0fed6c6e3a..715791302d5 100644 --- a/src/mame/drivers/tcl.cpp +++ b/src/mame/drivers/tcl.cpp @@ -59,6 +59,7 @@ public: virtual void video_start() override; uint32_t screen_update_tcl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void tcl(machine_config &config); }; @@ -111,7 +112,7 @@ static GFXDECODE_START( tcl ) GFXDECODE_ENTRY( "gfx2", 0, charlayout2, 128, 4 ) GFXDECODE_END -static MACHINE_CONFIG_START( tcl ) +MACHINE_CONFIG_START(tcl_state::tcl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/4) diff --git a/src/mame/drivers/tdv2324.cpp b/src/mame/drivers/tdv2324.cpp index ffbf4f5ca4c..366217a528d 100644 --- a/src/mame/drivers/tdv2324.cpp +++ b/src/mame/drivers/tdv2324.cpp @@ -257,7 +257,7 @@ SLOT_INTERFACE_END // MACHINE_CONFIG( tdv2324 ) //------------------------------------------------- -static MACHINE_CONFIG_START( tdv2324 ) +MACHINE_CONFIG_START(tdv2324_state::tdv2324) // basic system hardware MCFG_CPU_ADD(P8085AH_0_TAG, I8085A, 8700000/2) // ??? MCFG_CPU_PROGRAM_MAP(tdv2324_mem) diff --git a/src/mame/drivers/tec1.cpp b/src/mame/drivers/tec1.cpp index 2a914bd4f1d..90dfb58054f 100644 --- a/src/mame/drivers/tec1.cpp +++ b/src/mame/drivers/tec1.cpp @@ -123,6 +123,8 @@ public: virtual void machine_reset() override; virtual void machine_start() override; TIMER_CALLBACK_MEMBER(tec1_kbd_callback); + void tec1(machine_config &config); + void tecjmon(machine_config &config); }; @@ -402,7 +404,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( tec1 ) +MACHINE_CONFIG_START(tec1_state::tec1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 1000000) /* speed can be varied between 250kHz and 2MHz */ MCFG_CPU_PROGRAM_MAP(tec1_map) @@ -417,7 +419,7 @@ static MACHINE_CONFIG_START( tec1 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tecjmon ) +MACHINE_CONFIG_START(tec1_state::tecjmon) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz / 2) MCFG_CPU_PROGRAM_MAP(tecjmon_map) diff --git a/src/mame/drivers/techno.cpp b/src/mame/drivers/techno.cpp index e2b245a6cfd..a16b5d27bf6 100644 --- a/src/mame/drivers/techno.cpp +++ b/src/mame/drivers/techno.cpp @@ -47,6 +47,7 @@ public: DECLARE_WRITE16_MEMBER(sol2_w); DECLARE_WRITE16_MEMBER(sound_w); + void techno(machine_config &config); private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void machine_start() override; @@ -276,7 +277,7 @@ void techno_state::machine_reset() m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE); } -static MACHINE_CONFIG_START( techno ) +MACHINE_CONFIG_START(techno_state::techno) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(techno_map) diff --git a/src/mame/drivers/tecmo.cpp b/src/mame/drivers/tecmo.cpp index 58dbcb816ed..f6afe8122f7 100644 --- a/src/mame/drivers/tecmo.cpp +++ b/src/mame/drivers/tecmo.cpp @@ -623,7 +623,7 @@ void tecmo_state::machine_reset() m_adpcm_data = -1; } -static MACHINE_CONFIG_START( rygar ) +MACHINE_CONFIG_START(tecmo_state::rygar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */ @@ -666,7 +666,7 @@ static MACHINE_CONFIG_START( rygar ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gemini, rygar ) +MACHINE_CONFIG_DERIVED(tecmo_state::gemini, rygar) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -682,13 +682,13 @@ static MACHINE_CONFIG_DERIVED( gemini, rygar ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( geminib, gemini) +MACHINE_CONFIG_DERIVED(tecmo_state::geminib, gemini) // 24.18 MHz OSC / 59.62 Hz, bootleg only? MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_RAW_PARAMS(24180000/4, 384,0,256,264,16,240) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( silkworm, gemini ) +MACHINE_CONFIG_DERIVED(tecmo_state::silkworm, gemini) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -696,7 +696,7 @@ static MACHINE_CONFIG_DERIVED( silkworm, gemini ) MCFG_CPU_PROGRAM_MAP(silkworm_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( backfirt, gemini ) +MACHINE_CONFIG_DERIVED(tecmo_state::backfirt, gemini) /* this pcb has no MSM5205 */ MCFG_DEVICE_REMOVE("msm") diff --git a/src/mame/drivers/tecmo16.cpp b/src/mame/drivers/tecmo16.cpp index a18a336dd4e..af18d3efbb2 100644 --- a/src/mame/drivers/tecmo16.cpp +++ b/src/mame/drivers/tecmo16.cpp @@ -359,7 +359,7 @@ GFXDECODE_END #define MASTER_CLOCK XTAL_24MHz #define OKI_CLOCK XTAL_8MHz -static MACHINE_CONFIG_START( fstarfrc ) +MACHINE_CONFIG_START(tecmo16_state::fstarfrc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,MASTER_CLOCK/2) /* 12MHz */ @@ -410,7 +410,7 @@ static MACHINE_CONFIG_START( fstarfrc ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ginkun, fstarfrc ) +MACHINE_CONFIG_DERIVED(tecmo16_state::ginkun, fstarfrc) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(ginkun_map) @@ -418,7 +418,7 @@ static MACHINE_CONFIG_DERIVED( ginkun, fstarfrc ) MCFG_VIDEO_START_OVERRIDE(tecmo16_state,ginkun) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( riot, ginkun ) +MACHINE_CONFIG_DERIVED(tecmo16_state::riot, ginkun) /* basic machine hardware */ MCFG_VIDEO_START_OVERRIDE(tecmo16_state,riot) diff --git a/src/mame/drivers/tecmosys.cpp b/src/mame/drivers/tecmosys.cpp index 8f08d171c3d..bb64d722652 100644 --- a/src/mame/drivers/tecmosys.cpp +++ b/src/mame/drivers/tecmosys.cpp @@ -432,7 +432,7 @@ void tecmosys_state::machine_start() save_item(NAME(m_device_value)); } -static MACHINE_CONFIG_START( deroon ) +MACHINE_CONFIG_START(tecmosys_state::deroon) MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", tecmosys_state, irq1_line_hold) diff --git a/src/mame/drivers/tecnbras.cpp b/src/mame/drivers/tecnbras.cpp index 9a4a2f10b05..422dc071ec3 100644 --- a/src/mame/drivers/tecnbras.cpp +++ b/src/mame/drivers/tecnbras.cpp @@ -37,6 +37,7 @@ public: // DECLARE_WRITE8_MEMBER(tecnbras_io_w); // DECLARE_READ8_MEMBER(tecnbras_io_r); DECLARE_DRIVER_INIT(tecnbras); +void tecnbras(machine_config &config); private: int m_xcoord; char m_digit[14][7]; @@ -99,7 +100,7 @@ void tecnbras_state::machine_reset() { } -static MACHINE_CONFIG_START( tecnbras ) +MACHINE_CONFIG_START(tecnbras_state::tecnbras) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C31, XTAL_12MHz) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(i80c31_prg) diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp index 1eb45be9492..fdcb74f0b3b 100644 --- a/src/mame/drivers/tehkanwc.cpp +++ b/src/mame/drivers/tehkanwc.cpp @@ -659,7 +659,7 @@ static GFXDECODE_START( tehkanwc ) GFXDECODE_END -static MACHINE_CONFIG_START( tehkanwc ) +MACHINE_CONFIG_START(tehkanwc_state::tehkanwc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 18432000/4) /* 18.432000 / 4 */ @@ -715,7 +715,7 @@ static MACHINE_CONFIG_START( tehkanwc ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(tehkanwcb, tehkanwc) +MACHINE_CONFIG_DERIVED(tehkanwc_state::tehkanwcb, tehkanwc) MCFG_SOUND_REPLACE("ay1", AY8910, 18432000/12) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(tehkanwc_state, portA_w)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(tehkanwc_state, portB_w)) diff --git a/src/mame/drivers/tek405x.cpp b/src/mame/drivers/tek405x.cpp index fe57f3dfdcc..13af7ddd4ec 100644 --- a/src/mame/drivers/tek405x.cpp +++ b/src/mame/drivers/tek405x.cpp @@ -996,7 +996,7 @@ void tek4052_state::machine_start() // MACHINE_CONFIG( tek4051 ) //------------------------------------------------- -static MACHINE_CONFIG_START( tek4051 ) +MACHINE_CONFIG_START(tek4051_state::tek4051) // basic machine hardware MCFG_CPU_ADD(MC6800_TAG, M6800, XTAL_12_5MHz/15) MCFG_CPU_PROGRAM_MAP(tek4051_mem) @@ -1103,7 +1103,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( tek4052 ) //------------------------------------------------- -static MACHINE_CONFIG_START( tek4052 ) +MACHINE_CONFIG_START(tek4052_state::tek4052) // basic machine hardware MCFG_CPU_ADD(AM2901A_TAG, M6800, 1000000) // should be 4x AM2901A + AM2911 MCFG_CPU_PROGRAM_MAP(tek4052_mem) @@ -1142,7 +1142,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( tek4054 ) //------------------------------------------------- /* -static MACHINE_CONFIG_START( tek4054 ) +MACHINE_CONFIG_START(tek4054_state::tek4054) MCFG_SCREEN_SIZE(4096, 3125) MCFG_SCREEN_VISIBLE_AREA(0, 4096-1, 0, 3125-1) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tek410x.cpp b/src/mame/drivers/tek410x.cpp index ce7e68ae312..76fe13502e9 100644 --- a/src/mame/drivers/tek410x.cpp +++ b/src/mame/drivers/tek410x.cpp @@ -35,6 +35,8 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void tek4109a(machine_config &config); + void tek4107a(machine_config &config); }; /* Memory Maps */ @@ -86,7 +88,7 @@ void tek4107a_state::machine_start() /* Machine Driver */ -static MACHINE_CONFIG_START( tek4107a ) +MACHINE_CONFIG_START(tek4107a_state::tek4107a) /* basic machine hardware */ MCFG_CPU_ADD(I80188_TAG, I80188, 21000000) MCFG_CPU_PROGRAM_MAP(tek4107a_mem) @@ -104,7 +106,7 @@ static MACHINE_CONFIG_START( tek4107a ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", tek4107a) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tek4109a, tek4107a ) +MACHINE_CONFIG_DERIVED(tek4107a_state::tek4109a, tek4107a) /* video hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(4096) diff --git a/src/mame/drivers/tek440x.cpp b/src/mame/drivers/tek440x.cpp index babe0752852..90ad3c42a8a 100644 --- a/src/mame/drivers/tek440x.cpp +++ b/src/mame/drivers/tek440x.cpp @@ -73,6 +73,7 @@ public: required_device m_fdccpu; required_shared_ptr m_mainram; required_shared_ptr m_vram; + void tek4404(machine_config &config); }; /************************************* @@ -185,7 +186,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( tek4404 ) +MACHINE_CONFIG_START(tek440x_state::tek4404) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, XTAL_40MHz / 4) // MC68010L10 diff --git a/src/mame/drivers/tekxp33x.cpp b/src/mame/drivers/tekxp33x.cpp index 1ee06d723c3..23a14b46f5e 100644 --- a/src/mame/drivers/tekxp33x.cpp +++ b/src/mame/drivers/tekxp33x.cpp @@ -53,6 +53,7 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void tekxp330(machine_config &config); }; /* Memory Maps */ @@ -89,7 +90,7 @@ void tekxp330_state::machine_start() /* Machine Driver */ -static MACHINE_CONFIG_START( tekxp330 ) +MACHINE_CONFIG_START(tekxp330_state::tekxp330) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R3052, XTAL_20MHz) /* IDT 79R3052E, clock unknown */ MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG) diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp index 2e976721b74..d19c24c1a47 100644 --- a/src/mame/drivers/tempest.cpp +++ b/src/mame/drivers/tempest.cpp @@ -339,6 +339,7 @@ public: DECLARE_READ8_MEMBER(rom_ae1f_r); virtual void machine_start() override; + void tempest(machine_config &config); }; @@ -589,7 +590,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( tempest ) +MACHINE_CONFIG_START(tempest_state::tempest) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8) diff --git a/src/mame/drivers/terak.cpp b/src/mame/drivers/terak.cpp index f74fe30e878..bc58c7e28c9 100644 --- a/src/mame/drivers/terak.cpp +++ b/src/mame/drivers/terak.cpp @@ -30,6 +30,7 @@ public: DECLARE_WRITE16_MEMBER(terak_fdc_data_w); uint32_t screen_update_terak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void terak(machine_config &config); private: uint8_t m_unit; uint8_t m_cmd; @@ -96,7 +97,7 @@ uint32_t terak_state::screen_update_terak(screen_device &screen, bitmap_ind16 &b } -static MACHINE_CONFIG_START( terak ) +MACHINE_CONFIG_START(terak_state::terak) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",T11, XTAL_4MHz) MCFG_T11_INITIAL_MODE(6 << 13) diff --git a/src/mame/drivers/terco.cpp b/src/mame/drivers/terco.cpp index 4bc0bbb4187..68ee3c690ce 100644 --- a/src/mame/drivers/terco.cpp +++ b/src/mame/drivers/terco.cpp @@ -265,6 +265,7 @@ public: //,m_brg(*this, "brg") //,m_ay3600(*this, "ay3600") { } + void t4490(machine_config &config); private: required_device m_maincpu; // virtual void machine_reset() override { m_maincpu->reset(); LOG("--->%s()\n", FUNCNAME); }; @@ -290,7 +291,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( t4490 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( t4490 ) +MACHINE_CONFIG_START(t4490_state::t4490) MCFG_CPU_ADD("maincpu", M6800, XTAL_8MHz/4) // divided by a MC6875 MCFG_CPU_PROGRAM_MAP(t4490_map) diff --git a/src/mame/drivers/terminals.cpp b/src/mame/drivers/terminals.cpp index 4cba6a08fcc..7e1af667bbe 100644 --- a/src/mame/drivers/terminals.cpp +++ b/src/mame/drivers/terminals.cpp @@ -20,6 +20,7 @@ public: //, m_p_chargen(*this, "chargen") { } + void terminals(machine_config &config); private: required_device m_maincpu; //required_region_ptr m_p_chargen; @@ -31,7 +32,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( terminals ) INPUT_PORTS_END -static MACHINE_CONFIG_START( terminals ) +MACHINE_CONFIG_START(terminals_state::terminals) MCFG_CPU_ADD("maincpu", Z80, 2'000'000) MCFG_CPU_PROGRAM_MAP(mem_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/terracre.cpp b/src/mame/drivers/terracre.cpp index 2cfdede4314..96cf5e64d50 100644 --- a/src/mame/drivers/terracre.cpp +++ b/src/mame/drivers/terracre.cpp @@ -573,7 +573,7 @@ static GFXDECODE_START( terracre ) GFXDECODE_END -static MACHINE_CONFIG_START( ym3526 ) +MACHINE_CONFIG_START(terracre_state::ym3526) MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz MCFG_CPU_PROGRAM_MAP(terracre_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", terracre_state, irq1_line_hold) @@ -613,7 +613,7 @@ static MACHINE_CONFIG_START( ym3526 ) MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ym2203, ym3526 ) +MACHINE_CONFIG_DERIVED(terracre_state::ym2203, ym3526) MCFG_CPU_MODIFY("audiocpu") MCFG_CPU_IO_MAP(sound_2203_io_map) @@ -626,14 +626,14 @@ static MACHINE_CONFIG_DERIVED( ym2203, ym3526 ) MCFG_SOUND_ROUTE(3, "speaker", 0.4) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( amazon_base, ym3526 ) +MACHINE_CONFIG_DERIVED(terracre_state::amazon_base, ym3526) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(amazon_base_map) MCFG_MACHINE_START_OVERRIDE(terracre_state,amazon) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( amazon_1412m2, amazon_base ) +MACHINE_CONFIG_DERIVED(terracre_state::amazon_1412m2, amazon_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(amazon_1412m2_map) diff --git a/src/mame/drivers/test_t400.cpp b/src/mame/drivers/test_t400.cpp index b483bb9d779..d0fac258f5f 100644 --- a/src/mame/drivers/test_t400.cpp +++ b/src/mame/drivers/test_t400.cpp @@ -20,6 +20,8 @@ public: DECLARE_WRITE8_MEMBER( port_l_w ); required_device m_maincpu; + void test_t410(machine_config &config); + void test_t420(machine_config &config); }; WRITE8_MEMBER( t400_test_suite_state::port_l_w ) @@ -27,13 +29,13 @@ WRITE8_MEMBER( t400_test_suite_state::port_l_w ) // printf("L: %u\n", data); } -static MACHINE_CONFIG_START( test_t410 ) +MACHINE_CONFIG_START(t400_test_suite_state::test_t410) MCFG_CPU_ADD("maincpu", COP410, 1000000) MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false ) MCFG_COP400_WRITE_L_CB(WRITE8(t400_test_suite_state, port_l_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( test_t420 ) +MACHINE_CONFIG_START(t400_test_suite_state::test_t420) MCFG_CPU_ADD("maincpu", COP420, 1000000) MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, true ) MCFG_COP400_WRITE_L_CB(WRITE8(t400_test_suite_state, port_l_w)) diff --git a/src/mame/drivers/testconsole.cpp b/src/mame/drivers/testconsole.cpp index a9aede76b62..050bf4551cb 100644 --- a/src/mame/drivers/testconsole.cpp +++ b/src/mame/drivers/testconsole.cpp @@ -88,6 +88,7 @@ public: output().set_digit_value((Dsp << 2) | offset, data); } + void whousetc(machine_config &config); protected: virtual void machine_reset() override { @@ -165,7 +166,7 @@ INPUT_PORTS_START(whousetc) INPUT_PORTS_END -MACHINE_CONFIG_START(whousetc) +MACHINE_CONFIG_START(whouse_testcons_state::whousetc) MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz) MCFG_CPU_PROGRAM_MAP(program_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp index c4e0de7f3da..bb696a03d7b 100644 --- a/src/mame/drivers/tetrisp2.cpp +++ b/src/mame/drivers/tetrisp2.cpp @@ -1329,7 +1329,7 @@ DRIVER_INIT_MEMBER(stepstag_state,stepstag) } -static MACHINE_CONFIG_START( tetrisp2 ) +MACHINE_CONFIG_START(tetrisp2_state::tetrisp2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) @@ -1364,7 +1364,7 @@ static MACHINE_CONFIG_START( tetrisp2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( nndmseal ) +MACHINE_CONFIG_START(tetrisp2_state::nndmseal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) @@ -1397,7 +1397,7 @@ static MACHINE_CONFIG_START( nndmseal ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rockn ) +MACHINE_CONFIG_START(tetrisp2_state::rockn) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) @@ -1431,7 +1431,7 @@ static MACHINE_CONFIG_START( rockn ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rockn2 ) +MACHINE_CONFIG_START(tetrisp2_state::rockn2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) @@ -1465,7 +1465,7 @@ static MACHINE_CONFIG_START( rockn2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rocknms ) +MACHINE_CONFIG_START(tetrisp2_state::rocknms) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) @@ -1515,7 +1515,7 @@ static MACHINE_CONFIG_START( rocknms ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( stepstag ) +MACHINE_CONFIG_START(stepstag_state::stepstag) MCFG_CPU_ADD("maincpu", M68000, 16000000 ) //?? MCFG_CPU_PROGRAM_MAP(stepstag_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", tetrisp2_state, irq2_line_hold) // lev 4 triggered by system timer diff --git a/src/mame/drivers/tg100.cpp b/src/mame/drivers/tg100.cpp index 24629919d90..88187e1b2a5 100644 --- a/src/mame/drivers/tg100.cpp +++ b/src/mame/drivers/tg100.cpp @@ -45,6 +45,7 @@ public: required_device m_maincpu; required_device m_ymw258; + void tg100(machine_config &config); }; /* all memory accesses are decoded by the gate array... */ @@ -64,7 +65,7 @@ static ADDRESS_MAP_START( ymw258_map, 0, 8, tg100_state ) AM_RANGE(0x000000, 0x1fffff) AM_ROM ADDRESS_MAP_END -static MACHINE_CONFIG_START( tg100 ) +MACHINE_CONFIG_START(tg100_state::tg100) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H83002, XTAL_20MHz) /* TODO: correct CPU type (H8/520) */ MCFG_CPU_PROGRAM_MAP( tg100_map ) diff --git a/src/mame/drivers/tgtpanic.cpp b/src/mame/drivers/tgtpanic.cpp index d019ab9418f..4eabed38aca 100644 --- a/src/mame/drivers/tgtpanic.cpp +++ b/src/mame/drivers/tgtpanic.cpp @@ -37,6 +37,7 @@ public: virtual void machine_start() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void tgtpanic(machine_config &config); }; @@ -146,7 +147,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( tgtpanic ) +MACHINE_CONFIG_START(tgtpanic_state::tgtpanic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp index 01e92543351..95d96c30132 100644 --- a/src/mame/drivers/thayers.cpp +++ b/src/mame/drivers/thayers.cpp @@ -104,6 +104,7 @@ public: required_device m_maincpu; required_ioport_array<10> m_row; + void thayers(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -786,7 +787,7 @@ void thayers_state::machine_reset() /* Machine Driver */ -static MACHINE_CONFIG_START( thayers ) +MACHINE_CONFIG_START(thayers_state::thayers) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp index fa3d5fcbdef..54a18b9be07 100644 --- a/src/mame/drivers/thedealr.cpp +++ b/src/mame/drivers/thedealr.cpp @@ -76,6 +76,7 @@ public: DECLARE_PALETTE_INIT(thedealr); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void thedealr(machine_config &config); }; /*************************************************************************** @@ -524,7 +525,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(thedealr_state::thedealr_interrupt) m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); } -static MACHINE_CONFIG_START( thedealr ) +MACHINE_CONFIG_START(thedealr_state::thedealr) // basic machine hardware MCFG_CPU_ADD("maincpu", R65C02, XTAL_16MHz/8) // 2 MHz? diff --git a/src/mame/drivers/thedeep.cpp b/src/mame/drivers/thedeep.cpp index f4464512c97..7fbcc37763d 100644 --- a/src/mame/drivers/thedeep.cpp +++ b/src/mame/drivers/thedeep.cpp @@ -404,7 +404,7 @@ INTERRUPT_GEN_MEMBER(thedeep_state::mcu_irq) m_mcu->set_input_line(MCS51_INT1_LINE, ASSERT_LINE); } -static MACHINE_CONFIG_START( thedeep ) +MACHINE_CONFIG_START(thedeep_state::thedeep) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */ diff --git a/src/mame/drivers/thepit.cpp b/src/mame/drivers/thepit.cpp index 2c07a580993..d42ba192576 100644 --- a/src/mame/drivers/thepit.cpp +++ b/src/mame/drivers/thepit.cpp @@ -711,7 +711,7 @@ INTERRUPT_GEN_MEMBER(thepit_state::vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -static MACHINE_CONFIG_START( thepit ) +MACHINE_CONFIG_START(thepit_state::thepit) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */ @@ -755,12 +755,12 @@ static MACHINE_CONFIG_START( thepit ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fitter, thepit ) +MACHINE_CONFIG_DERIVED(thepit_state::fitter, thepit) MCFG_DEVICE_MODIFY("mainlatch") // IC42 MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(thepit_state, coin_lockout_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( desertdn, fitter ) +MACHINE_CONFIG_DERIVED(thepit_state::desertdn, fitter) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -773,7 +773,7 @@ static MACHINE_CONFIG_DERIVED( desertdn, fitter ) MCFG_GFXDECODE_MODIFY("gfxdecode", intrepid) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( intrepid, fitter ) +MACHINE_CONFIG_DERIVED(thepit_state::intrepid, fitter) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -787,7 +787,7 @@ static MACHINE_CONFIG_DERIVED( intrepid, fitter ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( suprmous, intrepid ) +MACHINE_CONFIG_DERIVED(thepit_state::suprmous, intrepid) /* basic machine hardware */ diff --git a/src/mame/drivers/thief.cpp b/src/mame/drivers/thief.cpp index 788330d5704..d28c33960e6 100644 --- a/src/mame/drivers/thief.cpp +++ b/src/mame/drivers/thief.cpp @@ -390,7 +390,7 @@ static const char *const natodef_sample_names[] = }; -static MACHINE_CONFIG_START( thief ) +MACHINE_CONFIG_START(thief_state::thief) MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(thief_main_map) MCFG_CPU_IO_MAP(io_map) @@ -427,7 +427,7 @@ static MACHINE_CONFIG_START( thief ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sharkatt, thief ) +MACHINE_CONFIG_DERIVED(thief_state::sharkatt, thief) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sharkatt_main_map) @@ -438,7 +438,7 @@ static MACHINE_CONFIG_DERIVED( sharkatt, thief ) MCFG_SAMPLES_NAMES(sharkatt_sample_names) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( natodef, thief ) +MACHINE_CONFIG_DERIVED(thief_state::natodef, thief) MCFG_DEVICE_MODIFY("samples") MCFG_SAMPLES_NAMES(natodef_sample_names) MACHINE_CONFIG_END diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp index 3195b00baff..07f5a71f5c2 100644 --- a/src/mame/drivers/thomson.cpp +++ b/src/mame/drivers/thomson.cpp @@ -617,7 +617,7 @@ SLOT_INTERFACE_END /* ------------ driver ------------ */ -static MACHINE_CONFIG_START( to7 ) +MACHINE_CONFIG_START(thomson_state::to7) MCFG_MACHINE_START_OVERRIDE( thomson_state, to7 ) MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to7 ) @@ -761,7 +761,7 @@ static MACHINE_CONFIG_START( to7 ) MCFG_SOFTWARE_LIST_ADD("to7_qd_list","to7_qd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( t9000, to7 ) +MACHINE_CONFIG_DERIVED(thomson_state::t9000, to7) MACHINE_CONFIG_END @@ -923,7 +923,7 @@ INPUT_PORTS_END /* ------------ driver ------------ */ -static MACHINE_CONFIG_DERIVED( to770, to7 ) +MACHINE_CONFIG_DERIVED(thomson_state::to770, to7) MCFG_MACHINE_START_OVERRIDE( thomson_state, to770 ) MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to770 ) @@ -949,7 +949,7 @@ static MACHINE_CONFIG_DERIVED( to770, to7 ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("to7_cart_list","to7_cart") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( to770a, to770 ) +MACHINE_CONFIG_DERIVED(thomson_state::to770a, to770) MCFG_DEVICE_REMOVE("t770_cart_list") MCFG_SOFTWARE_LIST_ADD("t770a_cart_list","to770a_cart") MACHINE_CONFIG_END @@ -1113,7 +1113,7 @@ INPUT_PORTS_END /* ------------ driver ------------ */ -static MACHINE_CONFIG_DERIVED( mo5, to7 ) +MACHINE_CONFIG_DERIVED(thomson_state::mo5, to7) MCFG_MACHINE_START_OVERRIDE( thomson_state, mo5 ) MCFG_MACHINE_RESET_OVERRIDE( thomson_state, mo5 ) @@ -1158,7 +1158,7 @@ static MACHINE_CONFIG_DERIVED( mo5, to7 ) MCFG_RAM_DEFAULT_SIZE("112K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mo5e, mo5 ) +MACHINE_CONFIG_DERIVED(thomson_state::mo5e, mo5) MACHINE_CONFIG_END @@ -1473,7 +1473,7 @@ INPUT_PORTS_END /* ------------ driver ------------ */ -static MACHINE_CONFIG_DERIVED( to9, to7 ) +MACHINE_CONFIG_DERIVED(thomson_state::to9, to7) MCFG_MACHINE_START_OVERRIDE( thomson_state, to9 ) MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to9 ) @@ -1695,7 +1695,7 @@ INPUT_PORTS_END /* ------------ driver ------------ */ -static MACHINE_CONFIG_DERIVED( to8, to7 ) +MACHINE_CONFIG_DERIVED(thomson_state::to8, to7) MCFG_MACHINE_START_OVERRIDE( thomson_state, to8 ) MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to8 ) @@ -1732,7 +1732,7 @@ static MACHINE_CONFIG_DERIVED( to8, to7 ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("to7_qd_list", "to7_qd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( to8d, to8 ) +MACHINE_CONFIG_DERIVED(thomson_state::to8d, to8) MACHINE_CONFIG_END @@ -1858,7 +1858,7 @@ INPUT_PORTS_END /* ------------ driver ------------ */ -static MACHINE_CONFIG_DERIVED( to9p, to7 ) +MACHINE_CONFIG_DERIVED(thomson_state::to9p, to7) MCFG_MACHINE_START_OVERRIDE( thomson_state, to9p ) MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to9p ) @@ -2207,7 +2207,7 @@ INPUT_PORTS_END /* ------------ driver ------------ */ -static MACHINE_CONFIG_DERIVED( mo6, to7 ) +MACHINE_CONFIG_DERIVED(thomson_state::mo6, to7) MCFG_MACHINE_START_OVERRIDE( thomson_state, mo6 ) MCFG_MACHINE_RESET_OVERRIDE( thomson_state, mo6 ) @@ -2261,7 +2261,7 @@ static MACHINE_CONFIG_DERIVED( mo6, to7 ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("mo5_qd_list","mo5_qd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pro128, mo6 ) +MACHINE_CONFIG_DERIVED(thomson_state::pro128, mo6) MCFG_DEVICE_REMOVE("mo6_cass_list") MCFG_DEVICE_REMOVE("mo6_flop_list") @@ -2476,7 +2476,7 @@ INPUT_PORTS_END /* ------------ driver ------------ */ -static MACHINE_CONFIG_DERIVED( mo5nr, to7 ) +MACHINE_CONFIG_DERIVED(thomson_state::mo5nr, to7) MCFG_MACHINE_START_OVERRIDE( thomson_state, mo5nr ) MCFG_MACHINE_RESET_OVERRIDE( thomson_state, mo5nr ) diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp index ab04ab8d251..69268280dbd 100644 --- a/src/mame/drivers/thoop2.cpp +++ b/src/mame/drivers/thoop2.cpp @@ -259,7 +259,7 @@ static GFXDECODE_START( thoop2 ) GFXDECODE_END -static MACHINE_CONFIG_START( thoop2 ) +MACHINE_CONFIG_START(thoop2_state::thoop2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,XTAL_24MHz / 2) // 12MHz verified diff --git a/src/mame/drivers/thunderj.cpp b/src/mame/drivers/thunderj.cpp index af5da94b790..d6e223d1c7e 100644 --- a/src/mame/drivers/thunderj.cpp +++ b/src/mame/drivers/thunderj.cpp @@ -247,7 +247,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( thunderj ) +MACHINE_CONFIG_START(thunderj_state::thunderj) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) diff --git a/src/mame/drivers/thunderx.cpp b/src/mame/drivers/thunderx.cpp index 6aa34d5a220..a72990ba618 100644 --- a/src/mame/drivers/thunderx.cpp +++ b/src/mame/drivers/thunderx.cpp @@ -630,7 +630,7 @@ void thunderx_state::machine_reset() m_priority = 0; } -static MACHINE_CONFIG_START( scontra ) +MACHINE_CONFIG_START(thunderx_state::scontra) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 (verified on pcb) */ @@ -693,7 +693,7 @@ WRITE8_MEMBER( thunderx_state::banking_callback ) m_rombank->set_entry(data & 0x0f); } -static MACHINE_CONFIG_DERIVED( thunderx, scontra ) +MACHINE_CONFIG_DERIVED(thunderx_state::thunderx, scontra) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") /* 052001 (verified on pcb) */ @@ -710,7 +710,7 @@ static MACHINE_CONFIG_DERIVED( thunderx, scontra ) MCFG_DEVICE_REMOVE("k007232") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gbusters, scontra ) +MACHINE_CONFIG_DERIVED(thunderx_state::gbusters, scontra) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") /* 052526 */ diff --git a/src/mame/drivers/ti630.cpp b/src/mame/drivers/ti630.cpp index 38b62ce822f..09ba74f4fb7 100644 --- a/src/mame/drivers/ti630.cpp +++ b/src/mame/drivers/ti630.cpp @@ -54,6 +54,7 @@ public: DECLARE_READ8_MEMBER(ti630_io_r); DECLARE_DRIVER_INIT(ti630); DECLARE_PALETTE_INIT(ti630); + void ti630(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -181,7 +182,7 @@ static GFXDECODE_START( ti630 ) GFXDECODE_ENTRY( "hd44780:cgrom", 0x0000, ti630_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( ti630 ) +MACHINE_CONFIG_START(ti630_state::ti630) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C31, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP(i80c31_prg) diff --git a/src/mame/drivers/ti74.cpp b/src/mame/drivers/ti74.cpp index 23fa326b0ea..241c6b8f34d 100644 --- a/src/mame/drivers/ti74.cpp +++ b/src/mame/drivers/ti74.cpp @@ -115,6 +115,8 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(ti74_cartridge); HD44780_PIXEL_UPDATE(ti74_pixel_update); HD44780_PIXEL_UPDATE(ti95_pixel_update); + void ti74(machine_config &config); + void ti95(machine_config &config); }; @@ -503,7 +505,7 @@ void ti74_state::machine_start() save_item(NAME(m_power)); } -static MACHINE_CONFIG_START( ti74 ) +MACHINE_CONFIG_START(ti74_state::ti74) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS70C46, XTAL_4MHz) @@ -539,7 +541,7 @@ static MACHINE_CONFIG_START( ti74 ) MCFG_SOFTWARE_LIST_ADD("cart_list", "ti74_cart") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ti95 ) +MACHINE_CONFIG_START(ti74_state::ti95) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS70C46, XTAL_4MHz) diff --git a/src/mame/drivers/ti85.cpp b/src/mame/drivers/ti85.cpp index 1e7c2164963..24b75b188df 100644 --- a/src/mame/drivers/ti85.cpp +++ b/src/mame/drivers/ti85.cpp @@ -564,7 +564,7 @@ static INPUT_PORTS_START (ti83) INPUT_PORTS_END /* machine definition */ -static MACHINE_CONFIG_START( ti81 ) +MACHINE_CONFIG_START(ti85_state::ti81) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz */ MCFG_CPU_PROGRAM_MAP(ti81_mem) @@ -587,7 +587,7 @@ static MACHINE_CONFIG_START( ti81 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti85, ti81 ) +MACHINE_CONFIG_DERIVED(ti85_state::ti85, ti81) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(6000000) /* 6 MHz */ MCFG_CPU_IO_MAP(ti85_io) @@ -602,13 +602,13 @@ static MACHINE_CONFIG_DERIVED( ti85, ti81 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti85d, ti85 ) +MACHINE_CONFIG_DERIVED(ti85_state::ti85d, ti85) MCFG_SNAPSHOT_ADD("snapshot", ti85_state, ti8x, "sav", 0) //MCFG_TI85SERIAL_ADD( "tiserial" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti82, ti81 ) +MACHINE_CONFIG_DERIVED(ti85_state::ti82, ti81) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(6000000) /* 6 MHz */ MCFG_CPU_IO_MAP(ti82_io) @@ -628,14 +628,14 @@ static MACHINE_CONFIG_DERIVED( ti82, ti81 ) MCFG_TI8X_LINK_PORT_ADD("linkport", default_ti8x_link_devices, nullptr) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti81v2, ti82 ) +MACHINE_CONFIG_DERIVED(ti85_state::ti81v2, ti82) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(ti81v2_io) MCFG_DEVICE_REMOVE("linkport") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti83, ti81 ) +MACHINE_CONFIG_DERIVED(ti85_state::ti83, ti81) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(6000000) /* 6 MHz */ MCFG_CPU_IO_MAP(ti83_io) @@ -653,7 +653,7 @@ static MACHINE_CONFIG_DERIVED( ti83, ti81 ) MCFG_T6A04_SIZE(96, 64) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti86, ti85 ) +MACHINE_CONFIG_DERIVED(ti85_state::ti86, ti85) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(ti86_mem) MCFG_CPU_IO_MAP(ti86_io) @@ -664,7 +664,7 @@ static MACHINE_CONFIG_DERIVED( ti86, ti85 ) MCFG_SNAPSHOT_ADD("snapshot", ti85_state, ti8x, "sav", 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti83p, ti81 ) +MACHINE_CONFIG_DERIVED(ti85_state::ti83p, ti81) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(6000000) /* 8 MHz running at 6 MHz */ MCFG_CPU_PROGRAM_MAP(ti83p_asic_mem) @@ -712,7 +712,7 @@ static MACHINE_CONFIG_DERIVED( ti83p, ti81 ) MCFG_AMD_29F400T_ADD("flash") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti83pse, ti83p ) +MACHINE_CONFIG_DERIVED(ti85_state::ti83pse, ti83p) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK( 15000000) MCFG_CPU_IO_MAP(ti83pse_io) @@ -733,7 +733,7 @@ static MACHINE_CONFIG_DERIVED( ti83pse, ti83p ) MCFG_DEVICE_REPLACE("flash", FUJITSU_29F160T, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti84p, ti83pse ) +MACHINE_CONFIG_DERIVED(ti85_state::ti84p, ti83pse) MCFG_DEVICE_MODIFY("membank1") MCFG_DEVICE_PROGRAM_MAP(ti84p_banked_mem) @@ -750,11 +750,11 @@ static MACHINE_CONFIG_DERIVED( ti84p, ti83pse ) MCFG_DEVICE_REPLACE("flash", AMD_29F800T , 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti84pse, ti83pse ) +MACHINE_CONFIG_DERIVED(ti85_state::ti84pse, ti83pse) MCFG_MACHINE_START_OVERRIDE(ti85_state, ti84pse ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti73, ti83p ) +MACHINE_CONFIG_DERIVED(ti85_state::ti73, ti83p) MCFG_DEVICE_REMOVE("linkport") //MCFG_TI73SERIAL_ADD( "tiserial" ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ti89.cpp b/src/mame/drivers/ti89.cpp index eefc6ed205a..898bc224869 100644 --- a/src/mame/drivers/ti89.cpp +++ b/src/mame/drivers/ti89.cpp @@ -515,7 +515,7 @@ PALETTE_INIT_MEMBER(ti68k_state, ti68k) palette.set_pen_color(1, rgb_t(92, 83, 88)); } -static MACHINE_CONFIG_START( ti89 ) +MACHINE_CONFIG_START(ti68k_state::ti89) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP(ti89_mem) @@ -541,7 +541,7 @@ static MACHINE_CONFIG_START( ti89 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti92, ti89 ) +MACHINE_CONFIG_DERIVED(ti68k_state::ti92, ti89) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(ti92_mem) @@ -551,19 +551,19 @@ static MACHINE_CONFIG_DERIVED( ti92, ti89 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti92p, ti92 ) +MACHINE_CONFIG_DERIVED(ti68k_state::ti92p, ti92) MCFG_CPU_REPLACE("maincpu", M68000, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(ti92p_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( v200, ti92 ) +MACHINE_CONFIG_DERIVED(ti68k_state::v200, ti92) MCFG_CPU_REPLACE("maincpu", M68000, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(v200_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti89t, ti89 ) +MACHINE_CONFIG_DERIVED(ti68k_state::ti89t, ti89) MCFG_CPU_REPLACE("maincpu", M68000, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(ti89t_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ti990_10.cpp b/src/mame/drivers/ti990_10.cpp index 4cd15ee8990..296ae0d75dd 100644 --- a/src/mame/drivers/ti990_10.cpp +++ b/src/mame/drivers/ti990_10.cpp @@ -106,6 +106,7 @@ public: required_device m_maincpu; uint16_t m_intlines; int m_ckon_state; + void ti990_10(machine_config &config); }; @@ -311,7 +312,7 @@ WRITE_LINE_MEMBER(ti990_10_state::tape_interrupt) // set_int9(state); } -static MACHINE_CONFIG_START( ti990_10 ) +MACHINE_CONFIG_START(ti990_10_state::ti990_10) /* basic machine hardware */ /* TI990/10 CPU @ 4.0(???) MHz */ MCFG_TMS99xx_ADD("maincpu", TI990_10, 4000000, ti990_10_memmap, ti990_10_io ) diff --git a/src/mame/drivers/ti990_4.cpp b/src/mame/drivers/ti990_4.cpp index d141795ef4f..55eea89d520 100644 --- a/src/mame/drivers/ti990_4.cpp +++ b/src/mame/drivers/ti990_4.cpp @@ -69,6 +69,8 @@ public: DECLARE_MACHINE_RESET(ti990_4); + void ti990_4v(machine_config &config); + void ti990_4(machine_config &config); private: void hold_load(); void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -281,7 +283,7 @@ DRIVER_INIT_MEMBER(ti990_4_state, ti990_4) m_nmi_timer = timer_alloc(NMI_TIMER_ID); } -static MACHINE_CONFIG_START( ti990_4 ) +MACHINE_CONFIG_START(ti990_4_state::ti990_4) /* basic machine hardware */ /* TMS9900 CPU @ 3.0(???) MHz */ MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map) @@ -302,7 +304,7 @@ static MACHINE_CONFIG_START( ti990_4 ) // MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ti990_4_floppy_interface) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ti990_4v ) +MACHINE_CONFIG_START(ti990_4_state::ti990_4v) /* basic machine hardware */ /* TMS9900 CPU @ 3.0(???) MHz */ MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map_v) diff --git a/src/mame/drivers/ti99_2.cpp b/src/mame/drivers/ti99_2.cpp index b9aedb0cc15..181a97b5584 100644 --- a/src/mame/drivers/ti99_2.cpp +++ b/src/mame/drivers/ti99_2.cpp @@ -113,6 +113,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void ti99_2(machine_config &config); }; @@ -372,7 +373,7 @@ static INPUT_PORTS_START(ti99_2) INPUT_PORTS_END -static MACHINE_CONFIG_START( ti99_2 ) +MACHINE_CONFIG_START(ti99_2_state::ti99_2) // basic machine hardware // TMS9995, standard variant // We have no lines connected yet diff --git a/src/mame/drivers/ti99_4p.cpp b/src/mame/drivers/ti99_4p.cpp index 315b145b116..0346f394722 100644 --- a/src/mame/drivers/ti99_4p.cpp +++ b/src/mame/drivers/ti99_4p.cpp @@ -184,6 +184,7 @@ public: DECLARE_WRITE_LINE_MEMBER(video_interrupt_in); + void ti99_4p_60hz(machine_config &config); private: void datamux_clock_in(int clock); @@ -989,7 +990,7 @@ MACHINE_RESET_MEMBER(ti99_4p_state,ti99_4p) /* Machine description. */ -static MACHINE_CONFIG_START( ti99_4p_60hz ) +MACHINE_CONFIG_START(ti99_4p_state::ti99_4p_60hz) /* basic machine hardware */ /* TMS9900 CPU @ 3.0 MHz */ MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map) diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp index 3a50d10255b..07ed6284b9a 100644 --- a/src/mame/drivers/ti99_4x.cpp +++ b/src/mame/drivers/ti99_4x.cpp @@ -144,6 +144,15 @@ public: DECLARE_WRITE_LINE_MEMBER( video_interrupt_evpc_in ); void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + void ti99_4(machine_config &config); + void ti99_4_50hz(machine_config &config); + void ti99_4ev_60hz(machine_config &config); + void ti99_4qi(machine_config &config); + void ti99_4qi_60hz(machine_config &config); + void ti99_4a_50hz(machine_config &config); + void ti99_4a_60hz(machine_config &config); + void ti99_4a(machine_config &config); + void ti99_4_60hz(machine_config &config); private: void set_keyboard_column(int number, int data); int m_keyboard_column; @@ -827,7 +836,7 @@ MACHINE_RESET_MEMBER(ti99_4x_state,ti99_4) TI-99/4 - predecessor of the more popular TI-99/4A ***********************************************************************/ -static MACHINE_CONFIG_START( ti99_4 ) +MACHINE_CONFIG_START(ti99_4x_state::ti99_4) // CPU MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map) MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(ti99_4x_state, external_operation) ) @@ -903,7 +912,7 @@ MACHINE_CONFIG_END /* US version: 60 Hz, NTSC */ -static MACHINE_CONFIG_DERIVED( ti99_4_60hz, ti99_4 ) +MACHINE_CONFIG_DERIVED(ti99_4x_state::ti99_4_60hz, ti99_4) MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9918, XTAL_10_738635MHz / 2 ) \ MCFG_TMS9928A_VRAM_SIZE(0x4000) \ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in)) \ @@ -915,7 +924,7 @@ MACHINE_CONFIG_END /* European version: 50 Hz, PAL */ -static MACHINE_CONFIG_DERIVED( ti99_4_50hz, ti99_4 ) +MACHINE_CONFIG_DERIVED(ti99_4x_state::ti99_4_50hz, ti99_4) MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9929, XTAL_10_738635MHz / 2 ) \ MCFG_TMS9928A_VRAM_SIZE(0x4000) \ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in)) \ @@ -944,7 +953,7 @@ MACHINE_RESET_MEMBER(ti99_4x_state,ti99_4a) m_int12 = CLEAR_LINE; } -static MACHINE_CONFIG_START( ti99_4a ) +MACHINE_CONFIG_START(ti99_4x_state::ti99_4a) // CPU MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map) MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(ti99_4x_state, external_operation) ) @@ -1019,7 +1028,7 @@ MACHINE_CONFIG_END /* US version: 60 Hz, NTSC */ -static MACHINE_CONFIG_DERIVED( ti99_4a_60hz, ti99_4a ) +MACHINE_CONFIG_DERIVED(ti99_4x_state::ti99_4a_60hz, ti99_4a) MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9918A, XTAL_10_738635MHz / 2 ) \ MCFG_TMS9928A_VRAM_SIZE(0x4000) \ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in)) \ @@ -1031,7 +1040,7 @@ MACHINE_CONFIG_END /* European version: 50 Hz, PAL */ -static MACHINE_CONFIG_DERIVED( ti99_4a_50hz, ti99_4a ) +MACHINE_CONFIG_DERIVED(ti99_4x_state::ti99_4a_50hz, ti99_4a) MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9929A, XTAL_10_738635MHz / 2 ) \ MCFG_TMS9928A_VRAM_SIZE(0x4000) \ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in)) \ @@ -1056,7 +1065,7 @@ MACHINE_START_MEMBER(ti99_4x_state, ti99_4qi) register_save_state(); } -static MACHINE_CONFIG_DERIVED( ti99_4qi, ti99_4a ) +MACHINE_CONFIG_DERIVED(ti99_4x_state::ti99_4qi, ti99_4a) MCFG_MACHINE_START_OVERRIDE(ti99_4x_state, ti99_4qi ) MACHINE_CONFIG_END @@ -1064,7 +1073,7 @@ MACHINE_CONFIG_END US version: 60 Hz, NTSC There were no European versions. */ -static MACHINE_CONFIG_DERIVED( ti99_4qi_60hz, ti99_4qi ) +MACHINE_CONFIG_DERIVED(ti99_4x_state::ti99_4qi_60hz, ti99_4qi) MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9918A, XTAL_10_738635MHz / 2 ) \ MCFG_TMS9928A_VRAM_SIZE(0x4000) \ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in)) \ @@ -1101,7 +1110,7 @@ MACHINE_RESET_MEMBER(ti99_4x_state, ti99_4ev) m_gromclk_timer->adjust(attotime::zero, 0, attotime::from_hz(XTAL_10_738635MHz/24)); } -static MACHINE_CONFIG_START( ti99_4ev_60hz ) +MACHINE_CONFIG_START(ti99_4x_state::ti99_4ev_60hz) // CPU MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map) MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(ti99_4x_state, external_operation) ) diff --git a/src/mame/drivers/ti99_8.cpp b/src/mame/drivers/ti99_8.cpp index bfc7d4d7dfd..1e737abf396 100644 --- a/src/mame/drivers/ti99_8.cpp +++ b/src/mame/drivers/ti99_8.cpp @@ -261,6 +261,9 @@ public: DECLARE_WRITE_LINE_MEMBER(cassette_motor); DECLARE_WRITE8_MEMBER(tms9901_interrupt); + void ti99_8(machine_config &config); + void ti99_8_60hz(machine_config &config); + void ti99_8_50hz(machine_config &config); private: // Keyboard support void set_keyboard_column(int number, int data); @@ -713,7 +716,7 @@ MACHINE_RESET_MEMBER(ti99_8_state, ti99_8) console_reset(CLEAR_LINE); } -static MACHINE_CONFIG_START( ti99_8 ) +MACHINE_CONFIG_START(ti99_8_state::ti99_8) // basic machine hardware */ // TMS9995-MP9537 CPU @ 10.7 MHz // MP9537 mask: This variant of the TMS9995 does not contain on-chip RAM @@ -824,7 +827,7 @@ MACHINE_CONFIG_END /* TI-99/8 US version (NTSC, 60 Hz) */ -static MACHINE_CONFIG_DERIVED( ti99_8_60hz, ti99_8 ) +MACHINE_CONFIG_DERIVED(ti99_8_state::ti99_8_60hz, ti99_8) // Video hardware MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9118, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) @@ -836,7 +839,7 @@ MACHINE_CONFIG_END /* TI-99/8 European version (PAL, 50 Hz) */ -static MACHINE_CONFIG_DERIVED( ti99_8_50hz, ti99_8 ) +MACHINE_CONFIG_DERIVED(ti99_8_state::ti99_8_50hz, ti99_8) // Video hardware MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9129, XTAL_10_738635MHz / 2 ) MCFG_TMS9928A_VRAM_SIZE(0x4000) diff --git a/src/mame/drivers/tiamc1.cpp b/src/mame/drivers/tiamc1.cpp index b74d57f9398..e9be8a809be 100644 --- a/src/mame/drivers/tiamc1.cpp +++ b/src/mame/drivers/tiamc1.cpp @@ -323,7 +323,7 @@ static GFXDECODE_START( kot ) GFXDECODE_END -static MACHINE_CONFIG_START( tiamc1 ) +MACHINE_CONFIG_START(tiamc1_state::tiamc1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(tiamc1_map) @@ -352,7 +352,7 @@ static MACHINE_CONFIG_START( tiamc1 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(kot, tiamc1) +MACHINE_CONFIG_DERIVED(tiamc1_state::kot, tiamc1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(kotrybolov_map) MCFG_CPU_IO_MAP(kotrybolov_io_map) diff --git a/src/mame/drivers/ticalc1x.cpp b/src/mame/drivers/ticalc1x.cpp index 00b78aaee1b..f21d4ba8781 100644 --- a/src/mame/drivers/ticalc1x.cpp +++ b/src/mame/drivers/ticalc1x.cpp @@ -71,6 +71,7 @@ public: DECLARE_WRITE16_MEMBER(write_o); DECLARE_WRITE16_MEMBER(write_r); DECLARE_READ8_MEMBER(read_k); + void cmulti8(machine_config &config); }; // handlers @@ -184,7 +185,7 @@ static INPUT_PORTS_START( cmulti8 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static MACHINE_CONFIG_START( cmulti8 ) +MACHINE_CONFIG_START(cmulti8_state::cmulti8) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1070, 250000) // approximation - RC osc. R=56K, C=68pf @@ -225,6 +226,7 @@ public: DECLARE_WRITE16_MEMBER(write_o); DECLARE_WRITE16_MEMBER(write_r); DECLARE_READ8_MEMBER(read_k); + void tisr16(machine_config &config); }; // handlers @@ -400,7 +402,7 @@ static INPUT_PORTS_START( tisr16ii ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_NAME("9") INPUT_PORTS_END -static MACHINE_CONFIG_START( tisr16 ) +MACHINE_CONFIG_START(tisr16_state::tisr16) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 300000) // approximation - RC osc. R=43K, C=68pf (note: tisr16ii MCU RC osc. is different: R=30K, C=100pf, same freq) @@ -453,6 +455,8 @@ public: DECLARE_WRITE16_MEMBER(write_o); DECLARE_WRITE16_MEMBER(write_r); DECLARE_READ8_MEMBER(read_k); + void ti1270(machine_config &config); + void ti1250(machine_config &config); }; // handlers @@ -538,7 +542,7 @@ static INPUT_PORTS_START( ti1270 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_NAME("+/-") INPUT_PORTS_END -static MACHINE_CONFIG_START( ti1250 ) +MACHINE_CONFIG_START(ti1250_state::ti1250) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS0950, 200000) // approximation - RC osc. R=68K, C=68pf @@ -552,7 +556,7 @@ static MACHINE_CONFIG_START( ti1250 ) /* no sound! */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ti1270, ti1250 ) +MACHINE_CONFIG_DERIVED(ti1250_state::ti1270, ti1250) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", TMS0970, 250000) // approximation @@ -586,6 +590,7 @@ public: DECLARE_WRITE16_MEMBER(write_o); DECLARE_WRITE16_MEMBER(write_r); DECLARE_READ8_MEMBER(read_k); + void ti25503(machine_config &config); }; // handlers @@ -664,7 +669,7 @@ static INPUT_PORTS_START( ti25503 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_X) PORT_NAME("1/x") INPUT_PORTS_END -static MACHINE_CONFIG_START( ti25503 ) +MACHINE_CONFIG_START(ti25503_state::ti25503) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1000, 250000) // approximation @@ -703,6 +708,7 @@ public: DECLARE_WRITE16_MEMBER(write_o); DECLARE_WRITE16_MEMBER(write_r); DECLARE_READ8_MEMBER(read_k); + void ti1000(machine_config &config); }; // handlers @@ -764,7 +770,7 @@ static INPUT_PORTS_START( ti1000 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD) PORT_NAME("=") INPUT_PORTS_END -static MACHINE_CONFIG_START( ti1000 ) +MACHINE_CONFIG_START(ti1000_state::ti1000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1990, 250000) // approximation @@ -800,6 +806,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_o); virtual DECLARE_WRITE16_MEMBER(write_r); virtual DECLARE_READ8_MEMBER(read_k); + void wizatron(machine_config &config); }; // handlers @@ -864,7 +871,7 @@ static INPUT_PORTS_START( wizatron ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME(UTF8_DIVIDE) INPUT_PORTS_END -static MACHINE_CONFIG_START( wizatron ) +MACHINE_CONFIG_START(wizatron_state::wizatron) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS0970, 250000) // approximation @@ -902,6 +909,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_o) override; virtual DECLARE_READ8_MEMBER(read_k) override; + void lilprof(machine_config &config); }; // handlers @@ -938,7 +946,7 @@ static INPUT_PORTS_START( lilprof ) PORT_CONFSETTING( 0x08, "4" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( lilprof ) +MACHINE_CONFIG_START(lilprof_state::lilprof) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS0970, 250000) // approximation @@ -977,6 +985,7 @@ public: DECLARE_WRITE16_MEMBER(write_o); DECLARE_WRITE16_MEMBER(write_r); DECLARE_READ8_MEMBER(read_k); + void lilprof78(machine_config &config); }; // handlers @@ -1048,7 +1057,7 @@ static INPUT_PORTS_START( lilprof78 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_PLUS_PAD) PORT_NAME("+") INPUT_PORTS_END -static MACHINE_CONFIG_START( lilprof78 ) +MACHINE_CONFIG_START(lilprof78_state::lilprof78) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1990, 250000) // approximation @@ -1085,6 +1094,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_o); virtual DECLARE_WRITE16_MEMBER(write_r); virtual DECLARE_READ8_MEMBER(read_k); + void dataman(machine_config &config); }; // handlers @@ -1160,7 +1170,7 @@ static INPUT_PORTS_START( dataman ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_E) PORT_NAME("Electro Flash") INPUT_PORTS_END -static MACHINE_CONFIG_START( dataman ) +MACHINE_CONFIG_START(dataman_state::dataman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1980, 300000) // patent says 300kHz @@ -1197,6 +1207,7 @@ public: { } virtual DECLARE_WRITE16_MEMBER(write_r) override; + void mathmarv(machine_config &config); }; // handlers @@ -1227,7 +1238,7 @@ static INPUT_PORTS_START( mathmarv ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_F) PORT_NAME("Flash") INPUT_PORTS_END -static MACHINE_CONFIG_START( mathmarv ) +MACHINE_CONFIG_START(mathmarv_state::mathmarv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1980, 300000) // assume same as dataman @@ -1280,6 +1291,7 @@ public: DECLARE_WRITE16_MEMBER(write_o); DECLARE_WRITE16_MEMBER(write_r); DECLARE_READ8_MEMBER(read_k); + void ti30(machine_config &config); }; // handlers @@ -1487,7 +1499,7 @@ static INPUT_PORTS_START( tibusan ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PGDN) PORT_NAME("Off") PORT_CHANGED_MEMBER(DEVICE_SELF, hh_tms1k_state, power_button, (void *)false) INPUT_PORTS_END -static MACHINE_CONFIG_START( ti30 ) +MACHINE_CONFIG_START(ti30_state::ti30) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS0980, 400000) // guessed diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp index bba5d851e9c..6223c58d7a9 100644 --- a/src/mame/drivers/tickee.cpp +++ b/src/mame/drivers/tickee.cpp @@ -91,6 +91,10 @@ public: TMS340X0_SCANLINE_RGB32_CB_MEMBER(scanline_update); TMS340X0_SCANLINE_RGB32_CB_MEMBER(rapidfir_scanline_update); + void rapidfir(machine_config &config); + void ghoshunt(machine_config &config); + void tickee(machine_config &config); + void mouseatk(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -744,7 +748,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( tickee ) +MACHINE_CONFIG_START(tickee_state::tickee) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz) @@ -784,7 +788,7 @@ static MACHINE_CONFIG_START( tickee ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ghoshunt, tickee ) +MACHINE_CONFIG_DERIVED(tickee_state::ghoshunt, tickee) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -792,7 +796,7 @@ static MACHINE_CONFIG_DERIVED( ghoshunt, tickee ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rapidfir ) +MACHINE_CONFIG_START(tickee_state::rapidfir) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS34010, XTAL_50MHz) @@ -826,7 +830,7 @@ static MACHINE_CONFIG_START( rapidfir ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mouseatk ) +MACHINE_CONFIG_START(tickee_state::mouseatk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz) diff --git a/src/mame/drivers/tigeroad.cpp b/src/mame/drivers/tigeroad.cpp index aeabb88f9cc..1eed5223e7a 100644 --- a/src/mame/drivers/tigeroad.cpp +++ b/src/mame/drivers/tigeroad.cpp @@ -574,7 +574,7 @@ static GFXDECODE_START( tigeroad ) GFXDECODE_ENTRY( "sprites", 0, sprite_layout, 0x200, 16 ) GFXDECODE_END -static MACHINE_CONFIG_START( tigeroad ) +MACHINE_CONFIG_START(tigeroad_state::tigeroad) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */ @@ -622,7 +622,7 @@ MACHINE_CONFIG_END /* same as above but with additional Z80 for samples playback */ -static MACHINE_CONFIG_DERIVED( toramich, tigeroad ) +MACHINE_CONFIG_DERIVED(tigeroad_state::toramich, tigeroad) /* basic machine hardware */ @@ -638,7 +638,7 @@ static MACHINE_CONFIG_DERIVED( toramich, tigeroad ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( f1dream_comad ) +MACHINE_CONFIG_START(tigeroad_state::f1dream_comad) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) @@ -695,7 +695,7 @@ void pushman_state::machine_start() save_item(NAME(m_mcu_latch_ctl)); } -static MACHINE_CONFIG_DERIVED(pushman, f1dream_comad) +MACHINE_CONFIG_DERIVED(pushman_state::pushman, f1dream_comad) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pushman_map) @@ -706,7 +706,7 @@ static MACHINE_CONFIG_DERIVED(pushman, f1dream_comad) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(bballs, pushman) +MACHINE_CONFIG_DERIVED(pushman_state::bballs, pushman) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bballs_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp index 4f8bb5acdd3..e3cde4a8a52 100644 --- a/src/mame/drivers/tiki100.cpp +++ b/src/mame/drivers/tiki100.cpp @@ -58,7 +58,7 @@ READ8_MEMBER( tiki100_state::mrq_r ) data = m_video_ram[addr]; } - if (prom & RAM) + if (prom & RAM0) { data = m_ram->pointer()[offset]; } @@ -79,7 +79,7 @@ WRITE8_MEMBER( tiki100_state::mrq_w ) m_video_ram[addr] = data; } - if (prom & RAM) + if (prom & RAM0) { m_ram->pointer()[offset] = data; } @@ -695,7 +695,7 @@ void tiki100_state::machine_reset() /* Machine Driver */ -static MACHINE_CONFIG_START( tiki100 ) +MACHINE_CONFIG_START(tiki100_state::tiki100) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(tiki100_mem) diff --git a/src/mame/drivers/tim011.cpp b/src/mame/drivers/tim011.cpp index 2d4641cc948..7df492be7a3 100644 --- a/src/mame/drivers/tim011.cpp +++ b/src/mame/drivers/tim011.cpp @@ -43,6 +43,7 @@ public: required_device m_floppy1; required_device m_floppy2; required_device m_floppy3; + void tim011(machine_config &config); }; @@ -121,7 +122,7 @@ static const floppy_format_type tim011_floppy_formats[] = { nullptr }; -static MACHINE_CONFIG_START( tim011 ) +MACHINE_CONFIG_START(tim011_state::tim011) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z180, XTAL_12_288MHz / 2) // location U17 HD64180 MCFG_CPU_PROGRAM_MAP(tim011_mem) diff --git a/src/mame/drivers/tim100.cpp b/src/mame/drivers/tim100.cpp index 49449025898..68a0047312a 100644 --- a/src/mame/drivers/tim100.cpp +++ b/src/mame/drivers/tim100.cpp @@ -38,6 +38,7 @@ public: DECLARE_WRITE_LINE_MEMBER(irq_w); I8275_DRAW_CHARACTER_MEMBER( crtc_display_pixels ); + void tim100(machine_config &config); private: virtual void machine_start() override; uint8_t *m_charmap; @@ -154,7 +155,7 @@ WRITE_LINE_MEMBER( tim100_state::irq_w ) } -static MACHINE_CONFIG_START( tim100 ) +MACHINE_CONFIG_START(tim100_state::tim100) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A, XTAL_4_9152MHz) // divider unknown MCFG_CPU_PROGRAM_MAP(tim100_mem) diff --git a/src/mame/drivers/timelimt.cpp b/src/mame/drivers/timelimt.cpp index 9c260fb7796..58109b92285 100644 --- a/src/mame/drivers/timelimt.cpp +++ b/src/mame/drivers/timelimt.cpp @@ -218,7 +218,7 @@ INTERRUPT_GEN_MEMBER(timelimt_state::irq) /***************************************************************************/ -static MACHINE_CONFIG_START( timelimt ) +MACHINE_CONFIG_START(timelimt_state::timelimt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.000 MHz */ diff --git a/src/mame/drivers/timeplt.cpp b/src/mame/drivers/timeplt.cpp index 79673d94d59..ab717e34348 100644 --- a/src/mame/drivers/timeplt.cpp +++ b/src/mame/drivers/timeplt.cpp @@ -421,7 +421,7 @@ void timeplt_state::machine_reset() { } -static MACHINE_CONFIG_START( timeplt ) +MACHINE_CONFIG_START(timeplt_state::timeplt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* not confirmed, but common for Konami games of the era */ @@ -457,11 +457,12 @@ static MACHINE_CONFIG_START( timeplt ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_FRAGMENT_ADD(timeplt_sound) + MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0) + downcast(device)->timeplt_sound(config); MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( psurge, timeplt ) +MACHINE_CONFIG_DERIVED(timeplt_state::psurge, timeplt) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -477,7 +478,7 @@ static MACHINE_CONFIG_DERIVED( psurge, timeplt ) MCFG_VIDEO_START_OVERRIDE(timeplt_state,psurge) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bikkuric, timeplt ) +MACHINE_CONFIG_DERIVED(timeplt_state::bikkuric, timeplt) MCFG_GFXDECODE_MODIFY("gfxdecode", chkun) @@ -488,16 +489,16 @@ static MACHINE_CONFIG_DERIVED( bikkuric, timeplt ) MCFG_VIDEO_START_OVERRIDE(timeplt_state,chkun) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( chkun, bikkuric ) +MACHINE_CONFIG_DERIVED(timeplt_state::chkun, bikkuric) MCFG_GFXDECODE_MODIFY("gfxdecode", chkun) /* sound hardware */ - MCFG_SOUND_MODIFY("ay2") + MCFG_SOUND_MODIFY("timeplt_audio:ay2") MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(timeplt_state, chkun_sound_w)) MCFG_TC8830F_ADD("tc8830f", XTAL_512kHz) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "timeplt_audio:mono", 0.10) MACHINE_CONFIG_END @@ -514,7 +515,7 @@ ROM_START( timeplt ) ROM_LOAD( "tm2", 0x2000, 0x2000, CRC(58636cb5) SHA1(ab517efa93ae7be780af55faea82a6e83edd828c) ) ROM_LOAD( "tm3", 0x4000, 0x2000, CRC(ff4e0d83) SHA1(ef98a1abb45b22d7498a0aca520f43bbee248b22) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "tm7", 0x0000, 0x1000, CRC(d66da813) SHA1(408fca4515e8af84211df3e204c8776b2f8adb23) ) ROM_REGION( 0x2000, "gfx1", 0 ) @@ -537,7 +538,7 @@ ROM_START( timeplta ) ROM_LOAD( "cd_e2.bin", 0x2000, 0x2000, CRC(38b0c72a) SHA1(8f0950deb2f9e2b65714318b9e837a1c837f52a9) ) ROM_LOAD( "cd_e3.bin", 0x4000, 0x2000, CRC(83846870) SHA1(b1741e7e5674f9e63e113ead0cb7f5ef874eac5f) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "tm7", 0x0000, 0x1000, CRC(d66da813) SHA1(408fca4515e8af84211df3e204c8776b2f8adb23) ) ROM_REGION( 0x2000, "gfx1", 0 ) @@ -560,7 +561,7 @@ ROM_START( timepltc ) ROM_LOAD( "cd2y", 0x2000, 0x2000, CRC(0dcf5287) SHA1(c36628367e81ac07f5ace72b45ebb7140b6aa116) ) ROM_LOAD( "cd3y", 0x4000, 0x2000, CRC(c789b912) SHA1(dead7b20a40769e48738fccc3a17e2266aac445d) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "tm7", 0x0000, 0x1000, CRC(d66da813) SHA1(408fca4515e8af84211df3e204c8776b2f8adb23) ) ROM_REGION( 0x2000, "gfx1", 0 ) @@ -583,7 +584,7 @@ ROM_START( spaceplt ) ROM_LOAD( "sp2", 0x2000, 0x2000, CRC(1f0308ef) SHA1(dd88378fc4cefe473f310d4730268c98354a4a44) ) ROM_LOAD( "sp3", 0x4000, 0x2000, CRC(90aeca50) SHA1(9c6fddfeafa84f5284ec8f7c9d46216b110badc1) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "tm7", 0x0000, 0x1000, CRC(d66da813) SHA1(408fca4515e8af84211df3e204c8776b2f8adb23) ) ROM_REGION( 0x2000, "gfx1", 0 ) @@ -607,7 +608,7 @@ ROM_START( psurge ) ROM_LOAD( "p2", 0x2000, 0x2000, CRC(3ff41576) SHA1(9bdbad31c65dff76942967b5a334407b0326f752) ) ROM_LOAD( "p3", 0x4000, 0x2000, CRC(e8fe120a) SHA1(b6320c9cb1a67097692aa0de7d88b0dfb63dedd7) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "p6", 0x0000, 0x1000, CRC(b52d01fa) SHA1(9b6cf9ea51d3a87c174f34d42a4b1b5f38b48723) ) ROM_LOAD( "p7", 0x1000, 0x1000, CRC(9db5c0ce) SHA1(b5bc1d89a7f7d7a0baae64390c37ee11f69a0e76) ) @@ -630,7 +631,7 @@ ROM_START( chkun ) ROM_LOAD( "n1.16a", 0x0000, 0x4000, CRC(c5879f9b) SHA1(68e3a87dfe6b3d1e0cdadd1ed8ad115a9d3055f9) ) ROM_LOAD( "12.14a", 0x4000, 0x2000, CRC(80cc55da) SHA1(68727721479624cd0d38d895b98dcef4edac13e9) ) - ROM_REGION( 0x12000, "tpsound", 0 ) + ROM_REGION( 0x12000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "15.3l", 0x0000, 0x2000, CRC(1f1463ca) SHA1(870abbca35236fcce6a2f640a238e20b9e57f10f)) ROM_REGION( 0x4000, "gfx1", 0 ) @@ -659,7 +660,7 @@ ROM_START( bikkuric ) ROM_LOAD( "1.a16", 0x00000, 0x04000, CRC(e8d595ab) SHA1(01f6a5321274befcd03a0ec18ed9770aca4527b6) ) ROM_LOAD( "2.a14", 0x04000, 0x02000, CRC(63fd7d53) SHA1(b1ef666453c5c9e344bee544a0673068d60158fa) ) - ROM_REGION( 0x10000, "tpsound", 0 ) + ROM_REGION( 0x10000, "timeplt_audio:tpsound", 0 ) ROM_LOAD( "5.l3", 0x00000, 0x02000, CRC(bc438531) SHA1(e19badc417b0538010cf535d3f733acc54b0cd96) ) ROM_REGION( 0x8000, "gfx1", 0 ) diff --git a/src/mame/drivers/timetrv.cpp b/src/mame/drivers/timetrv.cpp index dc017517493..c9655604ade 100644 --- a/src/mame/drivers/timetrv.cpp +++ b/src/mame/drivers/timetrv.cpp @@ -51,6 +51,7 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(ld_irq); required_device m_maincpu; + void timetrv(machine_config &config); }; @@ -149,7 +150,7 @@ INTERRUPT_GEN_MEMBER(timetrv_state::ld_irq) device.execute().set_input_line_and_vector(0,HOLD_LINE,0x48/4); //ld irq } -static MACHINE_CONFIG_START( timetrv ) +MACHINE_CONFIG_START(timetrv_state::timetrv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I80188,20000000) //??? diff --git a/src/mame/drivers/timex.cpp b/src/mame/drivers/timex.cpp index c6ddea29a22..989181e043b 100644 --- a/src/mame/drivers/timex.cpp +++ b/src/mame/drivers/timex.cpp @@ -682,7 +682,7 @@ static GFXDECODE_START( ts2068 ) GFXDECODE_ENTRY( "maincpu", 0x13d00, ts2068_charlayout, 0, 8 ) GFXDECODE_END -static MACHINE_CONFIG_DERIVED( ts2068, spectrum_128 ) +MACHINE_CONFIG_DERIVED(spectrum_state::ts2068, spectrum_128) MCFG_CPU_REPLACE("maincpu", Z80, XTAL_14_112MHz/4) /* From Schematic; 3.528 MHz */ MCFG_CPU_PROGRAM_MAP(ts2068_mem) MCFG_CPU_IO_MAP(ts2068_io) @@ -721,13 +721,13 @@ static MACHINE_CONFIG_DERIVED( ts2068, spectrum_128 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( uk2086, ts2068 ) +MACHINE_CONFIG_DERIVED(spectrum_state::uk2086, ts2068) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE(50) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tc2048, spectrum ) +MACHINE_CONFIG_DERIVED(spectrum_state::tc2048, spectrum) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tc2048_mem) MCFG_CPU_IO_MAP(tc2048_io) diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp index a53b111c30b..5a6b99c4208 100644 --- a/src/mame/drivers/tispeak.cpp +++ b/src/mame/drivers/tispeak.cpp @@ -474,6 +474,20 @@ public: u8 m_overlay; TIMER_DEVICE_CALLBACK_MEMBER(tntell_get_overlay); + void tms5110_route(machine_config &config); + void snspellit(machine_config &config); + void lantutor(machine_config &config); + void snmath(machine_config &config); + void snspellsp(machine_config &config); + void k28m2(machine_config &config); + void snspellc(machine_config &config); + void vocaid(machine_config &config); + void snspellcuk(machine_config &config); + void sns_cd2801(machine_config &config); + void tntell(machine_config &config); + void snread(machine_config &config); + void sns_tmc0281d(machine_config &config); + void sns_tmc0281(machine_config &config); protected: virtual void machine_start() override; }; @@ -1242,9 +1256,10 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( tms5110_route ) +MACHINE_CONFIG_START(tispeak_state::tms5110_route) /* sound hardware */ + MCFG_DEVICE_MODIFY("tms5100") MCFG_TMS5110_M0_CB(DEVWRITELINE("tms6100", tms6100_device, m0_w)) MCFG_TMS5110_M1_CB(DEVWRITELINE("tms6100", tms6100_device, m1_w)) MCFG_TMS5110_ADDR_CB(DEVWRITE8("tms6100", tms6100_device, add_w)) @@ -1253,7 +1268,7 @@ static MACHINE_CONFIG_START( tms5110_route ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( snmath ) +MACHINE_CONFIG_START(tispeak_state::snmath) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS0270, MASTER_CLOCK/2) @@ -1277,7 +1292,7 @@ static MACHINE_CONFIG_START( snmath ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sns_cd2801, snmath ) +MACHINE_CONFIG_DERIVED(tispeak_state::sns_cd2801, snmath) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1293,26 +1308,26 @@ static MACHINE_CONFIG_DERIVED( sns_cd2801, snmath ) MCFG_SOFTWARE_LIST_ADD("cart_list", "snspell") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( snspellit, sns_cd2801 ) +MACHINE_CONFIG_DERIVED(tispeak_state::snspellit, sns_cd2801) /* basic machine hardware */ MCFG_DEFAULT_LAYOUT(layout_snmath) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sns_tmc0281, sns_cd2801 ) +MACHINE_CONFIG_DERIVED(tispeak_state::sns_tmc0281, sns_cd2801) /* sound hardware */ MCFG_SOUND_REPLACE("tms5100", TMC0281, MASTER_CLOCK) MCFG_FRAGMENT_ADD(tms5110_route) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( snspellsp, sns_tmc0281 ) +MACHINE_CONFIG_DERIVED(tispeak_state::snspellsp, sns_tmc0281) /* basic machine hardware */ MCFG_DEFAULT_LAYOUT(layout_snspellsp) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sns_tmc0281d, sns_cd2801 ) +MACHINE_CONFIG_DERIVED(tispeak_state::sns_tmc0281d, sns_cd2801) /* sound hardware */ MCFG_SOUND_REPLACE("tms5100", TMC0281D, MASTER_CLOCK) @@ -1320,7 +1335,7 @@ static MACHINE_CONFIG_DERIVED( sns_tmc0281d, sns_cd2801 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( snread, snmath ) +MACHINE_CONFIG_DERIVED(tispeak_state::snread, snmath) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1337,7 +1352,7 @@ static MACHINE_CONFIG_DERIVED( snread, snmath ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lantutor, snmath ) +MACHINE_CONFIG_DERIVED(tispeak_state::lantutor, snmath) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1356,7 +1371,7 @@ static MACHINE_CONFIG_DERIVED( lantutor, snmath ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( snspellc ) +MACHINE_CONFIG_START(tispeak_state::snspellc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, MASTER_CLOCK/2) @@ -1381,7 +1396,7 @@ static MACHINE_CONFIG_START( snspellc ) MCFG_SOFTWARE_LIST_ADD("cart_list", "snspell") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( snspellcuk, snspellc ) +MACHINE_CONFIG_DERIVED(tispeak_state::snspellcuk, snspellc) /* sound hardware */ MCFG_SOUND_REPLACE("tms5100", CD2801, MASTER_CLOCK) // CD2801A! @@ -1389,7 +1404,7 @@ static MACHINE_CONFIG_DERIVED( snspellcuk, snspellc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vocaid ) +MACHINE_CONFIG_START(tispeak_state::vocaid) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1100, MASTER_CLOCK/2) @@ -1409,7 +1424,7 @@ static MACHINE_CONFIG_START( vocaid ) MCFG_FRAGMENT_ADD(tms5110_route) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tntell, vocaid ) +MACHINE_CONFIG_DERIVED(tispeak_state::tntell, vocaid) /* cartridge */ MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "tntell") @@ -1420,7 +1435,7 @@ static MACHINE_CONFIG_DERIVED( tntell, vocaid ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( k28m2 ) +MACHINE_CONFIG_START(tispeak_state::k28m2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS1400, MASTER_CLOCK/2) diff --git a/src/mame/drivers/tispellb.cpp b/src/mame/drivers/tispellb.cpp index 1c73e9d6692..50d6006c896 100644 --- a/src/mame/drivers/tispellb.cpp +++ b/src/mame/drivers/tispellb.cpp @@ -101,6 +101,8 @@ public: DECLARE_WRITE16_MEMBER(rev2_write_o); DECLARE_WRITE16_MEMBER(rev2_write_r); + void rev1(machine_config &config); + void rev2(machine_config &config); protected: virtual void machine_start() override; }; @@ -341,7 +343,7 @@ INPUT_PORTS_END ***************************************************************************/ -static MACHINE_CONFIG_START( rev1 ) +MACHINE_CONFIG_START(tispellb_state::rev1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS0270, 350000) // approximation @@ -365,7 +367,7 @@ static MACHINE_CONFIG_START( rev1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rev2 ) +MACHINE_CONFIG_START(tispellb_state::rev2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", TMS0270, 350000) // approximation diff --git a/src/mame/drivers/tk2000.cpp b/src/mame/drivers/tk2000.cpp index 23a9b75be20..bcd23490e72 100644 --- a/src/mame/drivers/tk2000.cpp +++ b/src/mame/drivers/tk2000.cpp @@ -88,6 +88,7 @@ public: DECLARE_READ8_MEMBER(c100_r); DECLARE_WRITE8_MEMBER(c100_w); + void tk2000(machine_config &config); private: int m_speaker_state; int m_cassette_state; @@ -562,7 +563,7 @@ static INPUT_PORTS_START( tk2000 ) PORT_CONFSETTING(0x03, "Amber") INPUT_PORTS_END -static MACHINE_CONFIG_START( tk2000 ) +MACHINE_CONFIG_START(tk2000_state::tk2000) /* basic machine hardware */ MCFG_CPU_ADD(A2_CPU_TAG, M6502, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2_map) diff --git a/src/mame/drivers/tk80.cpp b/src/mame/drivers/tk80.cpp index d9be3869a7b..c4bc1ebb4a8 100644 --- a/src/mame/drivers/tk80.cpp +++ b/src/mame/drivers/tk80.cpp @@ -75,6 +75,11 @@ public: uint8_t m_shift_press_flag; uint8_t m_ppi_portc; required_device m_maincpu; + void ics8080(machine_config &config); + void tk80(machine_config &config); + void mikrolab(machine_config &config); + void nd80z(machine_config &config); + void tk85(machine_config &config); }; @@ -248,7 +253,7 @@ WRITE8_MEMBER( tk80_state::mikrolab_serial_w ) m_ppi_portc = data; } -static MACHINE_CONFIG_START( tk80 ) +MACHINE_CONFIG_START(tk80_state::tk80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080A, XTAL_18_432MHz / 9) MCFG_CPU_PROGRAM_MAP(tk80_mem) @@ -264,7 +269,7 @@ static MACHINE_CONFIG_START( tk80 ) MCFG_I8255_OUT_PORTC_CB(WRITE8(tk80_state, serial_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mikrolab, tk80 ) +MACHINE_CONFIG_DERIVED(tk80_state::mikrolab, tk80) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tk85_mem) MCFG_CPU_IO_MAP(mikrolab_io) @@ -277,7 +282,7 @@ static MACHINE_CONFIG_DERIVED( mikrolab, tk80 ) MCFG_I8255_OUT_PORTC_CB(WRITE8(tk80_state, mikrolab_serial_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( nd80z ) +MACHINE_CONFIG_START(tk80_state::nd80z) MCFG_CPU_ADD("maincpu", Z80, XTAL_1MHz) // Sharp LH0080A, can't see writing on xtal MCFG_CPU_PROGRAM_MAP(tk85_mem) MCFG_CPU_IO_MAP(nd80z_io) @@ -292,13 +297,13 @@ static MACHINE_CONFIG_START( nd80z ) MCFG_I8255_OUT_PORTC_CB(WRITE8(tk80_state, mikrolab_serial_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tk85, tk80 ) +MACHINE_CONFIG_DERIVED(tk80_state::tk85, tk80) MCFG_CPU_REPLACE("maincpu", I8085A, XTAL_4_9152MHz) MCFG_CPU_PROGRAM_MAP(tk85_mem) MCFG_CPU_IO_MAP(tk80_io) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ics8080, tk80 ) +MACHINE_CONFIG_DERIVED(tk80_state::ics8080, tk80) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(ics8080_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tk80bs.cpp b/src/mame/drivers/tk80bs.cpp index 7176dd2f059..ebc7c0d2825 100644 --- a/src/mame/drivers/tk80bs.cpp +++ b/src/mame/drivers/tk80bs.cpp @@ -48,6 +48,7 @@ public: DECLARE_READ8_MEMBER(port_b_r); uint32_t screen_update_tk80bs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_shared_ptr m_p_videoram; + void tk80bs(machine_config &config); private: uint8_t m_term_data; required_device m_maincpu; @@ -166,7 +167,7 @@ static GFXDECODE_START( tk80bs ) GFXDECODE_END -static MACHINE_CONFIG_START( tk80bs ) +MACHINE_CONFIG_START(tk80bs_state::tk80bs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, XTAL_1MHz) //unknown clock MCFG_CPU_PROGRAM_MAP(tk80bs_mem) diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp index a70ccdf9750..eea16a6c43d 100644 --- a/src/mame/drivers/tm990189.cpp +++ b/src/mame/drivers/tm990189.cpp @@ -160,6 +160,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(display_callback); TIMER_CALLBACK_MEMBER(clear_load); void hold_load(); + void tm990_189_v(machine_config &config); + void tm990_189(machine_config &config); private: void draw_digit(void); void led_set(int number, bool state); @@ -804,7 +806,7 @@ static ADDRESS_MAP_START( tm990_189_cru_map, AS_IO, 8, tm990189_state ) AM_RANGE(0x0400, 0x05ff) AM_DEVWRITE("tms9902", tms9902_device, cruwrite) /* optional tms9902 */ ADDRESS_MAP_END -static MACHINE_CONFIG_START( tm990_189 ) +MACHINE_CONFIG_START(tm990189_state::tm990_189) /* basic machine hardware */ MCFG_TMS99xx_ADD("maincpu", TMS9980A, 2000000, tm990_189_memmap, tm990_189_cru_map) MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(tm990189_state, external_operation) ) @@ -861,7 +863,7 @@ static MACHINE_CONFIG_START( tm990_189 ) MCFG_TIMER_START_DELAY(attotime::from_msec(150)) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tm990_189_v ) +MACHINE_CONFIG_START(tm990189_state::tm990_189_v) /* basic machine hardware */ MCFG_TMS99xx_ADD("maincpu", TMS9980A, 2000000, tm990_189_v_memmap, tm990_189_cru_map) MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(tm990189_state, external_operation) ) diff --git a/src/mame/drivers/tmaster.cpp b/src/mame/drivers/tmaster.cpp index 742964de8c9..20ccf7bb265 100644 --- a/src/mame/drivers/tmaster.cpp +++ b/src/mame/drivers/tmaster.cpp @@ -138,6 +138,8 @@ public: DECLARE_READ_LINE_MEMBER(read_rand); + void tm(machine_config &config); + void tmds1204(machine_config &config); protected: required_device m_maincpu; required_device m_screen; @@ -359,7 +361,7 @@ int tmaster_compute_addr(uint16_t reg_low, uint16_t reg_mid, uint16_t reg_high) return (reg_low & 0xff) | ((reg_mid & 0x1ff) << 8) | (reg_high << 17); } -static MACHINE_CONFIG_START( tm ) +MACHINE_CONFIG_START(tmaster_state::tm) MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12MHz */ MCFG_CPU_PROGRAM_MAP(tmaster_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", tmaster_state, scanline_interrupt, "screen", 0, 1) @@ -395,7 +397,7 @@ static MACHINE_CONFIG_START( tm ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tmds1204, tm ) +MACHINE_CONFIG_DERIVED(tmaster_state::tmds1204, tm) MCFG_DS1204_ADD("ds1204") MACHINE_CONFIG_END diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp index 98055afd399..a4c0cecc035 100644 --- a/src/mame/drivers/tmc1800.cpp +++ b/src/mame/drivers/tmc1800.cpp @@ -704,7 +704,7 @@ QUICKLOAD_LOAD_MEMBER( tmc1800_base_state, tmc1800 ) return image_init_result::PASS; } -static MACHINE_CONFIG_START( tmc1800 ) +MACHINE_CONFIG_START(tmc1800_state::tmc1800) // basic system hardware MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz) MCFG_CPU_PROGRAM_MAP(tmc1800_map) @@ -736,7 +736,7 @@ static MACHINE_CONFIG_START( tmc1800 ) MCFG_RAM_EXTRA_OPTIONS("4K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( osc1000b ) +MACHINE_CONFIG_START(osc1000b_state::osc1000b) // basic system hardware MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz) MCFG_CPU_PROGRAM_MAP(osc1000b_map) @@ -767,7 +767,7 @@ static MACHINE_CONFIG_START( osc1000b ) MCFG_RAM_EXTRA_OPTIONS("4K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tmc2000 ) +MACHINE_CONFIG_START(tmc2000_state::tmc2000) // basic system hardware MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz) MCFG_CPU_PROGRAM_MAP(tmc2000_map) @@ -793,7 +793,7 @@ static MACHINE_CONFIG_START( tmc2000 ) MCFG_RAM_EXTRA_OPTIONS("16K,32K") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( nano ) +MACHINE_CONFIG_START(nano_state::nano) // basic system hardware MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz) MCFG_CPU_PROGRAM_MAP(nano_map) diff --git a/src/mame/drivers/tmc2000e.cpp b/src/mame/drivers/tmc2000e.cpp index 9ae0dd5b707..604db663078 100644 --- a/src/mame/drivers/tmc2000e.cpp +++ b/src/mame/drivers/tmc2000e.cpp @@ -276,7 +276,7 @@ void tmc2000e_state::machine_reset() /* Machine Drivers */ -static MACHINE_CONFIG_START( tmc2000e ) +MACHINE_CONFIG_START(tmc2000e_state::tmc2000e) // basic system hardware MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz) MCFG_CPU_PROGRAM_MAP(tmc2000e_map) diff --git a/src/mame/drivers/tmc600.cpp b/src/mame/drivers/tmc600.cpp index 9ab3a7b32b9..c5d60a38a6c 100644 --- a/src/mame/drivers/tmc600.cpp +++ b/src/mame/drivers/tmc600.cpp @@ -251,7 +251,7 @@ WRITE8_MEMBER( tmc600_state::sc_w ) /* Machine Drivers */ -static MACHINE_CONFIG_START( tmc600 ) +MACHINE_CONFIG_START(tmc600_state::tmc600) // CPU MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_3_57MHz) MCFG_CPU_PROGRAM_MAP(tmc600_map) diff --git a/src/mame/drivers/tmmjprd.cpp b/src/mame/drivers/tmmjprd.cpp index c45ddfdb6ce..9b3c6a54a84 100644 --- a/src/mame/drivers/tmmjprd.cpp +++ b/src/mame/drivers/tmmjprd.cpp @@ -92,6 +92,8 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int screen); void draw_tile(bitmap_ind16 &bitmap, const rectangle &cliprect, int x,int y,int sizex,int sizey, uint32_t tiledata, uint8_t* rom); void draw_tilemap(bitmap_ind16 &bitmap, const rectangle &cliprect, uint32_t*tileram, uint32_t*tileregs, uint8_t*rom ); + void tmmjprd(machine_config &config); + void tmpdoki(machine_config &config); }; @@ -764,7 +766,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(tmmjprd_state::scanline) } -static MACHINE_CONFIG_START( tmmjprd ) +MACHINE_CONFIG_START(tmmjprd_state::tmmjprd) MCFG_CPU_ADD("maincpu",M68EC020,24000000) /* 24 MHz */ MCFG_CPU_PROGRAM_MAP(tmmjprd_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", tmmjprd_state, scanline, "lscreen", 0, 1) @@ -813,7 +815,7 @@ static MACHINE_CONFIG_START( tmmjprd ) MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tmpdoki, tmmjprd ) +MACHINE_CONFIG_DERIVED(tmmjprd_state::tmpdoki, tmmjprd) MCFG_DEFAULT_LAYOUT(layout_horizont) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp index d7403c81c0c..55b2e1a97b6 100644 --- a/src/mame/drivers/tmnt.cpp +++ b/src/mame/drivers/tmnt.cpp @@ -1892,7 +1892,7 @@ MACHINE_RESET_MEMBER(tmnt_state,common) } -static MACHINE_CONFIG_START( cuebrick ) +MACHINE_CONFIG_START(tmnt_state::cuebrick) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz */ @@ -1944,7 +1944,7 @@ static MACHINE_CONFIG_START( cuebrick ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mia ) +MACHINE_CONFIG_START(tmnt_state::mia) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/3) @@ -2009,7 +2009,7 @@ MACHINE_RESET_MEMBER(tmnt_state,tmnt) m_upd7759->reset_w(1); } -static MACHINE_CONFIG_START( tmnt ) +MACHINE_CONFIG_START(tmnt_state::tmnt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/3) @@ -2076,7 +2076,7 @@ static MACHINE_CONFIG_START( tmnt ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( punkshot ) +MACHINE_CONFIG_START(tmnt_state::punkshot) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) @@ -2130,7 +2130,7 @@ static MACHINE_CONFIG_START( punkshot ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( lgtnfght ) +MACHINE_CONFIG_START(tmnt_state::lgtnfght) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) @@ -2186,7 +2186,7 @@ static MACHINE_CONFIG_START( lgtnfght ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( blswhstl ) +MACHINE_CONFIG_START(tmnt_state::blswhstl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* Confirmed */ @@ -2264,7 +2264,7 @@ static GFXDECODE_START( glfgreat ) GFXDECODE_ENTRY( "zoom", 0, zoomlayout, 0x400, 16 ) GFXDECODE_END -static MACHINE_CONFIG_START( glfgreat ) +MACHINE_CONFIG_START(tmnt_state::glfgreat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* Confirmed */ @@ -2330,7 +2330,7 @@ MACHINE_START_MEMBER(tmnt_state,prmrsocr) membank("bank1")->configure_entries(0, 8, &ROM[0x10000], 0x4000); } -static MACHINE_CONFIG_START( prmrsocr ) +MACHINE_CONFIG_START(tmnt_state::prmrsocr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* Confirmed */ @@ -2395,7 +2395,7 @@ static MACHINE_CONFIG_START( prmrsocr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tmnt2 ) +MACHINE_CONFIG_START(tmnt_state::tmnt2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) @@ -2458,7 +2458,7 @@ static MACHINE_CONFIG_START( tmnt2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ssriders ) +MACHINE_CONFIG_START(tmnt_state::ssriders) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) @@ -2517,7 +2517,7 @@ static MACHINE_CONFIG_START( ssriders ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sunsetbl ) +MACHINE_CONFIG_START(tmnt_state::sunsetbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */ @@ -2563,7 +2563,7 @@ static MACHINE_CONFIG_START( sunsetbl ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( thndrx2 ) +MACHINE_CONFIG_START(tmnt_state::thndrx2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */ diff --git a/src/mame/drivers/tmspoker.cpp b/src/mame/drivers/tmspoker.cpp index cab1327929d..b0a952e7795 100644 --- a/src/mame/drivers/tmspoker.cpp +++ b/src/mame/drivers/tmspoker.cpp @@ -239,6 +239,7 @@ public: INTERRUPT_GEN_MEMBER(tmspoker_interrupt); required_device m_maincpu; required_device m_gfxdecode; + void tmspoker(machine_config &config); }; @@ -550,7 +551,7 @@ GFXDECODE_END * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( tmspoker ) +MACHINE_CONFIG_START(tmspoker_state::tmspoker) // CPU TMS9980A; no line connections MCFG_TMS99xx_ADD("maincpu", TMS9980A, MASTER_CLOCK/4, tmspoker_map, tmspoker_cru_map) diff --git a/src/mame/drivers/tnzs.cpp b/src/mame/drivers/tnzs.cpp index c5a73d241d7..5499f86208d 100644 --- a/src/mame/drivers/tnzs.cpp +++ b/src/mame/drivers/tnzs.cpp @@ -871,7 +871,7 @@ static ADDRESS_MAP_START( mainbank_map, AS_PROGRAM, 8, tnzs_base_state ) AM_RANGE(0x08000, 0x1ffff) AM_ROM AM_REGION(":maincpu", 0x8000) ADDRESS_MAP_END -MACHINE_CONFIG_START( tnzs_mainbank ) +MACHINE_CONFIG_START(tnzs_base_state::tnzs_mainbank) MCFG_DEVICE_ADD("mainbank", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(mainbank_map) MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE) @@ -1517,7 +1517,7 @@ static GFXDECODE_START( insectx ) GFXDECODE_ENTRY( "gfx1", 0, insectx_charlayout, 0, 32 ) GFXDECODE_END -static MACHINE_CONFIG_START( tnzs_base ) +MACHINE_CONFIG_START(tnzs_base_state::tnzs_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz, verified on insectx, kageki, tnzsb */ MCFG_CPU_PROGRAM_MAP(main_map) @@ -1552,7 +1552,7 @@ static MACHINE_CONFIG_START( tnzs_base ) MCFG_SPEAKER_STANDARD_MONO("speaker") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tnzs, tnzs_base ) +MACHINE_CONFIG_DERIVED(tnzs_base_state::tnzs, tnzs_base) MCFG_CPU_ADD("mcu", I8742, 12000000/2) /* 400KHz ??? - Main board Crystal is 12MHz */ MCFG_MCS48_PORT_P1_IN_CB(READ8(tnzs_mcu_state, mcu_port1_r)) MCFG_MCS48_PORT_P2_IN_CB(READ8(tnzs_mcu_state, mcu_port2_r)) @@ -1575,7 +1575,7 @@ static MACHINE_CONFIG_DERIVED( tnzs, tnzs_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( extrmatn, tnzs ) +MACHINE_CONFIG_DERIVED(extrmatn_state::extrmatn, tnzs) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(prompal_main_map) @@ -1589,13 +1589,13 @@ static MACHINE_CONFIG_DERIVED( extrmatn, tnzs ) MCFG_PALETTE_INIT_OWNER(tnzs_base_state, prompalette) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( plumppop, extrmatn ) +MACHINE_CONFIG_DERIVED(extrmatn_state::plumppop, extrmatn) MCFG_DEVICE_ADD("upd4701", UPD4701A, 0) MCFG_UPD4701_PORTX("AN1") MCFG_UPD4701_PORTY("AN2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( arknoid2, plumppop ) +MACHINE_CONFIG_DERIVED(arknoid2_state::arknoid2, plumppop) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_VBLANK_INT_DRIVER("screen", arknoid2_state, mcu_interrupt) @@ -1607,7 +1607,7 @@ static MACHINE_CONFIG_DERIVED( arknoid2, plumppop ) MCFG_DEVICE_DISABLE() MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( insectx, tnzs_base ) +MACHINE_CONFIG_DERIVED(insectx_state::insectx, tnzs_base) /* basic machine hardware */ MCFG_CPU_MODIFY("sub") MCFG_CPU_PROGRAM_MAP(insectx_sub_map) @@ -1623,7 +1623,7 @@ static MACHINE_CONFIG_DERIVED( insectx, tnzs_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kageki, tnzs_base ) +MACHINE_CONFIG_DERIVED(kageki_state::kageki, tnzs_base) /* basic machine hardware */ MCFG_CPU_MODIFY("sub") MCFG_CPU_PROGRAM_MAP(kageki_sub_map) @@ -1643,7 +1643,7 @@ static MACHINE_CONFIG_DERIVED( kageki, tnzs_base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tnzsb, tnzs_base ) +MACHINE_CONFIG_DERIVED(tnzsb_state::tnzsb, tnzs_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(tnzsb_main_map) @@ -1671,7 +1671,7 @@ static MACHINE_CONFIG_DERIVED( tnzsb, tnzs_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( kabukiz, tnzsb ) +MACHINE_CONFIG_DERIVED(kabukiz_state::kabukiz, tnzsb) /* basic machine hardware */ MCFG_CPU_MODIFY("sub") @@ -1691,7 +1691,7 @@ static MACHINE_CONFIG_DERIVED( kabukiz, tnzsb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jpopnics, tnzs_base ) +MACHINE_CONFIG_DERIVED(jpopnics_state::jpopnics, tnzs_base) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(jpopnics_main_map) diff --git a/src/mame/drivers/toaplan1.cpp b/src/mame/drivers/toaplan1.cpp index ba0e34bc7aa..f3f48ce50af 100644 --- a/src/mame/drivers/toaplan1.cpp +++ b/src/mame/drivers/toaplan1.cpp @@ -1887,7 +1887,7 @@ GFXDECODE_END #define VBSTART (240) -static MACHINE_CONFIG_START( rallybik ) +MACHINE_CONFIG_START(toaplan1_rallybik_state::rallybik) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) @@ -1933,7 +1933,7 @@ static MACHINE_CONFIG_START( rallybik ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( truxton ) +MACHINE_CONFIG_START(toaplan1_state::truxton) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) @@ -1971,7 +1971,7 @@ static MACHINE_CONFIG_START( truxton ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hellfire ) +MACHINE_CONFIG_START(toaplan1_state::hellfire) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) @@ -2009,7 +2009,7 @@ static MACHINE_CONFIG_START( hellfire ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( zerowing ) +MACHINE_CONFIG_START(toaplan1_state::zerowing) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) @@ -2047,7 +2047,7 @@ static MACHINE_CONFIG_START( zerowing ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( demonwld ) +MACHINE_CONFIG_START(toaplan1_state::demonwld) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) @@ -2090,7 +2090,7 @@ static MACHINE_CONFIG_START( demonwld ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( samesame ) +MACHINE_CONFIG_START(toaplan1_state::samesame) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) @@ -2128,7 +2128,7 @@ static MACHINE_CONFIG_START( samesame ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( outzone ) +MACHINE_CONFIG_START(toaplan1_state::outzone) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) @@ -2166,7 +2166,7 @@ static MACHINE_CONFIG_START( outzone ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( outzonecv ) +MACHINE_CONFIG_START(toaplan1_state::outzonecv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) @@ -2204,7 +2204,7 @@ static MACHINE_CONFIG_START( outzonecv ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vimana ) +MACHINE_CONFIG_START(toaplan1_state::vimana) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */ diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp index 2894b6c824b..de10496b334 100644 --- a/src/mame/drivers/toaplan2.cpp +++ b/src/mame/drivers/toaplan2.cpp @@ -3175,7 +3175,7 @@ static GFXDECODE_START( fixeightbl ) GFXDECODE_END -static MACHINE_CONFIG_START( tekipaki ) +MACHINE_CONFIG_START(toaplan2_state::tekipaki) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */ @@ -3219,7 +3219,7 @@ static MACHINE_CONFIG_START( tekipaki ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ghox ) +MACHINE_CONFIG_START(toaplan2_state::ghox) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */ @@ -3309,7 +3309,7 @@ a4849 cd */ -static MACHINE_CONFIG_START( dogyuun ) +MACHINE_CONFIG_START(toaplan2_state::dogyuun) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_25MHz/2) /* verified on pcb */ @@ -3354,7 +3354,7 @@ static MACHINE_CONFIG_START( dogyuun ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( kbash ) +MACHINE_CONFIG_START(toaplan2_state::kbash) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16MHz Oscillator */ @@ -3400,7 +3400,7 @@ static MACHINE_CONFIG_START( kbash ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( kbash2 ) +MACHINE_CONFIG_START(toaplan2_state::kbash2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16MHz Oscillator */ @@ -3437,7 +3437,7 @@ static MACHINE_CONFIG_START( kbash2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( truxton2 ) +MACHINE_CONFIG_START(toaplan2_state::truxton2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */ @@ -3484,7 +3484,7 @@ static MACHINE_CONFIG_START( truxton2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pipibibs ) +MACHINE_CONFIG_START(toaplan2_state::pipibibs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */ @@ -3526,7 +3526,7 @@ static MACHINE_CONFIG_START( pipibibs ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pipibibsbl ) +MACHINE_CONFIG_START(toaplan2_state::pipibibsbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */ @@ -3607,7 +3607,7 @@ static const uint8_t ts001turbo_decryption_table[256] = { }; -static MACHINE_CONFIG_START( fixeight ) +MACHINE_CONFIG_START(toaplan2_state::fixeight) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */ @@ -3650,7 +3650,7 @@ static MACHINE_CONFIG_START( fixeight ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fixeightbl ) +MACHINE_CONFIG_START(toaplan2_state::fixeightbl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */ @@ -3687,7 +3687,7 @@ static MACHINE_CONFIG_START( fixeightbl ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vfive ) +MACHINE_CONFIG_START(toaplan2_state::vfive) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */ @@ -3726,7 +3726,7 @@ static MACHINE_CONFIG_START( vfive ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( batsugun ) +MACHINE_CONFIG_START(toaplan2_state::batsugun) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */ @@ -3772,7 +3772,7 @@ static MACHINE_CONFIG_START( batsugun ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pwrkick ) +MACHINE_CONFIG_START(toaplan2_state::pwrkick) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -3808,7 +3808,7 @@ static MACHINE_CONFIG_START( pwrkick ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( othldrby ) +MACHINE_CONFIG_START(toaplan2_state::othldrby) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(othldrby_68k_mem) @@ -3842,7 +3842,7 @@ static MACHINE_CONFIG_START( othldrby ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( enmadaio ) +MACHINE_CONFIG_START(toaplan2_state::enmadaio) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) MCFG_CPU_PROGRAM_MAP(enmadaio_68k_mem) @@ -3875,7 +3875,7 @@ static MACHINE_CONFIG_START( enmadaio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( snowbro2 ) +MACHINE_CONFIG_START(toaplan2_state::snowbro2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -3912,7 +3912,7 @@ static MACHINE_CONFIG_START( snowbro2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( mahoudai ) +MACHINE_CONFIG_START(toaplan2_state::mahoudai) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */ @@ -3957,7 +3957,7 @@ static MACHINE_CONFIG_START( mahoudai ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( shippumd ) +MACHINE_CONFIG_START(toaplan2_state::shippumd) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */ @@ -4001,7 +4001,7 @@ static MACHINE_CONFIG_START( shippumd ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bgaregga ) +MACHINE_CONFIG_START(toaplan2_state::bgaregga) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */ @@ -4053,14 +4053,14 @@ static MACHINE_CONFIG_START( bgaregga ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bgareggabl, bgaregga ) +MACHINE_CONFIG_DERIVED(toaplan2_state::bgareggabl, bgaregga) MCFG_VIDEO_START_OVERRIDE(toaplan2_state,bgareggabl) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_bootleg) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( batrider ) +MACHINE_CONFIG_START(toaplan2_state::batrider) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator (verified) */ @@ -4118,7 +4118,7 @@ static MACHINE_CONFIG_START( batrider ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bbakraid ) +MACHINE_CONFIG_START(toaplan2_state::bbakraid) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */ diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp index 5d82724f2e3..f14f204ee7f 100644 --- a/src/mame/drivers/toki.cpp +++ b/src/mame/drivers/toki.cpp @@ -485,7 +485,7 @@ GFXDECODE_END /*****************************************************************************/ -static MACHINE_CONFIG_START( toki ) /* KOYO 20.000MHz near the cpu */ +MACHINE_CONFIG_START(toki_state::toki) /* KOYO 20.000MHz near the cpu */ /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,XTAL_20MHz /2) /* verified on pcb */ @@ -531,7 +531,7 @@ static MACHINE_CONFIG_START( toki ) /* KOYO 20.000MHz near the cpu */ MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jujuba, toki ) +MACHINE_CONFIG_DERIVED(toki_state::jujuba, toki) MCFG_DEVICE_REMOVE("sei80bu") MCFG_DEVICE_MODIFY("audiocpu") @@ -539,7 +539,7 @@ static MACHINE_CONFIG_DERIVED( jujuba, toki ) MCFG_CPU_DECRYPTED_OPCODES_MAP(jujuba_audio_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tokib ) +MACHINE_CONFIG_START(toki_state::tokib) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10MHz causes bad slowdowns with monkey machine rd1, but is correct, 20Mhz XTAL */ diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp index a2d946078c3..66e75507a28 100644 --- a/src/mame/drivers/tomcat.cpp +++ b/src/mame/drivers/tomcat.cpp @@ -83,6 +83,7 @@ public: required_device m_maincpu; required_device m_dsp; required_device m_mainlatch; + void tomcat(machine_config &config); }; @@ -319,7 +320,7 @@ void tomcat_state::machine_start() m_dsp_BIO = 0; } -static MACHINE_CONFIG_START( tomcat ) +MACHINE_CONFIG_START(tomcat_state::tomcat) MCFG_CPU_ADD("maincpu", M68010, XTAL_12MHz / 2) MCFG_CPU_PROGRAM_MAP(tomcat_map) MCFG_CPU_PERIODIC_INT_DRIVER(tomcat_state, irq1_line_assert, 5*60) diff --git a/src/mame/drivers/tonton.cpp b/src/mame/drivers/tonton.cpp index b1c07e2eca6..bccd4ae0981 100644 --- a/src/mame/drivers/tonton.cpp +++ b/src/mame/drivers/tonton.cpp @@ -50,6 +50,7 @@ public: virtual void machine_reset() override; required_device m_maincpu; required_device m_hopper; + void tonton(machine_config &config); }; #define MAIN_CLOCK XTAL_21_4772MHz @@ -215,7 +216,7 @@ WRITE8_MEMBER(tonton_state::ay_bout_w) * Machine Driver * *************************************************/ -static MACHINE_CONFIG_START( tonton ) +MACHINE_CONFIG_START(tonton_state::tonton) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, CPU_CLOCK) /* Guess. According to other MSX2 based gambling games */ diff --git a/src/mame/drivers/toobin.cpp b/src/mame/drivers/toobin.cpp index 41a2e70d39e..ed71e1c7cfb 100644 --- a/src/mame/drivers/toobin.cpp +++ b/src/mame/drivers/toobin.cpp @@ -196,7 +196,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( toobin ) +MACHINE_CONFIG_START(toobin_state::toobin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, MASTER_CLOCK/4) diff --git a/src/mame/drivers/topspeed.cpp b/src/mame/drivers/topspeed.cpp index 32f27f85f33..da52a3c9734 100644 --- a/src/mame/drivers/topspeed.cpp +++ b/src/mame/drivers/topspeed.cpp @@ -568,7 +568,7 @@ void topspeed_state::machine_reset() } -static MACHINE_CONFIG_START( topspeed ) +MACHINE_CONFIG_START(topspeed_state::topspeed) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz / 2) diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp index 893c89c82dc..8c6311df605 100644 --- a/src/mame/drivers/toratora.cpp +++ b/src/mame/drivers/toratora.cpp @@ -93,6 +93,7 @@ public: virtual void machine_reset() override; uint32_t screen_update_toratora(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(toratora_timer); + void toratora(machine_config &config); }; @@ -390,7 +391,7 @@ void toratora_state::machine_reset() m_clear_tv = 0; } -static MACHINE_CONFIG_START( toratora ) +MACHINE_CONFIG_START(toratora_state::toratora) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 5185000 / 8) /* 5.185 MHz XTAL divided by 8 (@ U94.12) */ diff --git a/src/mame/drivers/tosh1000.cpp b/src/mame/drivers/tosh1000.cpp index f53b6662436..063b333d5c0 100644 --- a/src/mame/drivers/tosh1000.cpp +++ b/src/mame/drivers/tosh1000.cpp @@ -81,6 +81,8 @@ public: DECLARE_WRITE8_MEMBER(bram_w); DECLARE_READ8_MEMBER(bram_r); + static void cfg_fdc_35(device_t *device); + void tosh1000(machine_config &config); protected: required_device m_maincpu; required_device m_bankdev; @@ -237,15 +239,14 @@ static ADDRESS_MAP_START( tosh1000_io, AS_IO, 8, tosh1000_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( cfg_fdc_35 ) - MCFG_DEVICE_MODIFY("fdc:0") - MCFG_SLOT_DEFAULT_OPTION("35dd") - MCFG_SLOT_FIXED(true) - - MCFG_DEVICE_REMOVE("fdc:1") -MACHINE_CONFIG_END +void tosh1000_state::cfg_fdc_35(device_t *device) +{ + device_slot_interface::static_set_default_option(*device->subdevice("fdc:0"), "35dd"); + device_slot_interface::static_set_fixed(*device->subdevice("fdc:0"), true); + device_slot_interface::static_set_default_option(*device->subdevice("fdc:1"), ""); +} -static MACHINE_CONFIG_START( tosh1000 ) +MACHINE_CONFIG_START(tosh1000_state::tosh1000) MCFG_CPU_ADD("maincpu", I8088, XTAL_5MHz) MCFG_CPU_PROGRAM_MAP(tosh1000_map) MCFG_CPU_IO_MAP(tosh1000_io) diff --git a/src/mame/drivers/tourtabl.cpp b/src/mame/drivers/tourtabl.cpp index f87eceb031c..284df7959e9 100644 --- a/src/mame/drivers/tourtabl.cpp +++ b/src/mame/drivers/tourtabl.cpp @@ -30,6 +30,7 @@ public: DECLARE_WRITE8_MEMBER(tourtabl_led_w); DECLARE_READ16_MEMBER(tourtabl_read_input_port); DECLARE_READ8_MEMBER(tourtabl_get_databus_contents); + void tourtabl(machine_config &config); }; @@ -146,7 +147,7 @@ static INPUT_PORTS_START( tourtabl ) INPUT_PORTS_END -static MACHINE_CONFIG_START( tourtabl ) +MACHINE_CONFIG_START(tourtabl_state::tourtabl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 3) /* actually M6507 */ MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp index 781a7e81f1e..c3c76dfadff 100644 --- a/src/mame/drivers/tourvis.cpp +++ b/src/mame/drivers/tourvis.cpp @@ -208,6 +208,7 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(tourvision_cart); + void tourvision(machine_config &config); private: required_device m_subcpu; required_device m_cart; @@ -385,7 +386,7 @@ WRITE_LINE_MEMBER(tourvision_state::tourvision_timer_out) } -static MACHINE_CONFIG_START( tourvision ) +MACHINE_CONFIG_START(tourvision_state::tourvision) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3) MCFG_CPU_PROGRAM_MAP(pce_mem) diff --git a/src/mame/drivers/toypop.cpp b/src/mame/drivers/toypop.cpp index 20dbcc9b7ae..ddc9528628a 100644 --- a/src/mame/drivers/toypop.cpp +++ b/src/mame/drivers/toypop.cpp @@ -101,6 +101,8 @@ public: DECLARE_WRITE8_MEMBER(sound_halt_ctrl_w); DECLARE_READ8_MEMBER(bg_rmw_r); DECLARE_WRITE8_MEMBER(bg_rmw_w); + void toypop(machine_config &config); + void liblrabl(machine_config &config); protected: // driver_device overrides // virtual void machine_start() override; @@ -652,7 +654,7 @@ INTERRUPT_GEN_MEMBER(namcos16_state::slave_vblank_irq) device.execute().set_input_line(6,HOLD_LINE); } -static MACHINE_CONFIG_START( liblrabl ) +MACHINE_CONFIG_START(namcos16_state::liblrabl) MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/4) MCFG_CPU_PROGRAM_MAP(master_liblrabl_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos16_state, master_scanline, "screen", 0, 1) @@ -701,7 +703,7 @@ static MACHINE_CONFIG_START( liblrabl ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( toypop, liblrabl ) +MACHINE_CONFIG_DERIVED(namcos16_state::toypop, liblrabl) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(master_toypop_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tp84.cpp b/src/mame/drivers/tp84.cpp index b0cb4e71096..3d1a5affa0f 100644 --- a/src/mame/drivers/tp84.cpp +++ b/src/mame/drivers/tp84.cpp @@ -328,7 +328,7 @@ INTERRUPT_GEN_MEMBER(tp84_state::sub_vblank_irq) } -static MACHINE_CONFIG_START( tp84 ) +MACHINE_CONFIG_START(tp84_state::tp84) /* basic machine hardware */ MCFG_CPU_ADD("cpu1", MC6809E, XTAL_18_432MHz/12) /* verified on pcb */ @@ -390,7 +390,7 @@ static MACHINE_CONFIG_START( tp84 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tp84b, tp84 ) +MACHINE_CONFIG_DERIVED(tp84_state::tp84b, tp84) MCFG_CPU_MODIFY("cpu1") MCFG_CPU_PROGRAM_MAP(tp84b_cpu1_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tr175.cpp b/src/mame/drivers/tr175.cpp index b234bd27623..9daa5583716 100644 --- a/src/mame/drivers/tr175.cpp +++ b/src/mame/drivers/tr175.cpp @@ -26,6 +26,7 @@ public: DECLARE_READ8_MEMBER(fff400_r); SCN2674_DRAW_CHARACTER_MEMBER(draw_character); + void tr175(machine_config &config); private: required_device m_maincpu; }; @@ -77,7 +78,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( tr175 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( tr175 ) +MACHINE_CONFIG_START(tr175_state::tr175) MCFG_CPU_ADD("maincpu", M68000, 12'000'000) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/tr606.cpp b/src/mame/drivers/tr606.cpp index 95a18f94525..601a233cad3 100644 --- a/src/mame/drivers/tr606.cpp +++ b/src/mame/drivers/tr606.cpp @@ -31,6 +31,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(tp3_clear) { m_maincpu->set_input_line(0, CLEAR_LINE); } virtual void machine_start() override; + void tr606(machine_config &config); }; // TP2 to MCU CLK: LC circuit(TI S74230), stable sine wave, 2.2us interval @@ -77,7 +78,7 @@ void tr606_state::machine_start() // register for savestates } -static MACHINE_CONFIG_START( tr606 ) +MACHINE_CONFIG_START(tr606_state::tr606) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NEC_D650, TP2_HZ) diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp index 36cdc4f07c4..e9ec7b54103 100644 --- a/src/mame/drivers/trackfld.cpp +++ b/src/mame/drivers/trackfld.cpp @@ -892,7 +892,7 @@ INTERRUPT_GEN_MEMBER(trackfld_state::vblank_nmi) device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -static MACHINE_CONFIG_START( trackfld ) +MACHINE_CONFIG_START(trackfld_state::trackfld) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI1, MASTER_CLOCK/6/2) /* a guess for now */ @@ -960,7 +960,7 @@ INTERRUPT_GEN_MEMBER(trackfld_state::yieartf_timer_irq) device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -static MACHINE_CONFIG_START( yieartf ) +MACHINE_CONFIG_START(trackfld_state::yieartf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/6/2) /* a guess for now */ @@ -1023,9 +1023,31 @@ static MACHINE_CONFIG_START( yieartf ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END +static ADDRESS_MAP_START( hyprolyb_adpcm_map, AS_PROGRAM, 8, hyprolyb_adpcm_device ) + AM_RANGE(0x0000, 0x007f) AM_RAM + AM_RANGE(0x1000, 0x1000) AM_DEVREAD("hyprolyb_adpcm", hyprolyb_adpcm_device, data_r) + AM_RANGE(0x1001, 0x1001) AM_DEVREAD("hyprolyb_adpcm", hyprolyb_adpcm_device, ready_r) + AM_RANGE(0x1002, 0x1002) AM_DEVWRITE("hyprolyb_adpcm", hyprolyb_adpcm_device, msm_data_w) + AM_RANGE(0x1003, 0x1003) AM_DEVREAD("hyprolyb_adpcm", hyprolyb_adpcm_device, msm_vck_r) + // on init: + // $1003 = $00 + // $1002 = $FF + // $1003 = $34 + // $1001 = $36 + // $1002 = $80 + // loops while ($1003) & 0x80 == 0 + // 1002 = ADPCM data written (low 4 bits) + // + // $1003 & $80 (in) = 5205 DRQ + // $1002 & $0f (out) = 5205 data + // $1001 & $80 (in) = sound latch request + // $1000 (in) = sound latch data + AM_RANGE(0x8000, 0xffff) AM_ROM +ADDRESS_MAP_END + /* same as the original, but uses ADPCM instead of VLM5030 */ /* also different memory handlers do handle that */ -static MACHINE_CONFIG_DERIVED( hyprolyb, trackfld ) +MACHINE_CONFIG_DERIVED(trackfld_state::hyprolyb, trackfld) MCFG_CPU_MODIFY("audiocpu") MCFG_CPU_PROGRAM_MAP(hyprolyb_sound_map) @@ -1035,16 +1057,26 @@ static MACHINE_CONFIG_DERIVED( hyprolyb, trackfld ) /* sound hardware */ MCFG_DEVICE_REMOVE("vlm") - MCFG_FRAGMENT_ADD(hyprolyb_adpcm) + MCFG_CPU_ADD("adpcm", M6802, XTAL_14_31818MHz/8) /* unknown clock */ + MCFG_CPU_PROGRAM_MAP(hyprolyb_adpcm_map) + + MCFG_GENERIC_LATCH_8_ADD("soundlatch2") + + MCFG_SOUND_ADD("hyprolyb_adpcm", HYPROLYB_ADPCM, 0) + + MCFG_SOUND_ADD("msm", MSM5205, 384000) + MCFG_MSM5205_VCLK_CB(DEVWRITELINE("hyprolyb_adpcm", hyprolyb_adpcm_device, vck_callback)) /* VCK function */ + MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4 kHz */ + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( atlantol, hyprolyb ) +MACHINE_CONFIG_DERIVED(trackfld_state::atlantol, hyprolyb) MCFG_VIDEO_START_OVERRIDE(trackfld_state,atlantol) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mastkin, trackfld ) +MACHINE_CONFIG_DERIVED(trackfld_state::mastkin, trackfld) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", MC6809E, MASTER_CLOCK/6/2) /* a guess for now */ @@ -1056,7 +1088,7 @@ static MACHINE_CONFIG_DERIVED( mastkin, trackfld ) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // actually not used MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wizzquiz, trackfld ) +MACHINE_CONFIG_DERIVED(trackfld_state::wizzquiz, trackfld) /* basic machine hardware */ // right cpu? @@ -1068,7 +1100,7 @@ static MACHINE_CONFIG_DERIVED( wizzquiz, trackfld ) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(trackfld_state, nmi_mask_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( reaktor, trackfld ) +MACHINE_CONFIG_DERIVED(trackfld_state::reaktor, trackfld) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu",Z80,MASTER_CLOCK/6) diff --git a/src/mame/drivers/tranz330.cpp b/src/mame/drivers/tranz330.cpp index efa88fe2869..e93294a792f 100644 --- a/src/mame/drivers/tranz330.cpp +++ b/src/mame/drivers/tranz330.cpp @@ -150,7 +150,7 @@ static const z80_daisy_config tranz330_daisy_chain[] = // * - check clocks // ? - check purported RS232 hookup, inconsistent information found at the relevant webpage vs. user-submitted errata -static MACHINE_CONFIG_START( tranz330 ) +MACHINE_CONFIG_START(tranz330_state::tranz330) MCFG_CPU_ADD(CPU_TAG, Z80, XTAL_7_15909MHz/2) //* MCFG_CPU_PROGRAM_MAP(tranz330_mem) MCFG_CPU_IO_MAP(tranz330_io) diff --git a/src/mame/drivers/travrusa.cpp b/src/mame/drivers/travrusa.cpp index 0f25e399485..7411a30540f 100644 --- a/src/mame/drivers/travrusa.cpp +++ b/src/mame/drivers/travrusa.cpp @@ -303,7 +303,7 @@ void travrusa_state::machine_reset() m_scrollx[1] = 0; } -static MACHINE_CONFIG_START( travrusa ) +MACHINE_CONFIG_START(travrusa_state::travrusa) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */ @@ -334,7 +334,7 @@ static MACHINE_CONFIG_START( travrusa ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shtrider, travrusa ) +MACHINE_CONFIG_DERIVED(travrusa_state::shtrider, travrusa) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", shtrider) @@ -342,7 +342,7 @@ static MACHINE_CONFIG_DERIVED( shtrider, travrusa ) MCFG_PALETTE_INIT_OWNER(travrusa_state,shtrider) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( shtriderb, travrusa ) +MACHINE_CONFIG_DERIVED(travrusa_state::shtriderb, travrusa) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", shtrider) diff --git a/src/mame/drivers/tricep.cpp b/src/mame/drivers/tricep.cpp index 7110250a508..1f6e2bca15e 100644 --- a/src/mame/drivers/tricep.cpp +++ b/src/mame/drivers/tricep.cpp @@ -29,6 +29,7 @@ public: DECLARE_WRITE16_MEMBER(tricep_terminal_w); void kbd_put(u8 data); + void tricep(machine_config &config); protected: virtual void machine_reset() override; @@ -74,7 +75,7 @@ void tricep_state::kbd_put(u8 data) { } -static MACHINE_CONFIG_START( tricep ) +MACHINE_CONFIG_START(tricep_state::tricep) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(tricep_mem) diff --git a/src/mame/drivers/triforce.cpp b/src/mame/drivers/triforce.cpp index 8b7048cc867..5579cf438e2 100644 --- a/src/mame/drivers/triforce.cpp +++ b/src/mame/drivers/triforce.cpp @@ -461,6 +461,8 @@ public: virtual void video_start() override; uint32_t screen_update_triforce(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void triforcegd(machine_config &config); + void triforce_base(machine_config &config); }; READ64_MEMBER(triforce_state::gc_pi_r) @@ -564,7 +566,7 @@ void triforce_state::machine_start() descrambler(&rom[0x100], 0x1afe00); } -static MACHINE_CONFIG_START( triforce_base ) +MACHINE_CONFIG_START(triforce_state::triforce_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC603, 64000000) /* Correct CPU is a PowerPC 750 (what Apple called "G3") with paired-single vector instructions added */ @@ -584,7 +586,7 @@ static MACHINE_CONFIG_START( triforce_base ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( triforcegd, triforce_base ) +MACHINE_CONFIG_DERIVED(triforce_state::triforcegd, triforce_base) MCFG_NAOMI_GDROM_BOARD_ADD("rom_board", ":gdrom", ":pic", nullptr, NOOP) MACHINE_CONFIG_END diff --git a/src/mame/drivers/triplhnt.cpp b/src/mame/drivers/triplhnt.cpp index cd4db00a741..26b5c122f3f 100644 --- a/src/mame/drivers/triplhnt.cpp +++ b/src/mame/drivers/triplhnt.cpp @@ -289,7 +289,7 @@ PALETTE_INIT_MEMBER(triplhnt_state, triplhnt) } -static MACHINE_CONFIG_START( triplhnt ) +MACHINE_CONFIG_START(triplhnt_state::triplhnt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 800000) diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp index 7891e4a906e..525c9a07eba 100644 --- a/src/mame/drivers/trs80.cpp +++ b/src/mame/drivers/trs80.cpp @@ -591,7 +591,7 @@ static SLOT_INTERFACE_START( trs80_floppies ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( trs80 ) // the original model I, level I, with no extras +MACHINE_CONFIG_START(trs80_state::trs80) // the original model I, level I, with no extras /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 1796000) /* 1.796 MHz */ MCFG_CPU_PROGRAM_MAP(trs80_map) @@ -621,7 +621,7 @@ static MACHINE_CONFIG_START( trs80 ) // the original model I, level I, wit MCFG_CASSETTE_ADD( "cassette" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( model1, trs80 ) // model I, level II +MACHINE_CONFIG_DERIVED(trs80_state::model1, trs80) // model I, level II MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( model1_map) MCFG_CPU_IO_MAP( model1_io) @@ -659,7 +659,7 @@ static MACHINE_CONFIG_DERIVED( model1, trs80 ) // model I, level II MCFG_AY31015_TX_CLOCK(0.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( model3, model1 ) +MACHINE_CONFIG_DERIVED(trs80_state::model3, model1) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( model3_map) MCFG_CPU_IO_MAP( model3_io) @@ -675,28 +675,28 @@ static MACHINE_CONFIG_DERIVED( model3, model1 ) MCFG_SCREEN_VISIBLE_AREA(0,80*8-1,0,239) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( model4, model3 ) +MACHINE_CONFIG_DERIVED(trs80_state::model4, model3) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_IO_MAP( model4_io) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( model4p, model3 ) +MACHINE_CONFIG_DERIVED(trs80_state::model4p, model3) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_IO_MAP( model4p_io) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sys80, model1 ) +MACHINE_CONFIG_DERIVED(trs80_state::sys80, model1) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_IO_MAP( sys80_io) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ht1080z, sys80 ) +MACHINE_CONFIG_DERIVED(trs80_state::ht1080z, sys80) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_ht1080z) MCFG_GFXDECODE_MODIFY("gfxdecode", ht1080z) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lnw80, model1 ) +MACHINE_CONFIG_DERIVED(trs80_state::lnw80, model1) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( lnw80_map) MCFG_CPU_IO_MAP( lnw80_io) @@ -713,7 +713,7 @@ static MACHINE_CONFIG_DERIVED( lnw80, model1 ) MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_lnw80) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( radionic, model1 ) +MACHINE_CONFIG_DERIVED(trs80_state::radionic, model1) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(64*8, 16*16) MCFG_SCREEN_VISIBLE_AREA(0,64*8-1,0,16*16-1) @@ -721,7 +721,7 @@ static MACHINE_CONFIG_DERIVED( radionic, model1 ) MCFG_GFXDECODE_MODIFY("gfxdecode", radionic) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( meritum, sys80 ) +MACHINE_CONFIG_DERIVED(trs80_state::meritum, sys80) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP( meritum_map) MCFG_CPU_IO_MAP( meritum_io) @@ -730,7 +730,7 @@ static MACHINE_CONFIG_DERIVED( meritum, sys80 ) MCFG_GFXDECODE_MODIFY("gfxdecode", meritum) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cp500, model3 ) +MACHINE_CONFIG_DERIVED(trs80_state::cp500, model3) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_IO_MAP( cp500_io) diff --git a/src/mame/drivers/trs80dt1.cpp b/src/mame/drivers/trs80dt1.cpp index 25930b6881e..36c49f15310 100644 --- a/src/mame/drivers/trs80dt1.cpp +++ b/src/mame/drivers/trs80dt1.cpp @@ -61,6 +61,7 @@ public: DECLARE_WRITE8_MEMBER(port3_w); I8275_DRAW_CHARACTER_MEMBER(crtc_update_row); + void trs80dt1(machine_config &config); private: bool m_bow; virtual void machine_reset() override; @@ -307,7 +308,7 @@ I8275_DRAW_CHARACTER_MEMBER( trs80dt1_state::crtc_update_row ) } -static MACHINE_CONFIG_START( trs80dt1 ) +MACHINE_CONFIG_START(trs80dt1_state::trs80dt1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8051, 7372800) MCFG_CPU_PROGRAM_MAP(prg_map) diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp index c28d9a36c2c..5dccb534093 100644 --- a/src/mame/drivers/trs80m2.cpp +++ b/src/mame/drivers/trs80m2.cpp @@ -702,7 +702,7 @@ void trs80m2_state::machine_reset() // MACHINE_CONFIG( trs80m2 ) //------------------------------------------------- -static MACHINE_CONFIG_START( trs80m2 ) +MACHINE_CONFIG_START(trs80m2_state::trs80m2) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain) @@ -787,7 +787,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( trs80m16 ) //------------------------------------------------- -static MACHINE_CONFIG_START( trs80m16 ) +MACHINE_CONFIG_START(trs80m16_state::trs80m16) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain) diff --git a/src/mame/drivers/truco.cpp b/src/mame/drivers/truco.cpp index cf2bb59b5b6..27731b770ba 100644 --- a/src/mame/drivers/truco.cpp +++ b/src/mame/drivers/truco.cpp @@ -416,7 +416,7 @@ INTERRUPT_GEN_MEMBER(truco_state::interrupt) * Machine Driver * *******************************************/ -static MACHINE_CONFIG_START( truco ) +MACHINE_CONFIG_START(truco_state::truco) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, CPU_CLOCK) diff --git a/src/mame/drivers/trucocl.cpp b/src/mame/drivers/trucocl.cpp index 62eb1cd3377..079130f6dd8 100644 --- a/src/mame/drivers/trucocl.cpp +++ b/src/mame/drivers/trucocl.cpp @@ -142,7 +142,7 @@ INTERRUPT_GEN_MEMBER(trucocl_state::trucocl_interrupt) } -static MACHINE_CONFIG_START( trucocl ) +MACHINE_CONFIG_START(trucocl_state::trucocl) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp index db193b7196c..bf2c14e461c 100644 --- a/src/mame/drivers/trvmadns.cpp +++ b/src/mame/drivers/trvmadns.cpp @@ -124,6 +124,7 @@ public: required_device m_gfxdecode; required_device m_palette; required_shared_ptr m_generic_paletteram_8; + void trvmadns(machine_config &config); }; @@ -379,7 +380,7 @@ void trvmadns_state::machine_reset() m_old_data = -1; } -static MACHINE_CONFIG_START( trvmadns ) +MACHINE_CONFIG_START(trvmadns_state::trvmadns) MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/4) // Most likely 2.5MHz (less likely 5MHz (10MHz/2)) MCFG_CPU_PROGRAM_MAP(cpu_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/trvquest.cpp b/src/mame/drivers/trvquest.cpp index 8e2079cdaf9..f90c3f657d7 100644 --- a/src/mame/drivers/trvquest.cpp +++ b/src/mame/drivers/trvquest.cpp @@ -177,7 +177,7 @@ INTERRUPT_GEN_MEMBER(gameplan_state::trvquest_interrupt) m_via_2->write_ca1(0); } -static MACHINE_CONFIG_START( trvquest ) +MACHINE_CONFIG_START(gameplan_state::trvquest) MCFG_CPU_ADD("maincpu", M6809,XTAL_6MHz/4) MCFG_CPU_PROGRAM_MAP(cpu_map) diff --git a/src/mame/drivers/tryout.cpp b/src/mame/drivers/tryout.cpp index 5a0941ad553..30775b52694 100644 --- a/src/mame/drivers/tryout.cpp +++ b/src/mame/drivers/tryout.cpp @@ -189,7 +189,7 @@ static GFXDECODE_START( tryout ) GFXDECODE_ENTRY( nullptr, 0, vramlayout, 0, 4 ) GFXDECODE_END -static MACHINE_CONFIG_START( tryout ) +MACHINE_CONFIG_START(tryout_state::tryout) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 2000000) /* ? */ MCFG_CPU_PROGRAM_MAP(main_cpu) diff --git a/src/mame/drivers/ts3000.cpp b/src/mame/drivers/ts3000.cpp index a54e870bf38..e113578f402 100644 --- a/src/mame/drivers/ts3000.cpp +++ b/src/mame/drivers/ts3000.cpp @@ -21,6 +21,7 @@ public: // , m_maincpu(*this, "maincpu") { } +void ts3000(machine_config &config); private: // required_device m_maincpu; }; @@ -36,7 +37,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( ts3000 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( ts3000 ) +MACHINE_CONFIG_START(ts3000_state::ts3000) MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3) // no idea of clock MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp index 84319cea6e7..9bcf306314e 100644 --- a/src/mame/drivers/ts802.cpp +++ b/src/mame/drivers/ts802.cpp @@ -54,6 +54,7 @@ public: DECLARE_READ8_MEMBER(io_read_byte); DECLARE_WRITE8_MEMBER(io_write_byte); void kbd_put(u8 data); + void ts802(machine_config &config); private: uint8_t m_term_data; address_space *m_mem; @@ -179,7 +180,7 @@ DRIVER_INIT_MEMBER( ts802_state, ts802 ) membank("bankw0")->configure_entry(0, &main[0x0000]); } -static MACHINE_CONFIG_START( ts802 ) +MACHINE_CONFIG_START(ts802_state::ts802) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(ts802_mem) diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp index 25a2cb8b41d..66d36732abc 100644 --- a/src/mame/drivers/ts803.cpp +++ b/src/mame/drivers/ts803.cpp @@ -84,6 +84,7 @@ public: DECLARE_DRIVER_INIT(ts803); uint32_t screen_update_ts803(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void ts803(machine_config &config); private: std::unique_ptr m_videoram; std::unique_ptr m_56kram; @@ -411,7 +412,7 @@ static const z80_daisy_config daisy_chain[] = { nullptr } }; -static MACHINE_CONFIG_START( ts803 ) +MACHINE_CONFIG_START(ts803_state::ts803) MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/4) MCFG_CPU_PROGRAM_MAP(ts803_mem) MCFG_CPU_IO_MAP(ts803_io) diff --git a/src/mame/drivers/ts816.cpp b/src/mame/drivers/ts816.cpp index 6d750775526..367fdc7238c 100644 --- a/src/mame/drivers/ts816.cpp +++ b/src/mame/drivers/ts816.cpp @@ -44,6 +44,7 @@ public: DECLARE_WRITE8_MEMBER(portf0_w); DECLARE_DRIVER_INIT(ts816); + void ts816(machine_config &config); private: uint8_t m_term_data; uint8_t m_status; @@ -255,7 +256,7 @@ DRIVER_INIT_MEMBER( ts816_state, ts816 ) membank("bank2")->configure_entry(1, &rams[0x1e000]); } -static MACHINE_CONFIG_START( ts816 ) +MACHINE_CONFIG_START(ts816_state::ts816) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(ts816_mem) diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp index 6b300c8029c..7e1e4943683 100644 --- a/src/mame/drivers/tsamurai.cpp +++ b/src/mame/drivers/tsamurai.cpp @@ -702,7 +702,7 @@ GFXDECODE_END /*******************************************************************************/ -static MACHINE_CONFIG_START( tsamurai ) +MACHINE_CONFIG_START(tsamurai_state::tsamurai) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/8) @@ -752,7 +752,7 @@ static MACHINE_CONFIG_START( tsamurai ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vsgongf ) +MACHINE_CONFIG_START(tsamurai_state::vsgongf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/8) @@ -800,7 +800,7 @@ static MACHINE_CONFIG_START( vsgongf ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( m660 ) +MACHINE_CONFIG_START(tsamurai_state::m660) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/8) diff --git a/src/mame/drivers/tsispch.cpp b/src/mame/drivers/tsispch.cpp index ac131b6956d..d4e54bce8b8 100644 --- a/src/mame/drivers/tsispch.cpp +++ b/src/mame/drivers/tsispch.cpp @@ -372,7 +372,7 @@ INPUT_PORTS_END /****************************************************************************** Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( prose2k ) +MACHINE_CONFIG_START(tsispch_state::prose2k) /* basic machine hardware */ /* There are two crystals on the board: a 24MHz xtal at Y2 and a 16MHz xtal at Y1 */ MCFG_CPU_ADD("maincpu", I8086, 8000000) /* VERIFIED clock, unknown divider */ diff --git a/src/mame/drivers/ttchamp.cpp b/src/mame/drivers/ttchamp.cpp index 20bbc4261e2..625f912fc64 100644 --- a/src/mame/drivers/ttchamp.cpp +++ b/src/mame/drivers/ttchamp.cpp @@ -141,6 +141,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(irq); + void ttchamp(machine_config &config); }; ALLOW_SAVE_TYPE(ttchamp_state::picmode); @@ -637,7 +638,7 @@ INTERRUPT_GEN_MEMBER(ttchamp_state::irq)/* right? */ device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( ttchamp ) +MACHINE_CONFIG_START(ttchamp_state::ttchamp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30, 8000000) MCFG_CPU_PROGRAM_MAP(ttchamp_map) diff --git a/src/mame/drivers/tti.cpp b/src/mame/drivers/tti.cpp index a8665790e6e..14f3f2d834e 100644 --- a/src/mame/drivers/tti.cpp +++ b/src/mame/drivers/tti.cpp @@ -33,6 +33,7 @@ public: IRQ_CALLBACK_MEMBER(intack); + void tti(machine_config &config); protected: required_device m_maincpu; required_device m_mfp; @@ -53,7 +54,7 @@ static ADDRESS_MAP_START( prg_map, AS_PROGRAM, 8, tti_state ) AM_RANGE(0x80070, 0x80077) AM_DEVWRITE("bitlatch", ls259_device, write_d0) ADDRESS_MAP_END -static MACHINE_CONFIG_START( tti ) +MACHINE_CONFIG_START(tti_state::tti) MCFG_DEVICE_ADD("maincpu", M68008, XTAL_20MHz / 2) // guess MCFG_CPU_PROGRAM_MAP(prg_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(tti_state, intack) diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp index 856bfd29ed8..0111fe5c7a5 100644 --- a/src/mame/drivers/tubep.cpp +++ b/src/mame/drivers/tubep.cpp @@ -807,7 +807,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( tubep ) +MACHINE_CONFIG_START(tubep_state::tubep) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */ @@ -870,7 +870,7 @@ static MACHINE_CONFIG_START( tubep ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tubepb, tubep ) +MACHINE_CONFIG_DERIVED(tubep_state::tubepb, tubep) MCFG_CPU_REPLACE("mcu", M6802,6000000) /* ? MHz Xtal */ MCFG_CPU_PROGRAM_MAP(nsc_map) @@ -878,7 +878,7 @@ static MACHINE_CONFIG_DERIVED( tubepb, tubep ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( rjammer ) +MACHINE_CONFIG_START(tubep_state::rjammer) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */ diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp index 4ef5c6de3bd..5aedfd13a0f 100644 --- a/src/mame/drivers/tugboat.cpp +++ b/src/mame/drivers/tugboat.cpp @@ -78,6 +78,7 @@ public: void draw_tilemap(bitmap_ind16 &bitmap,const rectangle &cliprect, int addr,int gfx0,int gfx1,int transparency); + void tugboat(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -358,7 +359,7 @@ static GFXDECODE_START( tugboat ) GFXDECODE_END -static MACHINE_CONFIG_START( tugboat ) +MACHINE_CONFIG_START(tugboat_state::tugboat) MCFG_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz ???? */ MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", tugboat_state, nmi_line_pulse) diff --git a/src/mame/drivers/tumbleb.cpp b/src/mame/drivers/tumbleb.cpp index d9ed553d0cc..200d8664825 100644 --- a/src/mame/drivers/tumbleb.cpp +++ b/src/mame/drivers/tumbleb.cpp @@ -2041,7 +2041,7 @@ MACHINE_RESET_MEMBER(tumbleb_state,tumbleb) memset(m_control_0, 0, sizeof(m_control_0)); } -static MACHINE_CONFIG_START( tumblepb ) +MACHINE_CONFIG_START(tumbleb_state::tumblepb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14000000) @@ -2079,7 +2079,7 @@ static MACHINE_CONFIG_START( tumblepb ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tumbleb2 ) +MACHINE_CONFIG_START(tumbleb_state::tumbleb2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14000000) @@ -2116,7 +2116,7 @@ static MACHINE_CONFIG_START( tumbleb2 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( jumpkids ) +MACHINE_CONFIG_START(tumbleb_state::jumpkids) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) @@ -2159,7 +2159,7 @@ static MACHINE_CONFIG_START( jumpkids ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fncywld ) +MACHINE_CONFIG_START(tumbleb_state::fncywld) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) @@ -2217,7 +2217,7 @@ MACHINE_RESET_MEMBER(tumbleb_state,htchctch) MACHINE_RESET_CALL_MEMBER(tumbleb); } -static MACHINE_CONFIG_START( htchctch ) +MACHINE_CONFIG_START(tumbleb_state::htchctch) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 15000000) /* verified */ @@ -2265,12 +2265,12 @@ static MACHINE_CONFIG_START( htchctch ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cookbib, htchctch ) +MACHINE_CONFIG_DERIVED(tumbleb_state::cookbib, htchctch) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(tumbleb_state, screen_update_semicom_altoffsets) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( chokchok, htchctch ) +MACHINE_CONFIG_DERIVED(tumbleb_state::chokchok, htchctch) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) // some PCBs have left factory with a 3.57mhz while some have a 4.096 which matches other games, assuming the former are factory errors @@ -2280,7 +2280,7 @@ static MACHINE_CONFIG_DERIVED( chokchok, htchctch ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cookbib_mcu, htchctch ) +MACHINE_CONFIG_DERIVED(tumbleb_state::cookbib_mcu, htchctch) /* basic machine hardware */ MCFG_CPU_ADD("protection", I8052, 16000000) // AT89C52 @@ -2292,7 +2292,7 @@ static MACHINE_CONFIG_DERIVED( cookbib_mcu, htchctch ) MCFG_SCREEN_UPDATE_DRIVER(tumbleb_state, screen_update_semicom_altoffsets) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bcstory, htchctch ) +MACHINE_CONFIG_DERIVED(tumbleb_state::bcstory, htchctch) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(tumbleb_state, screen_update_bcstory) @@ -2301,19 +2301,19 @@ static MACHINE_CONFIG_DERIVED( bcstory, htchctch ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( semibase, bcstory ) +MACHINE_CONFIG_DERIVED(tumbleb_state::semibase, bcstory) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(tumbleb_state, screen_update_semibase) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sdfight, bcstory ) +MACHINE_CONFIG_DERIVED(tumbleb_state::sdfight, bcstory) MCFG_VIDEO_START_OVERRIDE(tumbleb_state,sdfight) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(tumbleb_state, screen_update_sdfight) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( metlsavr, cookbib ) +MACHINE_CONFIG_DERIVED(tumbleb_state::metlsavr, cookbib) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -2325,7 +2325,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( suprtrio ) +MACHINE_CONFIG_START(tumbleb_state::suprtrio) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14000000) /* 14mhz should be correct, but lots of sprite flicker later in game */ @@ -2367,7 +2367,7 @@ static MACHINE_CONFIG_START( suprtrio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( pangpang ) +MACHINE_CONFIG_START(tumbleb_state::pangpang) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14000000) diff --git a/src/mame/drivers/tunhunt.cpp b/src/mame/drivers/tunhunt.cpp index 329b9661578..137948dd66a 100644 --- a/src/mame/drivers/tunhunt.cpp +++ b/src/mame/drivers/tunhunt.cpp @@ -268,7 +268,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( tunhunt ) +MACHINE_CONFIG_START(tunhunt_state::tunhunt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz/6) /* ??? */ diff --git a/src/mame/drivers/turbo.cpp b/src/mame/drivers/turbo.cpp index 4061a6052d1..565afb7d86f 100644 --- a/src/mame/drivers/turbo.cpp +++ b/src/mame/drivers/turbo.cpp @@ -837,7 +837,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( turbo ) +MACHINE_CONFIG_START(turbo_state::turbo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4) @@ -892,7 +892,7 @@ static MACHINE_CONFIG_START( turbo ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( subroc3d ) +MACHINE_CONFIG_START(turbo_state::subroc3d) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4) @@ -932,7 +932,7 @@ static MACHINE_CONFIG_START( subroc3d ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( buckrog ) +MACHINE_CONFIG_START(turbo_state::buckrog) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4) @@ -979,13 +979,13 @@ static MACHINE_CONFIG_START( buckrog ) MCFG_FRAGMENT_ADD(buckrog_samples) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( buckrogu, buckrog ) +MACHINE_CONFIG_DERIVED(turbo_state::buckrogu, buckrog) MCFG_CPU_MODIFY("maincpu") MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_OPCODES) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( buckroge, buckrog ) +MACHINE_CONFIG_DERIVED(turbo_state::buckroge, buckrog) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", SEGA_315_5014, MASTER_CLOCK/4) diff --git a/src/mame/drivers/turrett.cpp b/src/mame/drivers/turrett.cpp index 661e4754ba9..5b98dd6db7c 100644 --- a/src/mame/drivers/turrett.cpp +++ b/src/mame/drivers/turrett.cpp @@ -349,7 +349,7 @@ SLOT_INTERFACE_END * *************************************/ -static MACHINE_CONFIG_START( turrett ) +MACHINE_CONFIG_START(turrett_state::turrett) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R3041, R3041_CLOCK) diff --git a/src/mame/drivers/tutankhm.cpp b/src/mame/drivers/tutankhm.cpp index 5bf8cd01d1f..25213fe1857 100644 --- a/src/mame/drivers/tutankhm.cpp +++ b/src/mame/drivers/tutankhm.cpp @@ -59,6 +59,7 @@ #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "screen.h" +#include "speaker.h" /************************************* @@ -222,7 +223,17 @@ MACHINE_RESET_MEMBER(tutankhm_state,tutankhm) m_irq_toggle = 0; } -static MACHINE_CONFIG_START( tutankhm ) +static ADDRESS_MAP_START( timeplt_sound_map, AS_PROGRAM, 8, timeplt_audio_device ) + AM_RANGE(0x0000, 0x2fff) AM_ROM + AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM + AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay1", ay8910_device, data_r, data_w) + AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay1", ay8910_device, address_w) + AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay2", ay8910_device, data_r, data_w) + AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_DEVWRITE("ay2", ay8910_device, address_w) + AM_RANGE(0x8000, 0xffff) AM_DEVWRITE("timeplt_audio", timeplt_audio_device, filter_w) +ADDRESS_MAP_END + +MACHINE_CONFIG_START(tutankhm_state::tutankhm) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_18_432MHz/12) /* 1.5 MHz ??? */ @@ -259,7 +270,40 @@ static MACHINE_CONFIG_START( tutankhm ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_FRAGMENT_ADD(timeplt_sound) + /* basic machine hardware */ + MCFG_CPU_ADD("tpsound",Z80,XTAL_14_31818MHz/8) + MCFG_CPU_PROGRAM_MAP(timeplt_sound_map) + + /* sound hardware */ + MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0) + + MCFG_SOUND_ADD("ay1", AY8910, XTAL_14_31818MHz/8) + MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) + MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("timeplt_audio", timeplt_audio_device, portB_r)) + MCFG_SOUND_ROUTE(0, "filter.0.0", 0.60) + MCFG_SOUND_ROUTE(1, "filter.0.1", 0.60) + MCFG_SOUND_ROUTE(2, "filter.0.2", 0.60) + + MCFG_SOUND_ADD("ay2", AY8910, XTAL_14_31818MHz/8) + MCFG_SOUND_ROUTE(0, "filter.1.0", 0.60) + MCFG_SOUND_ROUTE(1, "filter.1.1", 0.60) + MCFG_SOUND_ROUTE(2, "filter.1.2", 0.60) + + MCFG_FILTER_RC_ADD("filter.0.0", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FILTER_RC_ADD("filter.0.1", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FILTER_RC_ADD("filter.0.2", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + + MCFG_FILTER_RC_ADD("filter.1.0", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FILTER_RC_ADD("filter.1.1", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_FILTER_RC_ADD("filter.1.2", 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tutor.cpp b/src/mame/drivers/tutor.cpp index 362336fa4b7..83cf2d1168a 100644 --- a/src/mame/drivers/tutor.cpp +++ b/src/mame/drivers/tutor.cpp @@ -227,6 +227,8 @@ public: int m_centronics_busy; DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void pyuutajr(machine_config &config); + void tutor(machine_config &config); }; @@ -733,7 +735,7 @@ static INPUT_PORTS_START(pyuutajr) PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED) INPUT_PORTS_END -static MACHINE_CONFIG_START( tutor ) +MACHINE_CONFIG_START(tutor_state::tutor) // basic machine hardware // TMS9995 CPU @ 10.7 MHz // No lines connected yet @@ -768,7 +770,7 @@ static MACHINE_CONFIG_START( tutor ) MCFG_SOFTWARE_LIST_ADD("cart_list","tutor") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pyuutajr, tutor ) +MACHINE_CONFIG_DERIVED(tutor_state::pyuutajr, tutor) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(pyuutajr_mem) //MCFG_DEVICE_REMOVE("centronics") diff --git a/src/mame/drivers/tv910.cpp b/src/mame/drivers/tv910.cpp index 4d2b83249af..9c4f7680f56 100644 --- a/src/mame/drivers/tv910.cpp +++ b/src/mame/drivers/tv910.cpp @@ -77,6 +77,7 @@ public: required_memory_region m_kbdrom; required_ioport m_kbspecial; + void tv910(machine_config &config); private: uint8_t *m_vramptr, *m_chrrom; @@ -490,7 +491,7 @@ MC6845_UPDATE_ROW( tv910_state::crtc_update_row ) } } -static MACHINE_CONFIG_START( tv910 ) +MACHINE_CONFIG_START(tv910_state::tv910) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) MCFG_CPU_PROGRAM_MAP(tv910_mem) diff --git a/src/mame/drivers/tv912.cpp b/src/mame/drivers/tv912.cpp index 7f7c88592dd..d0efaa834d2 100644 --- a/src/mame/drivers/tv912.cpp +++ b/src/mame/drivers/tv912.cpp @@ -37,6 +37,7 @@ public: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void tv912(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -92,7 +93,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( tv912c ) INPUT_PORTS_END -static MACHINE_CONFIG_START( tv912 ) +MACHINE_CONFIG_START(tv912_state::tv912) MCFG_CPU_ADD("maincpu", I8035, XTAL_23_814MHz / 4) MCFG_CPU_PROGRAM_MAP(prog_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/tv950.cpp b/src/mame/drivers/tv950.cpp index 4f783477139..9194ab703e5 100644 --- a/src/mame/drivers/tv950.cpp +++ b/src/mame/drivers/tv950.cpp @@ -75,6 +75,7 @@ public: DECLARE_WRITE8_MEMBER(row_addr_w); DECLARE_WRITE_LINE_MEMBER(via_crtc_reset_w); + void tv950(machine_config &config); private: uint8_t m_via_row; uint8_t m_attr_row; @@ -267,7 +268,7 @@ MC6845_UPDATE_ROW( tv950_state::crtc_update_row ) m_row = (m_row + 1) % 250; } -static MACHINE_CONFIG_START( tv950 ) +MACHINE_CONFIG_START(tv950_state::tv950) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/14) MCFG_CPU_PROGRAM_MAP(tv950_mem) diff --git a/src/mame/drivers/tv990.cpp b/src/mame/drivers/tv990.cpp index 17887a09148..ce9906b6636 100644 --- a/src/mame/drivers/tv990.cpp +++ b/src/mame/drivers/tv990.cpp @@ -91,6 +91,7 @@ public: INTERRUPT_GEN_MEMBER(vblank); DECLARE_INPUT_CHANGED_MEMBER(color); + void tv990(machine_config &config); private: uint16_t tvi1111_regs[(0x100/2)+2]; emu_timer *m_rowtimer; @@ -367,7 +368,7 @@ void tv990_state::device_post_load() m_screen->set_visible_area(0, m_width * 16 - 1, 0, m_height * m_rowh - 1); } -static MACHINE_CONFIG_START( tv990 ) +MACHINE_CONFIG_START(tv990_state::tv990) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 14967500) // verified (59.86992/4) MCFG_CPU_PROGRAM_MAP(tv990_mem) diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp index 8d52b8e5500..eb53713155c 100644 --- a/src/mame/drivers/tvc.cpp +++ b/src/mame/drivers/tvc.cpp @@ -108,6 +108,7 @@ public: uint8_t m_cassette_ff; uint8_t m_centronics_ff; DECLARE_PALETTE_INIT(tvc); + void tvc(machine_config &config); }; @@ -760,7 +761,7 @@ extern SLOT_INTERFACE_START(tvc_exp) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( tvc ) +MACHINE_CONFIG_START(tvc_state::tvc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, 3125000) MCFG_CPU_PROGRAM_MAP(tvc_mem) diff --git a/src/mame/drivers/tvcapcom.cpp b/src/mame/drivers/tvcapcom.cpp index c2d9e2278da..6904d5e5247 100644 --- a/src/mame/drivers/tvcapcom.cpp +++ b/src/mame/drivers/tvcapcom.cpp @@ -25,6 +25,7 @@ public: virtual void video_start() override; uint32_t screen_update_tvcapcom(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void tvcapcom(machine_config &config); }; static ADDRESS_MAP_START( gc_map, AS_PROGRAM, 64, tvcapcom_state ) @@ -48,7 +49,7 @@ uint32_t tvcapcom_state::screen_update_tvcapcom(screen_device &screen, bitmap_rg static INPUT_PORTS_START( tvcapcom ) INPUT_PORTS_END -static MACHINE_CONFIG_START( tvcapcom ) +MACHINE_CONFIG_START(tvcapcom_state::tvcapcom) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC603, 72900000) // IBM PowerPC Broadway CPU @ 729 MHz ? diff --git a/src/mame/drivers/tvgame.cpp b/src/mame/drivers/tvgame.cpp index 77bad6bcefe..594ac38fdfa 100644 --- a/src/mame/drivers/tvgame.cpp +++ b/src/mame/drivers/tvgame.cpp @@ -30,6 +30,7 @@ public: DECLARE_WRITE8_MEMBER(speaker_w); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void tvgame(machine_config &config); private: required_device m_maincpu; required_device m_speaker; @@ -93,7 +94,7 @@ uint32_t tvgame_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap return 0; } -static MACHINE_CONFIG_START( tvgame ) +MACHINE_CONFIG_START(tvgame_state::tvgame) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp index 7b662c3a9c1..53f6c848dff 100644 --- a/src/mame/drivers/twin16.cpp +++ b/src/mame/drivers/twin16.cpp @@ -661,7 +661,7 @@ void twin16_state::machine_start() save_item(NAME(m_CPUB_register)); } -static MACHINE_CONFIG_START( twin16 ) +MACHINE_CONFIG_START(twin16_state::twin16) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, XTAL_18_432MHz/2) MCFG_CPU_PROGRAM_MAP(main_map) @@ -715,11 +715,11 @@ static MACHINE_CONFIG_START( twin16 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( devilw, twin16 ) +MACHINE_CONFIG_DERIVED(twin16_state::devilw, twin16) MCFG_QUANTUM_TIME(attotime::from_hz(60000)) // watchdog reset otherwise MACHINE_CONFIG_END -static MACHINE_CONFIG_START( fround ) +MACHINE_CONFIG_START(fround_state::fround) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_18_432MHz/2) MCFG_CPU_PROGRAM_MAP(fround_map) @@ -769,12 +769,12 @@ static MACHINE_CONFIG_START( fround ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( miaj, twin16 ) +MACHINE_CONFIG_DERIVED(twin16_state::miaj, twin16) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_RAW_PARAMS(XTAL_18_432MHz/2, 576, 1*8, 39*8, 264, 2*8, 30*8) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cuebrickj, twin16 ) +MACHINE_CONFIG_DERIVED(cuebrickj_state::cuebrickj, twin16) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_RAW_PARAMS(XTAL_18_432MHz/2, 576, 1*8, 39*8, 264, 2*8, 30*8) MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mame/drivers/twincobr.cpp b/src/mame/drivers/twincobr.cpp index 416273f3d1e..362a3f0a328 100644 --- a/src/mame/drivers/twincobr.cpp +++ b/src/mame/drivers/twincobr.cpp @@ -655,7 +655,7 @@ static GFXDECODE_START( twincobr ) GFXDECODE_END -static MACHINE_CONFIG_START( twincobr ) +MACHINE_CONFIG_START(twincobr_state::twincobr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/4) /* 7MHz - Main board Crystal is 28MHz */ @@ -721,7 +721,7 @@ static MACHINE_CONFIG_START( twincobr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fshark, twincobr ) +MACHINE_CONFIG_DERIVED(twincobr_state::fshark, twincobr) MCFG_DEVICE_MODIFY("mainlatch") MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) @@ -733,7 +733,7 @@ static MACHINE_CONFIG_DERIVED( fshark, twincobr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fsharkbt, fshark ) +MACHINE_CONFIG_DERIVED(twincobr_state::fsharkbt, fshark) MCFG_CPU_ADD("mcu", I8741, XTAL_28MHz/16) /* Program Map is internal to the CPU */ diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp index a3b6674d8c2..00585f4c966 100644 --- a/src/mame/drivers/twinkle.cpp +++ b/src/mame/drivers/twinkle.cpp @@ -288,6 +288,9 @@ public: void scsi_dma_read( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); void scsi_dma_write( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); + void twinklex(machine_config &config); + void twinklei(machine_config &config); + void twinkle(machine_config &config); private: required_device m_maincpu; required_device m_audiocpu; @@ -314,6 +317,8 @@ private: int m_output_bits; int m_output_cs; int m_output_clock; + + static void cdrom_config(device_t *device); }; #define LED_A1 0x0001 @@ -1010,13 +1015,14 @@ void twinkle_state::scsi_dma_write( uint32_t *p_n_psxram, uint32_t n_address, in } -static MACHINE_CONFIG_START( cdrom_config ) - MCFG_DEVICE_MODIFY( "cdda" ) +void twinkle_state::cdrom_config(device_t *device) +{ + device = device->subdevice("cdda"); MCFG_SOUND_ROUTE( 0, "^^^^speakerleft", 1.0 ) MCFG_SOUND_ROUTE( 1, "^^^^speakerright", 1.0 ) -MACHINE_CONFIG_END +} -static MACHINE_CONFIG_START( twinkle ) +MACHINE_CONFIG_START(twinkle_state::twinkle) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz ) MCFG_CPU_PROGRAM_MAP( main_map ) @@ -1024,8 +1030,8 @@ static MACHINE_CONFIG_START( twinkle ) MCFG_RAM_MODIFY("maincpu:ram") MCFG_RAM_DEFAULT_SIZE("4M") - MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&twinkle_state::scsi_dma_read, (twinkle_state *) owner ) ) - MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&twinkle_state::scsi_dma_write, (twinkle_state *) owner ) ) + MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&twinkle_state::scsi_dma_read, this ) ) + MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&twinkle_state::scsi_dma_write, this ) ) MCFG_CPU_ADD("audiocpu", M68000, 32000000/2) /* 16.000 MHz */ MCFG_CPU_PROGRAM_MAP( sound_map ) @@ -1082,11 +1088,11 @@ static MACHINE_CONFIG_START( twinkle ) MCFG_SOUND_ROUTE(1, "speakerright", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( twinklex, twinkle ) +MACHINE_CONFIG_DERIVED(twinkle_state::twinklex, twinkle) MCFG_X76F041_ADD( "security" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( twinklei, twinkle ) +MACHINE_CONFIG_DERIVED(twinkle_state::twinklei, twinkle) MCFG_I2CMEM_ADD( "security" ) MCFG_I2CMEM_DATA_SIZE( 0x100 ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/twins.cpp b/src/mame/drivers/twins.cpp index f4828d5cf76..1c41da0050f 100644 --- a/src/mame/drivers/twins.cpp +++ b/src/mame/drivers/twins.cpp @@ -117,6 +117,9 @@ public: uint16_t* m_rom16; uint8_t* m_rom8; + void spider(machine_config &config); + void twins(machine_config &config); + void twinsa(machine_config &config); }; @@ -379,7 +382,7 @@ static INPUT_PORTS_START(twins) INPUT_PORTS_END -static MACHINE_CONFIG_START( twins ) +MACHINE_CONFIG_START(twins_state::twins) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30, 8000000) MCFG_CPU_PROGRAM_MAP(twins_map) @@ -427,7 +430,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, twins_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( twinsa ) +MACHINE_CONFIG_START(twins_state::twinsa) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz/2) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(twins_map) @@ -556,7 +559,7 @@ ADDRESS_MAP_END -static MACHINE_CONFIG_START( spider ) +MACHINE_CONFIG_START(twins_state::spider) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V30, 8000000) MCFG_CPU_PROGRAM_MAP(twins_map) diff --git a/src/mame/drivers/tx0.cpp b/src/mame/drivers/tx0.cpp index a72b53467da..dbc99186b97 100644 --- a/src/mame/drivers/tx0.cpp +++ b/src/mame/drivers/tx0.cpp @@ -1537,7 +1537,7 @@ INTERRUPT_GEN_MEMBER(tx0_state::tx0_interrupt) } } -static MACHINE_CONFIG_START( tx0_64kw ) +MACHINE_CONFIG_START(tx0_state::tx0_64kw) /* basic machine hardware */ /* TX0 CPU @ approx. 167 kHz (no master clock, but the memory cycle time is approximately 6usec) */ MCFG_CPU_ADD("maincpu", TX0_64KW, 166667) @@ -1583,7 +1583,7 @@ static MACHINE_CONFIG_START( tx0_64kw ) MCFG_PALETTE_INIT_OWNER(tx0_state, tx0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tx0_8kw, tx0_64kw ) +MACHINE_CONFIG_DERIVED(tx0_state::tx0_8kw, tx0_64kw) /* basic machine hardware */ /* TX0 CPU @ approx. 167 kHz (no master clock, but the memory cycle time is diff --git a/src/mame/drivers/tx1.cpp b/src/mame/drivers/tx1.cpp index e0c716ecac2..8e79b6524bd 100644 --- a/src/mame/drivers/tx1.cpp +++ b/src/mame/drivers/tx1.cpp @@ -606,7 +606,7 @@ ADDRESS_MAP_END * *************************************/ -static MACHINE_CONFIG_START( tx1 ) +MACHINE_CONFIG_START(tx1_state::tx1) MCFG_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3) MCFG_CPU_PROGRAM_MAP(tx1_main) @@ -669,7 +669,7 @@ static MACHINE_CONFIG_START( tx1 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( buggyboy ) +MACHINE_CONFIG_START(tx1_state::buggyboy) MCFG_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3) MCFG_CPU_PROGRAM_MAP(buggyboy_main) @@ -733,7 +733,7 @@ static MACHINE_CONFIG_START( buggyboy ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( buggybjr ) +MACHINE_CONFIG_START(tx1_state::buggybjr) MCFG_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3) MCFG_CPU_PROGRAM_MAP(buggybjr_main) diff --git a/src/mame/drivers/uapce.cpp b/src/mame/drivers/uapce.cpp index 8004f735db4..faa11c4c0f2 100644 --- a/src/mame/drivers/uapce.cpp +++ b/src/mame/drivers/uapce.cpp @@ -120,6 +120,7 @@ public: virtual uint8_t joy_read() override; virtual void machine_reset() override; required_device m_discrete; + void uapce(machine_config &config); }; #define UAPCE_SOUND_EN NODE_10 @@ -298,7 +299,7 @@ static ADDRESS_MAP_START( pce_io , AS_IO, 8, uapce_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_START( uapce ) +MACHINE_CONFIG_START(uapce_state::uapce) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3) MCFG_CPU_PROGRAM_MAP(pce_mem) diff --git a/src/mame/drivers/uknc.cpp b/src/mame/drivers/uknc.cpp index 9bdd1be0489..56d6c1414dd 100644 --- a/src/mame/drivers/uknc.cpp +++ b/src/mame/drivers/uknc.cpp @@ -24,6 +24,7 @@ public: virtual void video_start() override; uint32_t screen_update_uknc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void uknc(machine_config &config); }; @@ -57,7 +58,7 @@ uint32_t uknc_state::screen_update_uknc(screen_device &screen, bitmap_ind16 &bit return 0; } -static MACHINE_CONFIG_START( uknc ) +MACHINE_CONFIG_START(uknc_state::uknc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", K1801VM2, 8000000) MCFG_T11_INITIAL_MODE(0x8000) diff --git a/src/mame/drivers/ultraman.cpp b/src/mame/drivers/ultraman.cpp index 2c34a614e9a..ec905514254 100644 --- a/src/mame/drivers/ultraman.cpp +++ b/src/mame/drivers/ultraman.cpp @@ -171,7 +171,7 @@ void ultraman_state::machine_reset() m_soundnmi->in_w<0>(0); } -static MACHINE_CONFIG_START( ultraman ) +MACHINE_CONFIG_START(ultraman_state::ultraman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz? */ diff --git a/src/mame/drivers/ultratnk.cpp b/src/mame/drivers/ultratnk.cpp index 369e6891b68..02d66908954 100644 --- a/src/mame/drivers/ultratnk.cpp +++ b/src/mame/drivers/ultratnk.cpp @@ -298,7 +298,7 @@ static GFXDECODE_START( ultratnk ) GFXDECODE_END -static MACHINE_CONFIG_START( ultratnk ) +MACHINE_CONFIG_START(ultratnk_state::ultratnk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, PIXEL_CLOCK / 8) diff --git a/src/mame/drivers/ultrsprt.cpp b/src/mame/drivers/ultrsprt.cpp index e6e0c519e11..70b1469064e 100644 --- a/src/mame/drivers/ultrsprt.cpp +++ b/src/mame/drivers/ultrsprt.cpp @@ -52,6 +52,7 @@ public: uint32_t screen_update_ultrsprt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void ultrsprt(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -229,7 +230,7 @@ void ultrsprt_state::machine_reset() /*****************************************************************************/ -static MACHINE_CONFIG_START( ultrsprt ) +MACHINE_CONFIG_START(ultrsprt_state::ultrsprt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC403GA, 25000000) MCFG_CPU_PROGRAM_MAP(ultrsprt_map) diff --git a/src/mame/drivers/umipoker.cpp b/src/mame/drivers/umipoker.cpp index 63863c875f6..d8b825dde75 100644 --- a/src/mame/drivers/umipoker.cpp +++ b/src/mame/drivers/umipoker.cpp @@ -81,6 +81,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void umipoker(machine_config &config); }; TILE_GET_INFO_MEMBER(umipoker_state::get_tile_info_0) @@ -657,7 +658,7 @@ void umipoker_state::machine_reset() } // TODO: clocks -static MACHINE_CONFIG_START( umipoker ) +MACHINE_CONFIG_START(umipoker_state::umipoker) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M68000,16000000) // TMP68HC000-16 diff --git a/src/mame/drivers/undrfire.cpp b/src/mame/drivers/undrfire.cpp index bf17be3e44d..a9300808a88 100644 --- a/src/mame/drivers/undrfire.cpp +++ b/src/mame/drivers/undrfire.cpp @@ -621,7 +621,7 @@ INTERRUPT_GEN_MEMBER(undrfire_state::undrfire_interrupt) device.execute().set_input_line(4, HOLD_LINE); } -static MACHINE_CONFIG_START( undrfire ) +MACHINE_CONFIG_START(undrfire_state::undrfire) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_40MHz/2) /* 20 MHz - NOT verified */ @@ -674,7 +674,7 @@ static MACHINE_CONFIG_START( undrfire ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( cbombers ) +MACHINE_CONFIG_START(undrfire_state::cbombers) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_40MHz/2) /* 20 MHz - NOT verified */ diff --git a/src/mame/drivers/unianapc.cpp b/src/mame/drivers/unianapc.cpp index 27230abe344..1afbcc15724 100644 --- a/src/mame/drivers/unianapc.cpp +++ b/src/mame/drivers/unianapc.cpp @@ -41,6 +41,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void unianapc(machine_config &config); }; void unianapc_state::video_start() @@ -67,7 +68,7 @@ void unianapc_state::machine_reset() { } -static MACHINE_CONFIG_START( unianapc ) +MACHINE_CONFIG_START(unianapc_state::unianapc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM3, 100000000) // actually a Celeron at 1.70 GHz diff --git a/src/mame/drivers/unichamp.cpp b/src/mame/drivers/unichamp.cpp index 301c03d49fd..f6240a60072 100644 --- a/src/mame/drivers/unichamp.cpp +++ b/src/mame/drivers/unichamp.cpp @@ -81,6 +81,7 @@ public: uint32_t screen_update_unichamp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void unichamp(machine_config &config); protected: required_ioport m_ctrls; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -231,7 +232,7 @@ WRITE16_MEMBER( unichamp_state::unichamp_trapl_w ) logerror("trapl_w(%x) = %x\n",offset,data); } -static MACHINE_CONFIG_START( unichamp ) +MACHINE_CONFIG_START(unichamp_state::unichamp) /* basic machine hardware */ //The CPU is really clocked this way: diff --git a/src/mame/drivers/unico.cpp b/src/mame/drivers/unico.cpp index 9bf32b2bf31..87db60bc451 100644 --- a/src/mame/drivers/unico.cpp +++ b/src/mame/drivers/unico.cpp @@ -570,7 +570,7 @@ MACHINE_RESET_MEMBER(unico_state,unico) Burglar X ***************************************************************************/ -static MACHINE_CONFIG_START( burglarx ) +MACHINE_CONFIG_START(unico_state::burglarx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz */ @@ -616,7 +616,7 @@ MACHINE_RESET_MEMBER(unico_state,zeropt) MACHINE_RESET_CALL_MEMBER(unico); } -static MACHINE_CONFIG_START( zeropnt ) +MACHINE_CONFIG_START(unico_state::zeropnt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz */ @@ -657,7 +657,7 @@ MACHINE_CONFIG_END Zero Point 2 ***************************************************************************/ -static MACHINE_CONFIG_START( zeropnt2 ) +MACHINE_CONFIG_START(unico_state::zeropnt2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* 16MHz */ diff --git a/src/mame/drivers/unior.cpp b/src/mame/drivers/unior.cpp index eda92d0edad..c1fc4425f38 100644 --- a/src/mame/drivers/unior.cpp +++ b/src/mame/drivers/unior.cpp @@ -75,6 +75,7 @@ public: DECLARE_READ8_MEMBER(dma_r); I8275_DRAW_CHARACTER_MEMBER(display_pixels); + void unior(machine_config &config); private: uint8_t m_4c; uint8_t m_4e; @@ -373,7 +374,7 @@ void unior_state::machine_reset() m_maincpu->set_state_int(i8080_cpu_device::I8085_PC, 0xF800); } -static MACHINE_CONFIG_START( unior ) +MACHINE_CONFIG_START(unior_state::unior) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, XTAL_20MHz / 9) MCFG_CPU_PROGRAM_MAP(unior_mem) diff --git a/src/mame/drivers/unistar.cpp b/src/mame/drivers/unistar.cpp index 514ee20c71b..8f55d2e3ed7 100644 --- a/src/mame/drivers/unistar.cpp +++ b/src/mame/drivers/unistar.cpp @@ -29,6 +29,7 @@ public: DECLARE_PALETTE_INIT(unistar); uint32_t screen_update_unistar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void unistar(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -90,7 +91,7 @@ static GFXDECODE_START( unistar ) GFXDECODE_ENTRY( "chargen", 0x0000, unistar_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( unistar ) +MACHINE_CONFIG_START(unistar_state::unistar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8085A, XTAL_2MHz) MCFG_CPU_PROGRAM_MAP(unistar_mem) diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp index 74b79251466..b5c7c00df58 100644 --- a/src/mame/drivers/univac.cpp +++ b/src/mame/drivers/univac.cpp @@ -86,6 +86,7 @@ public: u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void uts20(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -306,7 +307,7 @@ static const z80_daisy_config daisy_chain[] = { nullptr } }; -static MACHINE_CONFIG_START( uts20 ) +MACHINE_CONFIG_START(univac_state::uts20) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) // unknown clock MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp index 1edc150534c..caed276ba56 100644 --- a/src/mame/drivers/unixpc.cpp +++ b/src/mame/drivers/unixpc.cpp @@ -75,6 +75,7 @@ public: required_shared_ptr m_mapram; required_shared_ptr m_videoram; + void unixpc(machine_config &config); private: uint16_t *m_ramptr; uint32_t m_ramsize; @@ -313,7 +314,7 @@ static SLOT_INTERFACE_START( unixpc_floppies ) SLOT_INTERFACE( "525dd", FLOPPY_525_DD ) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( unixpc ) +MACHINE_CONFIG_START(unixpc_state::unixpc) // basic machine hardware MCFG_CPU_ADD("maincpu", M68010, XTAL_10MHz) MCFG_CPU_PROGRAM_MAP(unixpc_mem) diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp index 596f86f2418..57256824ad0 100644 --- a/src/mame/drivers/unkhorse.cpp +++ b/src/mame/drivers/unkhorse.cpp @@ -54,6 +54,7 @@ public: virtual void machine_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(interrupt); + void horse(machine_config &config); }; void horse_state::machine_start() @@ -191,7 +192,7 @@ INTERRUPT_GEN_MEMBER(horse_state::interrupt) device.execute().set_input_line(I8085_RST75_LINE, CLEAR_LINE); } -static MACHINE_CONFIG_START( horse ) +MACHINE_CONFIG_START(horse_state::horse) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, XTAL_12MHz / 2) diff --git a/src/mame/drivers/upscope.cpp b/src/mame/drivers/upscope.cpp index c7cdc89494c..c65bf2c95ed 100644 --- a/src/mame/drivers/upscope.cpp +++ b/src/mame/drivers/upscope.cpp @@ -60,6 +60,7 @@ public: DECLARE_DRIVER_INIT(upscope); + void upscope(machine_config &config); protected: virtual void machine_reset() override; @@ -256,7 +257,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( upscope ) +MACHINE_CONFIG_START(upscope_state::upscope) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC) diff --git a/src/mame/drivers/usbilliards.cpp b/src/mame/drivers/usbilliards.cpp index 535b22d4852..62c59822c36 100644 --- a/src/mame/drivers/usbilliards.cpp +++ b/src/mame/drivers/usbilliards.cpp @@ -51,6 +51,7 @@ public: required_device m_maincpu; required_device m_video; + void usbilliards(machine_config &config); protected: // driver_device overrides @@ -91,7 +92,7 @@ void usbilliards_state::video_start() { } -static MACHINE_CONFIG_START( usbilliards ) +MACHINE_CONFIG_START(usbilliards_state::usbilliards) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK) diff --git a/src/mame/drivers/usgames.cpp b/src/mame/drivers/usgames.cpp index 48c358c70e9..57fe79e8701 100644 --- a/src/mame/drivers/usgames.cpp +++ b/src/mame/drivers/usgames.cpp @@ -217,7 +217,7 @@ static GFXDECODE_START( usgames ) GFXDECODE_END -static MACHINE_CONFIG_START( usg32 ) +MACHINE_CONFIG_START(usgames_state::usg32) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ?? */ @@ -250,7 +250,7 @@ static MACHINE_CONFIG_START( usg32 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( usg185, usg32 ) +MACHINE_CONFIG_DERIVED(usgames_state::usg185, usg32) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(usg185_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp index a8bb1cb820a..03247d1bc19 100644 --- a/src/mame/drivers/ut88.cpp +++ b/src/mame/drivers/ut88.cpp @@ -183,7 +183,7 @@ static INPUT_PORTS_START( ut88mini ) INPUT_PORTS_END /* Machine driver */ -static MACHINE_CONFIG_START( ut88 ) +MACHINE_CONFIG_START(ut88_state::ut88) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, 2000000) MCFG_CPU_PROGRAM_MAP(ut88_mem) @@ -226,7 +226,7 @@ static MACHINE_CONFIG_START( ut88 ) MCFG_SOFTWARE_LIST_ADD("cass_list","ut88") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( ut88mini ) +MACHINE_CONFIG_START(ut88_state::ut88mini) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, 2000000) MCFG_CPU_PROGRAM_MAP(ut88mini_mem) diff --git a/src/mame/drivers/uzebox.cpp b/src/mame/drivers/uzebox.cpp index 394630ed8de..75557b56364 100644 --- a/src/mame/drivers/uzebox.cpp +++ b/src/mame/drivers/uzebox.cpp @@ -63,6 +63,7 @@ public: uint32_t screen_update_uzebox(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(uzebox_cart); + void uzebox(machine_config &config); private: int m_vpos; uint64_t m_line_start_cycles; @@ -273,7 +274,7 @@ DEVICE_IMAGE_LOAD_MEMBER(uzebox_state, uzebox_cart) * Machine definition * \****************************************************/ -static MACHINE_CONFIG_START( uzebox ) +MACHINE_CONFIG_START(uzebox_state::uzebox) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ATMEGA644, MASTER_CLOCK) diff --git a/src/mame/drivers/v100.cpp b/src/mame/drivers/v100.cpp index 56ed38303ef..c710fb26b8f 100644 --- a/src/mame/drivers/v100.cpp +++ b/src/mame/drivers/v100.cpp @@ -47,6 +47,7 @@ public: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void v100(machine_config &config); private: virtual void machine_start() override; @@ -207,7 +208,7 @@ static INPUT_PORTS_START( v100 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( v100 ) +MACHINE_CONFIG_START(v100_state::v100) MCFG_CPU_ADD("maincpu", Z80, XTAL_47_736MHz / 12) // divider not verified MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/v102.cpp b/src/mame/drivers/v102.cpp index f165577fe41..f2b4d76cc3b 100644 --- a/src/mame/drivers/v102.cpp +++ b/src/mame/drivers/v102.cpp @@ -29,6 +29,7 @@ public: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void v102(machine_config &config); private: required_device m_maincpu; required_region_ptr m_p_chargen; @@ -68,7 +69,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( v102 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( v102 ) +MACHINE_CONFIG_START(v102_state::v102) MCFG_CPU_ADD("maincpu", Z80, XTAL_18_575MHz / 5) // divider not verified MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp index 2e04e634ef6..ee0f9e67a7b 100644 --- a/src/mame/drivers/v1050.cpp +++ b/src/mame/drivers/v1050.cpp @@ -1020,7 +1020,7 @@ void v1050_state::machine_reset() // Machine Driver -static MACHINE_CONFIG_START( v1050 ) +MACHINE_CONFIG_START(v1050_state::v1050) // basic machine hardware MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) MCFG_CPU_PROGRAM_MAP(v1050_mem) diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp index c09bd486b81..8e55aa5b3ff 100644 --- a/src/mame/drivers/v6809.cpp +++ b/src/mame/drivers/v6809.cpp @@ -93,6 +93,7 @@ public: MC6845_UPDATE_ROW(crtc_update_row); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr); + void v6809(machine_config &config); private: uint16_t m_video_address; bool m_speaker_en; @@ -274,7 +275,7 @@ SLOT_INTERFACE_END // *** Machine **** -static MACHINE_CONFIG_START( v6809 ) +MACHINE_CONFIG_START(v6809_state::v6809) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_16MHz / 4) // divided by 4 again internally MCFG_CPU_PROGRAM_MAP(v6809_mem) diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp index aefb19abf0c..eb3b785d911 100644 --- a/src/mame/drivers/vamphalf.cpp +++ b/src/mame/drivers/vamphalf.cpp @@ -204,6 +204,22 @@ public: void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap); void draw_sprites_aoh(screen_device &screen, bitmap_ind16 &bitmap); void handle_flipped_visible_area(screen_device &screen); + void common(machine_config &config); + void sound_ym_oki(machine_config &config); + void sound_suplup(machine_config &config); + void sound_qs1000(machine_config &config); + void mrkickera(machine_config &config); + void mrdig(machine_config &config); + void misncrft(machine_config &config); + void suplup(machine_config &config); + void vamphalf(machine_config &config); + void yorijori(machine_config &config); + void finalgdr(machine_config &config); + void wyvernwg(machine_config &config); + void boonggab(machine_config &config); + void jmpbreak(machine_config &config); + void aoh(machine_config &config); + void coolmini(machine_config &config); }; READ16_MEMBER(vamphalf_state::eeprom_r) @@ -989,7 +1005,7 @@ static GFXDECODE_START( vamphalf ) GFXDECODE_END -static MACHINE_CONFIG_START( common ) +MACHINE_CONFIG_START(vamphalf_state::common) MCFG_CPU_ADD("maincpu", E116T, 50000000) /* 50 MHz */ MCFG_CPU_PROGRAM_MAP(common_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold) @@ -1013,7 +1029,7 @@ static MACHINE_CONFIG_START( common ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", vamphalf) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sound_ym_oki ) +MACHINE_CONFIG_START(vamphalf_state::sound_ym_oki) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_YM2151_ADD("ymsnd", XTAL_28MHz/8) /* 3.5MHz */ @@ -1025,7 +1041,7 @@ static MACHINE_CONFIG_START( sound_ym_oki ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sound_suplup ) +MACHINE_CONFIG_START(vamphalf_state::sound_suplup) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545 MHz */ @@ -1037,7 +1053,7 @@ static MACHINE_CONFIG_START( sound_suplup ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( sound_qs1000 ) +MACHINE_CONFIG_START(vamphalf_state::sound_qs1000) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -1049,14 +1065,14 @@ static MACHINE_CONFIG_START( sound_qs1000 ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vamphalf, common ) +MACHINE_CONFIG_DERIVED(vamphalf_state::vamphalf, common) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(vamphalf_io) MCFG_FRAGMENT_ADD(sound_ym_oki) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( misncrft, common ) +MACHINE_CONFIG_DERIVED(vamphalf_state::misncrft, common) MCFG_CPU_REPLACE("maincpu", GMS30C2116, XTAL_50MHz) /* 50 MHz */ MCFG_CPU_PROGRAM_MAP(common_map) MCFG_CPU_IO_MAP(misncrft_io) @@ -1065,28 +1081,28 @@ static MACHINE_CONFIG_DERIVED( misncrft, common ) MCFG_FRAGMENT_ADD(sound_qs1000) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( coolmini, common ) +MACHINE_CONFIG_DERIVED(vamphalf_state::coolmini, common) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(coolmini_io) MCFG_FRAGMENT_ADD(sound_ym_oki) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( suplup, common ) +MACHINE_CONFIG_DERIVED(vamphalf_state::suplup, common) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(suplup_io) MCFG_FRAGMENT_ADD(sound_suplup) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jmpbreak, common ) +MACHINE_CONFIG_DERIVED(vamphalf_state::jmpbreak, common) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(jmpbreak_io) MCFG_FRAGMENT_ADD(sound_ym_oki) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mrdig, common ) +MACHINE_CONFIG_DERIVED(vamphalf_state::mrdig, common) MCFG_CPU_REPLACE("maincpu", GMS30C2116, XTAL_50MHz) /* 50 MHz */ MCFG_CPU_PROGRAM_MAP(common_map) MCFG_CPU_MODIFY("maincpu") @@ -1096,7 +1112,7 @@ static MACHINE_CONFIG_DERIVED( mrdig, common ) MCFG_FRAGMENT_ADD(sound_ym_oki) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wyvernwg, common ) +MACHINE_CONFIG_DERIVED(vamphalf_state::wyvernwg, common) MCFG_CPU_REPLACE("maincpu", E132T, XTAL_50MHz) /* 50 MHz */ MCFG_CPU_PROGRAM_MAP(common_32bit_map) MCFG_CPU_IO_MAP(wyvernwg_io) @@ -1105,7 +1121,7 @@ static MACHINE_CONFIG_DERIVED( wyvernwg, common ) MCFG_FRAGMENT_ADD(sound_qs1000) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( finalgdr, common ) +MACHINE_CONFIG_DERIVED(vamphalf_state::finalgdr, common) MCFG_CPU_REPLACE("maincpu", E132T, XTAL_50MHz) /* 50 MHz */ MCFG_CPU_PROGRAM_MAP(common_32bit_map) MCFG_CPU_IO_MAP(finalgdr_io) @@ -1116,7 +1132,7 @@ static MACHINE_CONFIG_DERIVED( finalgdr, common ) MCFG_FRAGMENT_ADD(sound_ym_oki) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mrkickera, common ) +MACHINE_CONFIG_DERIVED(vamphalf_state::mrkickera, common) MCFG_CPU_REPLACE("maincpu", E132T, XTAL_50MHz) /* 50 MHz */ MCFG_CPU_PROGRAM_MAP(common_32bit_map) MCFG_CPU_IO_MAP(mrkickera_io) @@ -1129,7 +1145,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( aoh ) +MACHINE_CONFIG_START(vamphalf_state::aoh) MCFG_CPU_ADD("maincpu", E132XN, XTAL_20MHz*4) /* 4x internal multiplier */ MCFG_CPU_PROGRAM_MAP(aoh_map) MCFG_CPU_IO_MAP(aoh_io) @@ -1166,14 +1182,14 @@ static MACHINE_CONFIG_START( aoh ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( boonggab, common ) +MACHINE_CONFIG_DERIVED(vamphalf_state::boonggab, common) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(boonggab_io) MCFG_FRAGMENT_ADD(sound_ym_oki) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( yorijori, common ) +MACHINE_CONFIG_DERIVED(vamphalf_state::yorijori, common) MCFG_CPU_REPLACE("maincpu", E132T, XTAL_50MHz) /* 50 MHz */ MCFG_CPU_PROGRAM_MAP(yorijori_32bit_map) MCFG_CPU_IO_MAP(yorijori_io) diff --git a/src/mame/drivers/vaportra.cpp b/src/mame/drivers/vaportra.cpp index 2fee7ce3501..51129e80b57 100644 --- a/src/mame/drivers/vaportra.cpp +++ b/src/mame/drivers/vaportra.cpp @@ -238,7 +238,7 @@ void vaportra_state::machine_reset() m_priority[1] = 0; } -static MACHINE_CONFIG_START( vaportra ) +MACHINE_CONFIG_START(vaportra_state::vaportra) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,XTAL_24MHz/2) /* Custom chip 59 */ diff --git a/src/mame/drivers/vastar.cpp b/src/mame/drivers/vastar.cpp index 3f845e90a97..cc39c3daf44 100644 --- a/src/mame/drivers/vastar.cpp +++ b/src/mame/drivers/vastar.cpp @@ -413,7 +413,7 @@ INTERRUPT_GEN_MEMBER(vastar_state::vblank_irq) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( vastar ) +MACHINE_CONFIG_START(vastar_state::vastar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) diff --git a/src/mame/drivers/vax11.cpp b/src/mame/drivers/vax11.cpp index 99fa220c047..d618103a240 100644 --- a/src/mame/drivers/vax11.cpp +++ b/src/mame/drivers/vax11.cpp @@ -91,6 +91,7 @@ public: void kbd_put(u8 data); uint8_t m_term_data; uint16_t m_term_status; + void vax11(machine_config &config); }; WRITE16_MEMBER(vax11_state::term_w) @@ -137,7 +138,7 @@ void vax11_state::kbd_put(u8 data) m_term_status = 0xffff; } -static MACHINE_CONFIG_START( vax11 ) +MACHINE_CONFIG_START(vax11_state::vax11) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",T11, XTAL_4MHz) // Need proper CPU here MCFG_T11_INITIAL_MODE(0 << 13) diff --git a/src/mame/drivers/vball.cpp b/src/mame/drivers/vball.cpp index 4dc983302bb..d8e605cd455 100644 --- a/src/mame/drivers/vball.cpp +++ b/src/mame/drivers/vball.cpp @@ -394,7 +394,7 @@ static GFXDECODE_START( vb ) GFXDECODE_END -static MACHINE_CONFIG_START( vball ) +MACHINE_CONFIG_START(vball_state::vball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* 2 MHz - measured by guru but it makes the game far far too slow ?! */ diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp index 3aabbdaa6df..c522203d9c1 100644 --- a/src/mame/drivers/vboy.cpp +++ b/src/mame/drivers/vboy.cpp @@ -225,6 +225,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(timer_main_tick); TIMER_DEVICE_CALLBACK_MEMBER(timer_pad_tick); TIMER_DEVICE_CALLBACK_MEMBER(vboy_scanlineL); + void vboy(machine_config &config); }; @@ -1346,7 +1347,7 @@ static SLOT_INTERFACE_START(vboy_cart) SLOT_INTERFACE_INTERNAL("vb_eeprom", VBOY_ROM_EEPROM) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( vboy ) +MACHINE_CONFIG_START(vboy_state::vboy) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", V810, XTAL_20MHz ) diff --git a/src/mame/drivers/vc4000.cpp b/src/mame/drivers/vc4000.cpp index d4004c5639b..cc0a3c05bf5 100644 --- a/src/mame/drivers/vc4000.cpp +++ b/src/mame/drivers/vc4000.cpp @@ -523,7 +523,7 @@ static SLOT_INTERFACE_START(vc4000_cart) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( vc4000 ) +MACHINE_CONFIG_START(vc4000_state::vc4000) /* basic machine hardware */ // MCFG_CPU_ADD("maincpu", S2650, 865000) /* 3550000/4, 3580000/3, 4430000/3 */ MCFG_CPU_ADD("maincpu", S2650, 3546875/4) @@ -557,27 +557,27 @@ static MACHINE_CONFIG_START( vc4000 ) MCFG_SOFTWARE_LIST_ADD("cart_list", "vc4000") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cx3000tc, vc4000 ) +MACHINE_CONFIG_DERIVED(vc4000_state::cx3000tc, vc4000) MCFG_DEVICE_REMOVE("cart_list") MCFG_SOFTWARE_LIST_ADD("cart_list", "cx3000tc") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mpu1000, vc4000 ) +MACHINE_CONFIG_DERIVED(vc4000_state::mpu1000, vc4000) MCFG_DEVICE_REMOVE("cart_list") MCFG_SOFTWARE_LIST_ADD("cart_list", "mpu1000") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( database, vc4000 ) +MACHINE_CONFIG_DERIVED(vc4000_state::database, vc4000) MCFG_DEVICE_REMOVE("cart_list") MCFG_SOFTWARE_LIST_ADD("cart_list", "database") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( rwtrntcs, vc4000 ) +MACHINE_CONFIG_DERIVED(vc4000_state::rwtrntcs, vc4000) MCFG_DEVICE_REMOVE("cart_list") MCFG_SOFTWARE_LIST_ADD("cart_list", "rwtrntcs") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( h21, vc4000 ) +MACHINE_CONFIG_DERIVED(vc4000_state::h21, vc4000) MCFG_DEVICE_REMOVE("cartslot") MCFG_H21_CARTRIDGE_ADD("cartslot", vc4000_cart, nullptr) @@ -585,7 +585,7 @@ static MACHINE_CONFIG_DERIVED( h21, vc4000 ) MCFG_SOFTWARE_LIST_ADD("cart_list", "h21") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( elektor, vc4000 ) +MACHINE_CONFIG_DERIVED(vc4000_state::elektor, vc4000) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(elektor_mem) MCFG_CASSETTE_ADD( "cassette" ) diff --git a/src/mame/drivers/vcombat.cpp b/src/mame/drivers/vcombat.cpp index d92457c6ad8..ccc26973acd 100644 --- a/src/mame/drivers/vcombat.cpp +++ b/src/mame/drivers/vcombat.cpp @@ -138,6 +138,8 @@ public: required_device m_vid_0; optional_device m_vid_1; required_device m_dac; + void shadfgtr(machine_config &config); + void vcombat(machine_config &config); }; uint32_t vcombat_state::update_screen(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int index) @@ -543,7 +545,7 @@ WRITE_LINE_MEMBER(vcombat_state::sound_update) m_soundcpu->set_input_line(M68K_IRQ_1, state ? ASSERT_LINE : CLEAR_LINE); } -static MACHINE_CONFIG_START( vcombat ) +MACHINE_CONFIG_START(vcombat_state::vcombat) MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", vcombat_state, irq1_line_assert) @@ -591,7 +593,7 @@ static MACHINE_CONFIG_START( vcombat ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( shadfgtr ) +MACHINE_CONFIG_START(vcombat_state::shadfgtr) MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", vcombat_state, irq1_line_assert) diff --git a/src/mame/drivers/vcs80.cpp b/src/mame/drivers/vcs80.cpp index 701887f9e91..c5709b1e161 100644 --- a/src/mame/drivers/vcs80.cpp +++ b/src/mame/drivers/vcs80.cpp @@ -209,7 +209,7 @@ void vcs80_state::machine_start() /* Machine Driver */ -static MACHINE_CONFIG_START( vcs80 ) +MACHINE_CONFIG_START(vcs80_state::vcs80) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_5MHz/2) /* U880D */ MCFG_CPU_PROGRAM_MAP(vcs80_mem) diff --git a/src/mame/drivers/vd.cpp b/src/mame/drivers/vd.cpp index c788cdb41cc..a6ce710f581 100644 --- a/src/mame/drivers/vd.cpp +++ b/src/mame/drivers/vd.cpp @@ -25,11 +25,11 @@ #include "vd.lh" -class vd_state : public driver_device +class vd_state : public genpin_class { public: vd_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) + : genpin_class(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } @@ -39,6 +39,7 @@ public: DECLARE_WRITE8_MEMBER(lamp_w) { }; DECLARE_WRITE8_MEMBER(sol_w) { }; TIMER_DEVICE_CALLBACK_MEMBER(irq); + void vd(machine_config &config); protected: // devices @@ -181,7 +182,7 @@ void vd_state::machine_reset() m_t_c = 0; } -static MACHINE_CONFIG_START( vd ) +MACHINE_CONFIG_START(vd_state::vd) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(vd_map) diff --git a/src/mame/drivers/vector06.cpp b/src/mame/drivers/vector06.cpp index 13eddbd87dc..6776a0f6f04 100644 --- a/src/mame/drivers/vector06.cpp +++ b/src/mame/drivers/vector06.cpp @@ -157,7 +157,7 @@ SLOT_INTERFACE_END /* Machine driver */ -static MACHINE_CONFIG_START( vector06 ) +MACHINE_CONFIG_START(vector06_state::vector06) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, 3000000) // actual speed is wrong due to unemulated latency MCFG_CPU_PROGRAM_MAP(vector06_mem) diff --git a/src/mame/drivers/vector4.cpp b/src/mame/drivers/vector4.cpp index c339841a865..9f134aa633a 100644 --- a/src/mame/drivers/vector4.cpp +++ b/src/mame/drivers/vector4.cpp @@ -24,6 +24,7 @@ public: { } + void vector4(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -61,7 +62,7 @@ void vector4_state::machine_reset() } -static MACHINE_CONFIG_START( vector4 ) +MACHINE_CONFIG_START(vector4_state::vector4) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(vector4_mem) diff --git a/src/mame/drivers/vectrex.cpp b/src/mame/drivers/vectrex.cpp index e6cfc5927bc..a98075b7b2c 100644 --- a/src/mame/drivers/vectrex.cpp +++ b/src/mame/drivers/vectrex.cpp @@ -95,7 +95,7 @@ static SLOT_INTERFACE_START(vectrex_cart) SLOT_INTERFACE_INTERNAL("vec_sram", VECTREX_ROM_SRAM) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( vectrex ) +MACHINE_CONFIG_START(vectrex_state::vectrex) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809, XTAL_6MHz) // 68A09 MCFG_CPU_PROGRAM_MAP(vectrex_map) @@ -215,7 +215,7 @@ static INPUT_PORTS_START(raaspec) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( raaspec, vectrex ) +MACHINE_CONFIG_DERIVED(vectrex_state::raaspec, vectrex) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(raaspec_map) MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mame/drivers/vectrix.cpp b/src/mame/drivers/vectrix.cpp index 792e5696572..1dbe2971987 100644 --- a/src/mame/drivers/vectrix.cpp +++ b/src/mame/drivers/vectrix.cpp @@ -26,6 +26,7 @@ public: // , m_maincpu(*this, "maincpu") { } +void vectrix(machine_config &config); private: // required_device m_maincpu; }; @@ -44,7 +45,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( vectrix ) INPUT_PORTS_END -static MACHINE_CONFIG_START( vectrix ) +MACHINE_CONFIG_START(vectrix_state::vectrix) MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3) // no idea of clock MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/vega.cpp b/src/mame/drivers/vega.cpp index 3f24fef6303..fe75b923943 100644 --- a/src/mame/drivers/vega.cpp +++ b/src/mame/drivers/vega.cpp @@ -168,6 +168,7 @@ public: DECLARE_PALETTE_INIT(vega); void draw_tilemap(screen_device& screen, bitmap_ind16& bitmap, const rectangle& cliprect); uint32_t screen_update_vega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void vega(machine_config &config); }; WRITE8_MEMBER(vega_state::extern_w) @@ -789,7 +790,7 @@ void vega_state::machine_start() } -static MACHINE_CONFIG_START( vega ) +MACHINE_CONFIG_START(vega_state::vega) MCFG_CPU_ADD("maincpu", I8035, 4000000) MCFG_CPU_PROGRAM_MAP(vega_map) MCFG_CPU_IO_MAP(vega_io_map) diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp index abe5e9cafc7..0d4c624c117 100644 --- a/src/mame/drivers/vegaeo.cpp +++ b/src/mame/drivers/vegaeo.cpp @@ -49,6 +49,7 @@ public: DECLARE_VIDEO_START(vega); uint32_t screen_update_vega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void vega(machine_config &config); }; READ8_MEMBER( vegaeo_state::qs1000_p1_r ) @@ -217,7 +218,7 @@ uint32_t vegaeo_state::screen_update_vega(screen_device &screen, bitmap_ind16 &b } -static MACHINE_CONFIG_START( vega ) +MACHINE_CONFIG_START(vegaeo_state::vega) MCFG_CPU_ADD("maincpu", GMS30C2132, XTAL_55MHz) MCFG_CPU_PROGRAM_MAP(vega_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", vegaeo_state, eolith_speedup, "screen", 0, 1) diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp index 62be9c7c69d..3af4bdca4d2 100644 --- a/src/mame/drivers/vegas.cpp +++ b/src/mame/drivers/vegas.cpp @@ -412,7 +412,26 @@ public: DECLARE_WRITE32_MEMBER(wheel_board_w); std::string sioIRQString(uint8_t data); - + void vegascore(machine_config &config); + void vegas(machine_config &config); + void vegas250(machine_config &config); + void vegas32m(machine_config &config); + void vegasban(machine_config &config); + void vegasv3(machine_config &config); + void denver(machine_config &config); + + void nbanfl(machine_config &config); + void sf2049te(machine_config &config); + void sf2049se(machine_config &config); + void nbashowt(machine_config &config); + void gauntdl(machine_config &config); + void sf2049(machine_config &config); + void gauntleg(machine_config &config); + void cartfury(machine_config &config); + void tenthdeg(machine_config &config); + void nbagold(machine_config &config); + void roadburn(machine_config &config); + void warfa(machine_config &config); }; /************************************* @@ -1674,7 +1693,7 @@ ADDRESS_MAP_END * *************************************/ -static MACHINE_CONFIG_START( vegascore ) +MACHINE_CONFIG_START(vegas_state::vegascore) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", R5000LE, vegas_state::SYSTEM_CLOCK*2) @@ -1723,23 +1742,23 @@ static MACHINE_CONFIG_START( vegascore ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vegas, vegascore ) +MACHINE_CONFIG_DERIVED(vegas_state::vegas, vegascore) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vegas250, vegascore ) +MACHINE_CONFIG_DERIVED(vegas_state::vegas250, vegascore) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(vegas_state::SYSTEM_CLOCK*2.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vegas32m, vegas250) +MACHINE_CONFIG_DERIVED(vegas_state::vegas32m, vegas250) MCFG_DEVICE_MODIFY(PCI_ID_NILE) MCFG_VRC5074_SET_SDRAM(0, 0x02000000) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vegasban, vegas32m) +MACHINE_CONFIG_DERIVED(vegas_state::vegasban, vegas32m) MCFG_DEVICE_REMOVE(PCI_ID_VIDEO) MCFG_VOODOO_PCI_ADD(PCI_ID_VIDEO, TYPE_VOODOO_BANSHEE, ":maincpu") MCFG_VOODOO_PCI_FBMEM(16) @@ -1748,7 +1767,7 @@ static MACHINE_CONFIG_DERIVED( vegasban, vegas32m) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vegasv3, vegas32m) +MACHINE_CONFIG_DERIVED(vegas_state::vegasv3, vegas32m) MCFG_CPU_REPLACE("maincpu", RM7000LE, vegas_state::SYSTEM_CLOCK*2.5) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) @@ -1762,7 +1781,7 @@ static MACHINE_CONFIG_DERIVED( vegasv3, vegas32m) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( denver, vegascore ) +MACHINE_CONFIG_DERIVED(vegas_state::denver, vegascore) MCFG_CPU_REPLACE("maincpu", RM7000LE, vegas_state::SYSTEM_CLOCK*2.5) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) @@ -1809,7 +1828,7 @@ MACHINE_CONFIG_END // Per driver configs -static MACHINE_CONFIG_DERIVED( gauntleg, vegas ) +MACHINE_CONFIG_DERIVED(vegas_state::gauntleg, vegas) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) @@ -1822,7 +1841,7 @@ static MACHINE_CONFIG_DERIVED( gauntleg, vegas ) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( gauntdl, vegas ) +MACHINE_CONFIG_DERIVED(vegas_state::gauntdl, vegas) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) @@ -1835,7 +1854,7 @@ static MACHINE_CONFIG_DERIVED( gauntdl, vegas ) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( warfa, vegas250 ) +MACHINE_CONFIG_DERIVED(vegas_state::warfa, vegas250) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) @@ -1848,7 +1867,7 @@ static MACHINE_CONFIG_DERIVED( warfa, vegas250 ) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tenthdeg, vegas ) +MACHINE_CONFIG_DERIVED(vegas_state::tenthdeg, vegas) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0afb) @@ -1861,7 +1880,7 @@ static MACHINE_CONFIG_DERIVED( tenthdeg, vegas ) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( roadburn, vegas32m ) +MACHINE_CONFIG_DERIVED(vegas_state::roadburn, vegas32m) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_DSIO, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x200a) @@ -1874,7 +1893,7 @@ static MACHINE_CONFIG_DERIVED( roadburn, vegas32m ) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nbashowt, vegasban ) +MACHINE_CONFIG_DERIVED(vegas_state::nbashowt, vegasban) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) @@ -1889,7 +1908,7 @@ static MACHINE_CONFIG_DERIVED( nbashowt, vegasban ) MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, i40_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nbanfl, vegasban ) +MACHINE_CONFIG_DERIVED(vegas_state::nbanfl, vegasban) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) @@ -1902,7 +1921,7 @@ static MACHINE_CONFIG_DERIVED( nbanfl, vegasban ) MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, i40_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nbagold, vegasban) +MACHINE_CONFIG_DERIVED(vegas_state::nbagold, vegasban) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) @@ -1915,7 +1934,7 @@ static MACHINE_CONFIG_DERIVED( nbagold, vegasban) MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, i40_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sf2049 , denver ) +MACHINE_CONFIG_DERIVED(vegas_state::sf2049, denver) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_DENVER, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(8) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x200d) @@ -1929,7 +1948,7 @@ static MACHINE_CONFIG_DERIVED( sf2049 , denver ) MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, wheel_board_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sf2049se, denver ) +MACHINE_CONFIG_DERIVED(vegas_state::sf2049se, denver) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_DENVER, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(8) @@ -1942,7 +1961,7 @@ static MACHINE_CONFIG_DERIVED( sf2049se, denver ) MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, wheel_board_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sf2049te, denver ) +MACHINE_CONFIG_DERIVED(vegas_state::sf2049te, denver) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_DENVER, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(8) @@ -1955,7 +1974,7 @@ static MACHINE_CONFIG_DERIVED( sf2049te, denver ) MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, wheel_board_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( cartfury, vegasv3 ) +MACHINE_CONFIG_DERIVED(vegas_state::cartfury, vegasv3) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp index 838fae4d76b..23232a27b0f 100644 --- a/src/mame/drivers/vendetta.cpp +++ b/src/mame/drivers/vendetta.cpp @@ -418,7 +418,7 @@ WRITE8_MEMBER( vendetta_state::banking_callback ) membank("bank1")->set_entry(data); } -static MACHINE_CONFIG_START( vendetta ) +MACHINE_CONFIG_START(vendetta_state::vendetta) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/8) /* 052001 (verified on pcb) */ @@ -487,7 +487,7 @@ static MACHINE_CONFIG_START( vendetta ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( esckids, vendetta ) +MACHINE_CONFIG_DERIVED(vendetta_state::esckids, vendetta) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/vertigo.cpp b/src/mame/drivers/vertigo.cpp index 6732ac78df2..10c362b6790 100644 --- a/src/mame/drivers/vertigo.cpp +++ b/src/mame/drivers/vertigo.cpp @@ -13,13 +13,20 @@ #include "emu.h" #include "includes/vertigo.h" +#include "includes/exidy440.h" +#include "audio/exidy440.h" +#include "speaker.h" #include "cpu/m6805/m68705.h" +#include "cpu/m6805/m6805.h" +#include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" #include "machine/pit8253.h" #include "machine/nvram.h" #include "screen.h" +#define EXIDY440_AUDIO_CLOCK (XTAL_12_9792MHz / 4) +#define EXIDY440_MC3418_CLOCK (EXIDY440_AUDIO_CLOCK / 4 / 16) /************************************* @@ -45,6 +52,19 @@ static ADDRESS_MAP_START( vertigo_map, AS_PROGRAM, 16, vertigo_state ) AM_RANGE(0x800000, 0x81ffff) AM_ROM ADDRESS_MAP_END +static ADDRESS_MAP_START( exidy440_audio_map, AS_PROGRAM, 8, exidy440_sound_device ) + AM_RANGE(0x0000, 0x7fff) AM_NOP + AM_RANGE(0x8000, 0x801f) AM_MIRROR(0x03e0) AM_DEVREADWRITE("custom", exidy440_sound_device, m6844_r, m6844_w) + AM_RANGE(0x8400, 0x840f) AM_MIRROR(0x03f0) AM_DEVREADWRITE("custom", exidy440_sound_device, sound_volume_r, sound_volume_w) + AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03ff) AM_DEVREAD("custom", exidy440_sound_device, sound_command_r) AM_WRITENOP + AM_RANGE(0x8c00, 0x93ff) AM_NOP + AM_RANGE(0x9400, 0x9403) AM_MIRROR(0x03fc) AM_READNOP AM_DEVWRITE("custom", exidy440_sound_device, sound_banks_w) + AM_RANGE(0x9800, 0x9800) AM_MIRROR(0x03ff) AM_READNOP AM_DEVWRITE("custom", exidy440_sound_device, sound_interrupt_clear_w) + AM_RANGE(0x9c00, 0x9fff) AM_NOP + AM_RANGE(0xa000, 0xbfff) AM_RAM + AM_RANGE(0xc000, 0xdfff) AM_NOP + AM_RANGE(0xe000, 0xffff) AM_ROM +ADDRESS_MAP_END /************************************* @@ -102,7 +122,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( vertigo ) +MACHINE_CONFIG_START(vertigo_state::vertigo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 3) @@ -135,6 +155,30 @@ static MACHINE_CONFIG_START( vertigo ) MCFG_SCREEN_UPDATE_DEVICE("vector", vector_device, screen_update) MACHINE_CONFIG_END +MACHINE_CONFIG_START(vertigo_state::exidy440_audio) + + MCFG_CPU_ADD("audiocpu", MC6809, EXIDY440_AUDIO_CLOCK) + MCFG_CPU_PROGRAM_MAP(exidy440_audio_map) + MCFG_CPU_VBLANK_INT_DRIVER("screen", driver_device, irq0_line_assert) + + MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + + MCFG_SOUND_ADD("custom", EXIDY440, EXIDY440_MC3418_CLOCK) + MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) + MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) + +// MCFG_SOUND_ADD("cvsd1", MC3418, EXIDY440_MC3418_CLOCK) +// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + +// MCFG_SOUND_ADD("cvsd2", MC3418, EXIDY440_MC3418_CLOCK) +// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) + +// MCFG_SOUND_ADD("cvsd3", MC3417, EXIDY440_MC3417_CLOCK) +// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 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/drivers/vg5k.cpp b/src/mame/drivers/vg5k.cpp index be0261ff4c8..804b6a84f5a 100644 --- a/src/mame/drivers/vg5k.cpp +++ b/src/mame/drivers/vg5k.cpp @@ -102,6 +102,7 @@ public: TIMER_CALLBACK_MEMBER(z80_irq_clear); TIMER_DEVICE_CALLBACK_MEMBER(z80_irq); TIMER_DEVICE_CALLBACK_MEMBER(vg5k_scanline); + void vg5k(machine_config &config); }; @@ -358,7 +359,7 @@ DRIVER_INIT_MEMBER(vg5k_state,vg5k) } -static MACHINE_CONFIG_START( vg5k ) +MACHINE_CONFIG_START(vg5k_state::vg5k) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index 8f1a2265f9e..47a98917ad5 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -161,6 +161,7 @@ public: DECLARE_WRITE8_MEMBER(multipcm_bank_lo_b_w); DECLARE_WRITE8_MEMBER(multipcm_bank_hi_b_w); + void vgmplay(machine_config &config); private: std::vector m_file_data; required_device m_file; @@ -1347,7 +1348,7 @@ static ADDRESS_MAP_START( h6280_io_map, AS_IO, 8, vgmplay_state ) AM_RANGE(0, 3) AM_NOP ADDRESS_MAP_END -static MACHINE_CONFIG_START( vgmplay ) +MACHINE_CONFIG_START(vgmplay_state::vgmplay) MCFG_CPU_ADD("vgmplay", VGMPLAY, 44100) MCFG_CPU_PROGRAM_MAP( file_map ) MCFG_CPU_IO_MAP( soundchips_map ) diff --git a/src/mame/drivers/vic10.cpp b/src/mame/drivers/vic10.cpp index ea24f03b650..0aeec370e71 100644 --- a/src/mame/drivers/vic10.cpp +++ b/src/mame/drivers/vic10.cpp @@ -98,6 +98,7 @@ public: int m_cia_irq; int m_vic_irq; int m_exp_irq; + void vic10(machine_config &config); }; @@ -688,7 +689,7 @@ void vic10_state::machine_reset() // MACHINE_CONFIG( vic10 ) //------------------------------------------------- -static MACHINE_CONFIG_START( vic10 ) +MACHINE_CONFIG_START(vic10_state::vic10) // basic hardware MCFG_CPU_ADD(M6510_TAG, M6510, XTAL_8MHz/8) MCFG_CPU_PROGRAM_MAP(vic10_mem) diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp index 2d5846e80c5..3c65ab64c5c 100644 --- a/src/mame/drivers/vic20.cpp +++ b/src/mame/drivers/vic20.cpp @@ -146,6 +146,9 @@ public: IO2 = 6, IO3 = 7 }; + void ntsc(machine_config &config); + void pal(machine_config &config); + void vic20(machine_config &config); }; @@ -787,7 +790,7 @@ WRITE_LINE_MEMBER(vic20_state::write_user_cassette_switch) // MACHINE_CONFIG( vic20_common ) //------------------------------------------------- -static MACHINE_CONFIG_START( vic20 ) +MACHINE_CONFIG_START(vic20_state::vic20) // devices MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(M6522_2_TAG, via6522_device, write_ca1)) MCFG_CBM_IEC_ADD("c1541") @@ -831,7 +834,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( ntsc ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( ntsc, vic20 ) +MACHINE_CONFIG_DERIVED(vic20_state::ntsc, vic20) // basic machine hardware MCFG_CPU_ADD(M6502_TAG, M6502, MOS6560_CLOCK) MCFG_CPU_PROGRAM_MAP(vic20_mem) @@ -878,7 +881,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( pal ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( pal, vic20 ) +MACHINE_CONFIG_DERIVED(vic20_state::pal, vic20) // basic machine hardware MCFG_CPU_ADD(M6502_TAG, M6502, MOS6561_CLOCK) MCFG_CPU_PROGRAM_MAP(vic20_mem) diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp index e8564c07243..28280cf350c 100644 --- a/src/mame/drivers/vicdual.cpp +++ b/src/mame/drivers/vicdual.cpp @@ -53,12 +53,6 @@ #include "emu.h" #include "includes/vicdual.h" -#include "audio/carnival.h" -#include "audio/depthch.h" -#include "audio/invinco.h" -#include "audio/pulsar.h" -#include "audio/tranqgun.h" -#include "audio/vicdual.h" #include "audio/vicdual-97271p.h" #include "video/vicdual-97269pb.h" @@ -256,7 +250,7 @@ void vicdual_state::machine_start() } -static MACHINE_CONFIG_START( vicdual_root ) +MACHINE_CONFIG_START(vicdual_state::vicdual_root) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, VICDUAL_MAIN_CPU_CLOCK) @@ -333,7 +327,7 @@ static INPUT_PORTS_START( depthch ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( depthch, vicdual_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::depthch, vicdual_root) /* basic machine hardware */ MCFG_CPU_REPLACE("maincpu", I8080, VICDUAL_MAIN_CPU_CLOCK) @@ -420,7 +414,7 @@ static INPUT_PORTS_START( safari ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( safari, vicdual_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::safari, vicdual_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -524,7 +518,7 @@ static INPUT_PORTS_START( frogs ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( frogs, vicdual_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::frogs, vicdual_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -768,7 +762,7 @@ static INPUT_PORTS_START( sspaceat ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( headon, vicdual_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::headon, vicdual_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -784,7 +778,7 @@ static MACHINE_CONFIG_DERIVED( headon, vicdual_root ) MCFG_FRAGMENT_ADD(headon_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( headons, headon ) +MACHINE_CONFIG_DERIVED(vicdual_state::headons, headon) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -792,7 +786,7 @@ static MACHINE_CONFIG_DERIVED( headons, headon ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sspaceat, vicdual_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::sspaceat, vicdual_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -985,7 +979,7 @@ MACHINE_RESET_MEMBER( vicdual_state, headon2 ) } -static MACHINE_CONFIG_DERIVED( headon2, vicdual_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::headon2, vicdual_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1003,7 +997,7 @@ static MACHINE_CONFIG_DERIVED( headon2, vicdual_root ) MCFG_FRAGMENT_ADD(headon_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( headon2bw, headon2 ) +MACHINE_CONFIG_DERIVED(vicdual_state::headon2bw, headon2) /* basic machine hardware */ /* video hardware */ @@ -1012,7 +1006,7 @@ static MACHINE_CONFIG_DERIVED( headon2bw, headon2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( digger, vicdual_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::digger, vicdual_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2043,7 +2037,7 @@ static INPUT_PORTS_START( headonn ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( vicdual_dualgame_root, vicdual_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::vicdual_dualgame_root, vicdual_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2056,7 +2050,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( invho2, vicdual_dualgame_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::invho2, vicdual_dualgame_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2070,7 +2064,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( invds, vicdual_dualgame_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::invds, vicdual_dualgame_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2081,7 +2075,7 @@ static MACHINE_CONFIG_DERIVED( invds, vicdual_dualgame_root ) MCFG_FRAGMENT_ADD(invinco_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( carhntds, vicdual_dualgame_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::carhntds, vicdual_dualgame_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2090,7 +2084,7 @@ static MACHINE_CONFIG_DERIVED( carhntds, vicdual_dualgame_root ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sspacaho, vicdual_dualgame_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::sspacaho, vicdual_dualgame_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2102,7 +2096,7 @@ static MACHINE_CONFIG_DERIVED( sspacaho, vicdual_dualgame_root ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spacetrk, vicdual_dualgame_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::spacetrk, vicdual_dualgame_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2110,7 +2104,7 @@ static MACHINE_CONFIG_DERIVED( spacetrk, vicdual_dualgame_root ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( carnival, vicdual_dualgame_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::carnival, vicdual_dualgame_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2123,7 +2117,7 @@ static MACHINE_CONFIG_DERIVED( carnival, vicdual_dualgame_root ) MCFG_FRAGMENT_ADD(carnival_audio) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( carnivalh, carnival ) +MACHINE_CONFIG_DERIVED(vicdual_state::carnivalh, carnival) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2131,7 +2125,7 @@ static MACHINE_CONFIG_DERIVED( carnivalh, carnival ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tranqgun, vicdual_dualgame_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::tranqgun, vicdual_dualgame_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2143,7 +2137,7 @@ static MACHINE_CONFIG_DERIVED( tranqgun, vicdual_dualgame_root ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( brdrline, vicdual_dualgame_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::brdrline, vicdual_dualgame_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2155,7 +2149,7 @@ static MACHINE_CONFIG_DERIVED( brdrline, vicdual_dualgame_root ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pulsar, vicdual_dualgame_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::pulsar, vicdual_dualgame_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2167,7 +2161,7 @@ static MACHINE_CONFIG_DERIVED( pulsar, vicdual_dualgame_root ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( heiankyo, vicdual_dualgame_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::heiankyo, vicdual_dualgame_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2175,7 +2169,7 @@ static MACHINE_CONFIG_DERIVED( heiankyo, vicdual_dualgame_root ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( alphaho, vicdual_dualgame_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::alphaho, vicdual_dualgame_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2183,7 +2177,7 @@ static MACHINE_CONFIG_DERIVED( alphaho, vicdual_dualgame_root ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( headonn, vicdual_dualgame_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::headonn, vicdual_dualgame_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2311,7 +2305,7 @@ MACHINE_START_MEMBER(vicdual_state,samurai) machine_start(); } -static MACHINE_CONFIG_DERIVED( samurai, vicdual_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::samurai, vicdual_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2496,7 +2490,7 @@ MACHINE_RESET_MEMBER(nsub_state, nsub) machine_reset(); } -static MACHINE_CONFIG_START( nsub ) +MACHINE_CONFIG_START(nsub_state::nsub) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, VICDUAL_MAIN_CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(nsub_map) @@ -2604,7 +2598,7 @@ static INPUT_PORTS_START( invinco ) INPUT_PORTS_END -static MACHINE_CONFIG_DERIVED( invinco, vicdual_root ) +MACHINE_CONFIG_DERIVED(vicdual_state::invinco, vicdual_root) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp index a8689dee94b..e9e9d2458ae 100644 --- a/src/mame/drivers/victor9k.cpp +++ b/src/mame/drivers/victor9k.cpp @@ -169,6 +169,7 @@ public: int m_kbackctl; void update_kback(); + void victor9k(machine_config &config); }; @@ -674,7 +675,7 @@ void victor9k_state::machine_reset() // MACHINE_CONFIG( victor9k ) //------------------------------------------------- -static MACHINE_CONFIG_START( victor9k ) +MACHINE_CONFIG_START(victor9k_state::victor9k) // basic machine hardware MCFG_CPU_ADD(I8088_TAG, I8088, XTAL_30MHz/6) MCFG_CPU_PROGRAM_MAP(victor9k_mem) diff --git a/src/mame/drivers/victory.cpp b/src/mame/drivers/victory.cpp index 53c356e44c4..75ced2815fc 100644 --- a/src/mame/drivers/victory.cpp +++ b/src/mame/drivers/victory.cpp @@ -208,7 +208,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( victory ) +MACHINE_CONFIG_START(victory_state::victory) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, VICTORY_MAIN_CPU_CLOCK) diff --git a/src/mame/drivers/vidbrain.cpp b/src/mame/drivers/vidbrain.cpp index 697763f1dbf..cabc90ef7b3 100644 --- a/src/mame/drivers/vidbrain.cpp +++ b/src/mame/drivers/vidbrain.cpp @@ -500,7 +500,7 @@ void vidbrain_state::machine_reset() // MACHINE_CONFIG( vidbrain ) //------------------------------------------------- -static MACHINE_CONFIG_START( vidbrain ) +MACHINE_CONFIG_START(vidbrain_state::vidbrain) // basic machine hardware MCFG_CPU_ADD(F3850_TAG, F8, XTAL_4MHz/2) MCFG_CPU_PROGRAM_MAP(vidbrain_mem) diff --git a/src/mame/drivers/videopin.cpp b/src/mame/drivers/videopin.cpp index 1aad6842543..93bcd44700e 100644 --- a/src/mame/drivers/videopin.cpp +++ b/src/mame/drivers/videopin.cpp @@ -358,7 +358,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( videopin ) +MACHINE_CONFIG_START(videopin_state::videopin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 12096000 / 16) diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp index 1b9945bca0f..89decc5bc8a 100644 --- a/src/mame/drivers/videopkr.cpp +++ b/src/mame/drivers/videopkr.cpp @@ -379,6 +379,12 @@ public: required_device m_soundcpu; required_device m_dac; required_device m_gfxdecode; + void babypkr(machine_config &config); + void videodad(machine_config &config); + void videopkr(machine_config &config); + void fortune1(machine_config &config); + void blckjack(machine_config &config); + void bpoker(machine_config &config); }; @@ -1240,7 +1246,7 @@ void videopkr_state::machine_start() * Machine Drivers * ************************/ -static MACHINE_CONFIG_START( videopkr ) +MACHINE_CONFIG_START(videopkr_state::videopkr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8039, CPU_CLOCK) @@ -1289,7 +1295,7 @@ static MACHINE_CONFIG_START( videopkr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( blckjack, videopkr ) +MACHINE_CONFIG_DERIVED(videopkr_state::blckjack, videopkr) /* basic machine hardware */ @@ -1300,7 +1306,7 @@ static MACHINE_CONFIG_DERIVED( blckjack, videopkr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( videodad, videopkr ) +MACHINE_CONFIG_DERIVED(videopkr_state::videodad, videopkr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1316,7 +1322,7 @@ static MACHINE_CONFIG_DERIVED( videodad, videopkr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( babypkr, videopkr ) +MACHINE_CONFIG_DERIVED(videopkr_state::babypkr, videopkr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1340,7 +1346,7 @@ static MACHINE_CONFIG_DERIVED( babypkr, videopkr ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( fortune1, videopkr ) +MACHINE_CONFIG_DERIVED(videopkr_state::fortune1, videopkr) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1350,7 +1356,7 @@ static MACHINE_CONFIG_DERIVED( fortune1, videopkr ) MCFG_PALETTE_INIT_OWNER(videopkr_state,fortune1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bpoker, babypkr ) +MACHINE_CONFIG_DERIVED(videopkr_state::bpoker, babypkr) MCFG_CPU_REPLACE("maincpu", I8751, XTAL_6MHz) MCFG_CPU_PROGRAM_MAP(i8751_map) MCFG_CPU_IO_MAP(i8751_io_port) diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp index 42991286a71..ddc52643152 100644 --- a/src/mame/drivers/vigilant.cpp +++ b/src/mame/drivers/vigilant.cpp @@ -471,7 +471,7 @@ static GFXDECODE_START( kikcubic ) GFXDECODE_END -static MACHINE_CONFIG_START( vigilant ) +MACHINE_CONFIG_START(vigilant_state::vigilant) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */ @@ -514,7 +514,7 @@ static MACHINE_CONFIG_START( vigilant ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( buccanrs ) +MACHINE_CONFIG_START(vigilant_state::buccanrs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5688800) /* 5.688800 MHz */ @@ -573,7 +573,7 @@ static MACHINE_CONFIG_START( buccanrs ) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( kikcubic ) +MACHINE_CONFIG_START(vigilant_state::kikcubic) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */ diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp index ac96d835c8c..d5757a7eea2 100644 --- a/src/mame/drivers/vii.cpp +++ b/src/mame/drivers/vii.cpp @@ -173,6 +173,10 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(vii_cart); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(vsmile_cart); + void vii(machine_config &config); + void vsmile(machine_config &config); + void wirels60(machine_config &config); + void batman(machine_config &config); protected: optional_memory_region m_bios_rom; required_ioport m_io_p1; @@ -1179,7 +1183,7 @@ INTERRUPT_GEN_MEMBER(vii_state::vii_vblank) } -static MACHINE_CONFIG_START( vii ) +MACHINE_CONFIG_START(vii_state::vii) MCFG_CPU_ADD( "maincpu", UNSP, XTAL_27MHz) MCFG_CPU_PROGRAM_MAP( vii_mem ) @@ -1200,7 +1204,7 @@ static MACHINE_CONFIG_START( vii ) MCFG_SOFTWARE_LIST_ADD("vii_cart","vii") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vsmile ) +MACHINE_CONFIG_START(vii_state::vsmile) MCFG_CPU_ADD( "maincpu", UNSP, XTAL_27MHz) MCFG_CPU_PROGRAM_MAP( vii_mem ) @@ -1221,7 +1225,7 @@ static MACHINE_CONFIG_START( vsmile ) MCFG_SOFTWARE_LIST_ADD("cart_list","vsmile_cart") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( batman ) +MACHINE_CONFIG_START(vii_state::batman) MCFG_CPU_ADD( "maincpu", UNSP, XTAL_27MHz) MCFG_CPU_PROGRAM_MAP( vii_mem ) @@ -1239,7 +1243,7 @@ static MACHINE_CONFIG_START( batman ) MCFG_PALETTE_ADD("palette", 32768) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wirels60 ) +MACHINE_CONFIG_START(vii_state::wirels60) MCFG_CPU_ADD( "maincpu", UNSP, XTAL_27MHz) MCFG_CPU_PROGRAM_MAP( vii_mem ) diff --git a/src/mame/drivers/vindictr.cpp b/src/mame/drivers/vindictr.cpp index bf9191291ae..df7eb31d204 100644 --- a/src/mame/drivers/vindictr.cpp +++ b/src/mame/drivers/vindictr.cpp @@ -182,7 +182,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( vindictr ) +MACHINE_CONFIG_START(vindictr_state::vindictr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2) diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp index 24efd928e23..24606ab0956 100644 --- a/src/mame/drivers/vip.cpp +++ b/src/mame/drivers/vip.cpp @@ -710,7 +710,7 @@ QUICKLOAD_LOAD_MEMBER( vip_state, vip ) // MACHINE_CONFIG( vip ) //------------------------------------------------- -static MACHINE_CONFIG_START( vip ) +MACHINE_CONFIG_START(vip_state::vip) // basic machine hardware MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_3_52128MHz/2) MCFG_CPU_PROGRAM_MAP(vip_mem) @@ -767,7 +767,7 @@ MACHINE_CONFIG_END // MACHINE_CONFIG( vp111 ) //------------------------------------------------- -static MACHINE_CONFIG_DERIVED( vp111, vip ) +MACHINE_CONFIG_DERIVED(vip_state::vp111, vip) // internal ram MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1K") diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp index f02509b3d27..0c966ec864d 100644 --- a/src/mame/drivers/viper.cpp +++ b/src/mame/drivers/viper.cpp @@ -428,6 +428,7 @@ public: uint32_t m_voodoo3_pci_reg[0x100]; uint32_t m_mpc8240_regs[256/4]; + void viper(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -2370,7 +2371,7 @@ void viper_state::machine_reset() m_ds2430_unk_status = 1; } -static MACHINE_CONFIG_START( viper ) +MACHINE_CONFIG_START(viper_state::viper) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MPC8240, 200000000) diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp index f4fb764b02f..3438e8c4194 100644 --- a/src/mame/drivers/vis.cpp +++ b/src/mame/drivers/vis.cpp @@ -130,7 +130,7 @@ void vis_audio_device::device_timer(emu_timer &timer, device_timer_id id, int pa } } -MACHINE_CONFIG_MEMBER( vis_audio_device::device_add_mconfig ) +MACHINE_CONFIG_START(vis_audio_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymf262", YMF262, XTAL_14_31818MHz) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) @@ -257,7 +257,7 @@ vis_vga_device::vis_vga_device(const machine_config &mconfig, const char *tag, d m_screen.set_tag("screen"); } -MACHINE_CONFIG_MEMBER( vis_vga_device::device_add_mconfig ) +MACHINE_CONFIG_START(vis_vga_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, vis_vga_device, screen_update) @@ -716,6 +716,7 @@ public: DECLARE_READ8_MEMBER(unk1_r); DECLARE_WRITE8_MEMBER(unk1_w); DECLARE_INPUT_CHANGED_MEMBER(update); + void vis(machine_config &config); protected: void machine_reset() override; private: @@ -881,7 +882,7 @@ static INPUT_PORTS_START(vis) PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_CHANGED_MEMBER(DEVICE_SELF, vis_state, update, 0) INPUT_PORTS_END -static MACHINE_CONFIG_START( vis ) +MACHINE_CONFIG_START(vis_state::vis) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80286, XTAL_12MHz ) MCFG_CPU_PROGRAM_MAP(at16_map) diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp index 43efdc422ec..921847b9869 100644 --- a/src/mame/drivers/vixen.cpp +++ b/src/mame/drivers/vixen.cpp @@ -737,7 +737,7 @@ void vixen_state::machine_reset() // MACHINE_CONFIG( vixen ) //------------------------------------------------- -static MACHINE_CONFIG_START( vixen ) +MACHINE_CONFIG_START(vixen_state::vixen) // basic machine hardware MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL_23_9616MHz/6) MCFG_CPU_PROGRAM_MAP(vixen_mem) diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp index 9ab61e5a94d..748091194e6 100644 --- a/src/mame/drivers/vk100.cpp +++ b/src/mame/drivers/vk100.cpp @@ -257,6 +257,7 @@ public: MC6845_UPDATE_ROW(crtc_update_row); void vram_write(uint8_t data); + void vk100(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -1032,7 +1033,7 @@ MC6845_UPDATE_ROW( vk100_state::crtc_update_row ) } -static MACHINE_CONFIG_START( vk100 ) +MACHINE_CONFIG_START(vk100_state::vk100) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, XTAL_5_0688MHz) MCFG_CPU_PROGRAM_MAP(vk100_mem) diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp index 0b76cf3640a..4f12f4ed791 100644 --- a/src/mame/drivers/vlc.cpp +++ b/src/mame/drivers/vlc.cpp @@ -209,6 +209,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); + void nevada(machine_config &config); }; /* @@ -589,7 +590,7 @@ MACHINE_START_MEMBER(nevada_state, nevada) * Machine Driver * *************************/ -static MACHINE_CONFIG_START( nevada ) +MACHINE_CONFIG_START(nevada_state::nevada) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, MASTER_CPU) MCFG_CPU_PROGRAM_MAP(nevada_map) diff --git a/src/mame/drivers/volfied.cpp b/src/mame/drivers/volfied.cpp index f94cb93fe91..cf117dfddd9 100644 --- a/src/mame/drivers/volfied.cpp +++ b/src/mame/drivers/volfied.cpp @@ -219,7 +219,7 @@ void volfied_state::machine_reset() cchip_reset(); } -static MACHINE_CONFIG_START( volfied ) +MACHINE_CONFIG_START(volfied_state::volfied) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 8MHz */ diff --git a/src/mame/drivers/votrpss.cpp b/src/mame/drivers/votrpss.cpp index 6affac50066..cbb25442fff 100644 --- a/src/mame/drivers/votrpss.cpp +++ b/src/mame/drivers/votrpss.cpp @@ -100,6 +100,7 @@ public: DECLARE_WRITE_LINE_MEMBER(write_uart_clock); IRQ_CALLBACK_MEMBER(irq_ack); + void votrpss(machine_config &config); private: uint8_t m_term_data; uint8_t m_porta; @@ -236,7 +237,7 @@ void votrpss_state::kbd_put(u8 data) Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( votrpss ) +MACHINE_CONFIG_START(votrpss_state::votrpss) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* 4.000 MHz, verified */ MCFG_CPU_PROGRAM_MAP(votrpss_mem) diff --git a/src/mame/drivers/votrtnt.cpp b/src/mame/drivers/votrtnt.cpp index 6b4e2d34792..34766a7c388 100644 --- a/src/mame/drivers/votrtnt.cpp +++ b/src/mame/drivers/votrtnt.cpp @@ -53,6 +53,7 @@ public: DECLARE_MACHINE_RESET(votrtnt); + void votrtnt(machine_config &config); private: required_device m_maincpu; required_device m_votrax; @@ -132,7 +133,7 @@ MACHINE_RESET_MEMBER( votrtnt_state, votrtnt ) Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( votrtnt ) +MACHINE_CONFIG_START(votrtnt_state::votrtnt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6802, XTAL_2_4576MHz) /* 2.4576MHz XTAL, verified; divided by 4 inside the m6802*/ MCFG_CPU_PROGRAM_MAP(6802_mem) diff --git a/src/mame/drivers/voyager.cpp b/src/mame/drivers/voyager.cpp index 006a984d56c..0f522d332b4 100644 --- a/src/mame/drivers/voyager.cpp +++ b/src/mame/drivers/voyager.cpp @@ -56,6 +56,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; void intel82439tx_init(); + void voyager(machine_config &config); }; @@ -490,7 +491,7 @@ void voyager_state::machine_reset() membank("bank1")->set_base(memregion("bios")->base()); } -static MACHINE_CONFIG_START( voyager ) +MACHINE_CONFIG_START(voyager_state::voyager) MCFG_CPU_ADD("maincpu", PENTIUM3, 133000000) // actually AMD Duron CPU of unknown clock MCFG_CPU_PROGRAM_MAP(voyager_map) MCFG_CPU_IO_MAP(voyager_io) diff --git a/src/mame/drivers/vp101.cpp b/src/mame/drivers/vp101.cpp index 9798ba9e24e..2f27433302d 100644 --- a/src/mame/drivers/vp101.cpp +++ b/src/mame/drivers/vp101.cpp @@ -140,6 +140,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t vp50_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void vp50(machine_config &config); + void vp101(machine_config &config); protected: // devices @@ -361,7 +363,7 @@ static INPUT_PORTS_START( vp50 ) PORT_BIT( 0xfffffff0, IP_ACTIVE_HIGH, IPT_UNKNOWN ) INPUT_PORTS_END -static MACHINE_CONFIG_START( vp101 ) +MACHINE_CONFIG_START(vp10x_state::vp101) MCFG_CPU_ADD("maincpu", VR5500LE, 400000000) MCFG_MIPS3_DCACHE_SIZE(32768) MCFG_MIPS3_SYSTEM_CLOCK(100000000) @@ -380,7 +382,7 @@ static MACHINE_CONFIG_START( vp101 ) MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vp50 ) +MACHINE_CONFIG_START(vp10x_state::vp50) MCFG_CPU_ADD("maincpu", TX4925LE, 200000000) MCFG_MIPS3_DCACHE_SIZE(32768) MCFG_MIPS3_SYSTEM_CLOCK(100000000) diff --git a/src/mame/drivers/vp122.cpp b/src/mame/drivers/vp122.cpp index dfb0269ee35..fe41e90815c 100644 --- a/src/mame/drivers/vp122.cpp +++ b/src/mame/drivers/vp122.cpp @@ -27,6 +27,7 @@ public: SCN2674_DRAW_CHARACTER_MEMBER(draw_character); + void vp122(machine_config &config); private: required_device m_maincpu; required_device m_screen; @@ -63,7 +64,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( vp122 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( vp122 ) +MACHINE_CONFIG_START(vp122_state::vp122) MCFG_CPU_ADD("maincpu", I8085A, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/vp60.cpp b/src/mame/drivers/vp60.cpp index 637a941090b..a892d8476b9 100644 --- a/src/mame/drivers/vp60.cpp +++ b/src/mame/drivers/vp60.cpp @@ -25,6 +25,7 @@ public: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void vp60(machine_config &config); private: required_device m_maincpu; required_region_ptr m_p_chargen; @@ -50,7 +51,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( vp60 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( vp60 ) +MACHINE_CONFIG_START(vp60_state::vp60) MCFG_CPU_ADD("maincpu", I8051, XTAL_10_920MHz) MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/vpoker.cpp b/src/mame/drivers/vpoker.cpp index 9cfde154c45..29e1825ed1e 100644 --- a/src/mame/drivers/vpoker.cpp +++ b/src/mame/drivers/vpoker.cpp @@ -124,6 +124,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void vpoker(machine_config &config); }; @@ -627,7 +628,7 @@ WRITE_LINE_MEMBER(vpoker_state::ptm_irq) m_maincpu->set_input_line(M6809_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); } -static MACHINE_CONFIG_START( vpoker ) +MACHINE_CONFIG_START(vpoker_state::vpoker) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6809,XTAL_4MHz) diff --git a/src/mame/drivers/vroulet.cpp b/src/mame/drivers/vroulet.cpp index d01f069e83a..c8e5c7b7c7f 100644 --- a/src/mame/drivers/vroulet.cpp +++ b/src/mame/drivers/vroulet.cpp @@ -81,6 +81,7 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void vroulet(machine_config &config); }; @@ -271,7 +272,7 @@ WRITE8_MEMBER(vroulet_state::ppi8255_c_w){} /* Machine Driver */ -static MACHINE_CONFIG_START( vroulet ) +MACHINE_CONFIG_START(vroulet_state::vroulet) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, 4000000) //??? MCFG_CPU_PROGRAM_MAP(vroulet_map) diff --git a/src/mame/drivers/vsmilepro.cpp b/src/mame/drivers/vsmilepro.cpp index b80269ab1e4..7b030130b5b 100644 --- a/src/mame/drivers/vsmilepro.cpp +++ b/src/mame/drivers/vsmilepro.cpp @@ -34,6 +34,7 @@ public: m_maincpu(*this, "maincpu") { } + void vsmilpro(machine_config &config); private: required_device m_maincpu; }; @@ -47,7 +48,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( vsmilpro ) INPUT_PORTS_END -static MACHINE_CONFIG_START( vsmilpro ) +MACHINE_CONFIG_START(vsmilpro_state::vsmilpro) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM9, 150000000) MCFG_CPU_PROGRAM_MAP(vsmilpro_map) diff --git a/src/mame/drivers/vsnes.cpp b/src/mame/drivers/vsnes.cpp index 1c3a500af24..f886ab3161c 100644 --- a/src/mame/drivers/vsnes.cpp +++ b/src/mame/drivers/vsnes.cpp @@ -1698,7 +1698,7 @@ static INPUT_PORTS_START( supxevs ) PORT_DIPSETTING( 0xc0, "RP2C04-0004" ) INPUT_PORTS_END -static MACHINE_CONFIG_START( vsnes ) +MACHINE_CONFIG_START(vsnes_state::vsnes) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK) @@ -1729,7 +1729,7 @@ static MACHINE_CONFIG_START( vsnes ) MCFG_SPEAKER_STANDARD_MONO("mono") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jajamaru, vsnes ) +MACHINE_CONFIG_DERIVED(vsnes_state::jajamaru, vsnes) MCFG_DEVICE_REMOVE( "ppu1" ) MCFG_PPU2C05_01_ADD("ppu1") @@ -1738,7 +1738,7 @@ static MACHINE_CONFIG_DERIVED( jajamaru, vsnes ) MCFG_PPU2C0X_SET_NMI(vsnes_state, ppu_irq_1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mightybj, vsnes ) +MACHINE_CONFIG_DERIVED(vsnes_state::mightybj, vsnes) MCFG_DEVICE_REMOVE( "ppu1" ) MCFG_PPU2C05_02_ADD("ppu1") @@ -1747,7 +1747,7 @@ static MACHINE_CONFIG_DERIVED( mightybj, vsnes ) MCFG_PPU2C0X_SET_NMI(vsnes_state, ppu_irq_1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vsgshoe, vsnes ) +MACHINE_CONFIG_DERIVED(vsnes_state::vsgshoe, vsnes) MCFG_DEVICE_REMOVE( "ppu1" ) MCFG_PPU2C05_03_ADD("ppu1") @@ -1756,7 +1756,7 @@ static MACHINE_CONFIG_DERIVED( vsgshoe, vsnes ) MCFG_PPU2C0X_SET_NMI(vsnes_state, ppu_irq_1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( topgun, vsnes ) +MACHINE_CONFIG_DERIVED(vsnes_state::topgun, vsnes) MCFG_DEVICE_REMOVE( "ppu1" ) MCFG_PPU2C05_04_ADD("ppu1") @@ -1765,7 +1765,7 @@ static MACHINE_CONFIG_DERIVED( topgun, vsnes ) MCFG_PPU2C0X_SET_NMI(vsnes_state, ppu_irq_1) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vsdual ) +MACHINE_CONFIG_START(vsnes_state::vsdual) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK) @@ -1815,7 +1815,7 @@ static MACHINE_CONFIG_START( vsdual ) MCFG_SPEAKER_STANDARD_MONO("mono") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vsdual_pi, vsdual ) +MACHINE_CONFIG_DERIVED(vsnes_state::vsdual_pi, vsdual) MCFG_QUANTUM_PERFECT_CPU("maincpu") // need high level of interleave to keep screens in sync in Balloon Fight. // however vsmahjng doesn't like perfect interleave? you end up needing to reset it to boot? maybe something in a bad default state? watchdog? @@ -1823,7 +1823,7 @@ static MACHINE_CONFIG_DERIVED( vsdual_pi, vsdual ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vsnes_bootleg ) +MACHINE_CONFIG_START(vsnes_state::vsnes_bootleg) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,XTAL_16MHz/4) // 4mhz? seems too high but flickers badly otherwise, issue elsewhere? diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp index e2f903d9694..4020e8a8166 100644 --- a/src/mame/drivers/vt100.cpp +++ b/src/mame/drivers/vt100.cpp @@ -74,6 +74,9 @@ public: uint32_t screen_update_vt100(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vt100_vertical_interrupt); IRQ_CALLBACK_MEMBER(vt100_irq_callback); + void vt102(machine_config &config); + void vt100(machine_config &config); + void vt180(machine_config &config); }; @@ -259,7 +262,7 @@ static GFXDECODE_START( vt100 ) GFXDECODE_ENTRY( "chargen", 0x0000, vt100_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( vt100 ) +MACHINE_CONFIG_START(vt100_state::vt100) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, XTAL_24_8832MHz / 9) MCFG_CPU_PROGRAM_MAP(vt100_mem) @@ -305,13 +308,13 @@ static MACHINE_CONFIG_START( vt100 ) MCFG_VT100_KEYBOARD_INT_CALLBACK(WRITELINE(vt100_state, keyboard_int_w)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vt180, vt100 ) +MACHINE_CONFIG_DERIVED(vt100_state::vt180, vt100) MCFG_CPU_ADD("z80cpu", Z80, XTAL_24_8832MHz / 9) MCFG_CPU_PROGRAM_MAP(vt180_mem) MCFG_CPU_IO_MAP(vt180_io) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( vt102, vt100 ) +MACHINE_CONFIG_DERIVED(vt100_state::vt102, vt100) MCFG_CPU_REPLACE("maincpu",I8085A, XTAL_24_8832MHz / 9) MCFG_CPU_PROGRAM_MAP(vt100_mem) MCFG_CPU_IO_MAP(vt100_io) diff --git a/src/mame/drivers/vt220.cpp b/src/mame/drivers/vt220.cpp index c2a47e83606..3308711e44c 100644 --- a/src/mame/drivers/vt220.cpp +++ b/src/mame/drivers/vt220.cpp @@ -33,6 +33,7 @@ public: uint32_t screen_update_vt220(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_ram; + void vt220(machine_config &config); }; @@ -66,7 +67,7 @@ uint32_t vt220_state::screen_update_vt220(screen_device &screen, bitmap_ind16 &b } -static MACHINE_CONFIG_START( vt220 ) +MACHINE_CONFIG_START(vt220_state::vt220) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8051, XTAL_11_0592MHz) // from schematic MCFG_CPU_PROGRAM_MAP(vt220_mem) diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp index f0396b1bcf0..db0965b4473 100644 --- a/src/mame/drivers/vt240.cpp +++ b/src/mame/drivers/vt240.cpp @@ -122,6 +122,8 @@ public: uint16_t m_irqs; bool m_lb; uint16_t m_scrl; + void mc7105(machine_config &config); + void vt240(machine_config &config); }; void vt240_state::irq_encoder(int irq, int state) @@ -638,7 +640,7 @@ static INPUT_PORTS_START( vt240 ) PORT_CONFSETTING(0x01, "Color") INPUT_PORTS_END -static MACHINE_CONFIG_START( vt240 ) +MACHINE_CONFIG_START(vt240_state::vt240) MCFG_CPU_ADD("maincpu", T11, XTAL_7_3728MHz) // confirm MCFG_CPU_PROGRAM_MAP(vt240_mem) MCFG_T11_INITIAL_MODE(5 << 13) @@ -700,7 +702,7 @@ static MACHINE_CONFIG_START( vt240 ) MCFG_X2212_ADD("x2212") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mc7105, vt240 ) +MACHINE_CONFIG_DERIVED(vt240_state::mc7105, vt240) MCFG_DEVICE_REMOVE("lk201") MCFG_DEVICE_ADD("ms7004", MS7004, 0) diff --git a/src/mame/drivers/vt320.cpp b/src/mame/drivers/vt320.cpp index 80fc0d5eaa3..5301868641a 100644 --- a/src/mame/drivers/vt320.cpp +++ b/src/mame/drivers/vt320.cpp @@ -29,6 +29,7 @@ public: uint32_t screen_update_vt320(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_ram; + void vt320(machine_config &config); }; /* @@ -84,7 +85,7 @@ uint32_t vt320_state::screen_update_vt320(screen_device &screen, bitmap_ind16 &b } -static MACHINE_CONFIG_START( vt320 ) +MACHINE_CONFIG_START(vt320_state::vt320) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8051, XTAL_16MHz) MCFG_CPU_PROGRAM_MAP(vt320_mem) diff --git a/src/mame/drivers/vt520.cpp b/src/mame/drivers/vt520.cpp index 25bf15e4123..a8650da1df8 100644 --- a/src/mame/drivers/vt520.cpp +++ b/src/mame/drivers/vt520.cpp @@ -29,6 +29,8 @@ public: uint32_t screen_update_vt520(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_region_ptr m_rom; + void vt520(machine_config &config); + void vt420(machine_config &config); }; @@ -75,7 +77,7 @@ uint32_t vt520_state::screen_update_vt520(screen_device &screen, bitmap_ind16 &b return 0; } -static MACHINE_CONFIG_START( vt420 ) +MACHINE_CONFIG_START(vt520_state::vt420) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C31, XTAL_43_320MHz / 3) // SCN8031HCFN40 (divider not verified) MCFG_CPU_PROGRAM_MAP(vt520_mem) @@ -93,7 +95,7 @@ static MACHINE_CONFIG_START( vt420 ) MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( vt520 ) +MACHINE_CONFIG_START(vt520_state::vt520) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80C32, XTAL_20MHz) // Philips P80C32IBPN MCFG_CPU_PROGRAM_MAP(vt520_mem) diff --git a/src/mame/drivers/vta2000.cpp b/src/mame/drivers/vta2000.cpp index 3bcfc7f45b8..a7b2f62c418 100644 --- a/src/mame/drivers/vta2000.cpp +++ b/src/mame/drivers/vta2000.cpp @@ -36,6 +36,7 @@ public: uint32_t screen_update_vta2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_PALETTE_INIT(vta2000); + void vta2000(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -154,7 +155,7 @@ PALETTE_INIT_MEMBER(vta2000_state, vta2000) palette.set_pen_color(2, 0x00, 0xff, 0x00); // highlight } -static MACHINE_CONFIG_START( vta2000 ) +MACHINE_CONFIG_START(vta2000_state::vta2000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8080, XTAL_4MHz / 4) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/vtech1.cpp b/src/mame/drivers/vtech1.cpp index f1d23a777e8..afeca778c5b 100644 --- a/src/mame/drivers/vtech1.cpp +++ b/src/mame/drivers/vtech1.cpp @@ -89,6 +89,11 @@ public: DECLARE_SNAPSHOT_LOAD_MEMBER( vtech1 ); + void laser310(machine_config &config); + void laser200(machine_config &config); + void laser310h(machine_config &config); + void laser110(machine_config &config); + void laser210(machine_config &config); private: static const uint8_t VZ_BASIC = 0xf0; static const uint8_t VZ_MCODE = 0xf1; @@ -419,7 +424,7 @@ INPUT_PORTS_END static const int16_t speaker_levels[] = {-32768, 0, 32767, 0}; -static MACHINE_CONFIG_START( laser110 ) +MACHINE_CONFIG_START(vtech1_state::laser110) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, VTECH1_CLK) /* 3.57950 MHz */ @@ -460,7 +465,7 @@ static MACHINE_CONFIG_START( laser110 ) MCFG_SOFTWARE_LIST_ADD("cass_list", "vz_cass") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( laser200, laser110 ) +MACHINE_CONFIG_DERIVED(vtech1_state::laser200, laser110) MCFG_DEVICE_REMOVE("mc6847") MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL_4_433619MHz) MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) MCFG_DEVCB_INVERT @@ -470,18 +475,18 @@ static MACHINE_CONFIG_DERIVED( laser200, laser110 ) // other lines not connected MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( laser210, laser200 ) +MACHINE_CONFIG_DERIVED(vtech1_state::laser210, laser200) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(laser210_mem) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( laser310, laser200 ) +MACHINE_CONFIG_DERIVED(vtech1_state::laser310, laser200) MCFG_CPU_REPLACE("maincpu", Z80, VZ300_XTAL1_CLK / 5) /* 3.546894 MHz */ MCFG_CPU_PROGRAM_MAP(laser310_mem) MCFG_CPU_IO_MAP(vtech1_io) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( laser310h, laser310 ) +MACHINE_CONFIG_DERIVED(vtech1_state::laser310h, laser310) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(vtech1_shrg_io) diff --git a/src/mame/drivers/vtech2.cpp b/src/mame/drivers/vtech2.cpp index 3e6cb395935..48032b3ec0e 100644 --- a/src/mame/drivers/vtech2.cpp +++ b/src/mame/drivers/vtech2.cpp @@ -413,7 +413,7 @@ static const floppy_interface vtech2_floppy_interface = nullptr }; -static MACHINE_CONFIG_START( laser350 ) +MACHINE_CONFIG_START(vtech2_state::laser350) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3694700) /* 3.694700 MHz */ MCFG_CPU_PROGRAM_MAP(vtech2_mem) @@ -455,12 +455,12 @@ static MACHINE_CONFIG_START( laser350 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( laser500, laser350 ) +MACHINE_CONFIG_DERIVED(vtech2_state::laser500, laser350) MCFG_MACHINE_RESET_OVERRIDE(vtech2_state, laser500 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( laser700, laser350 ) +MACHINE_CONFIG_DERIVED(vtech2_state::laser700, laser350) MCFG_MACHINE_RESET_OVERRIDE(vtech2_state, laser700 ) /* Second 5.25" floppy drive */ diff --git a/src/mame/drivers/vulgus.cpp b/src/mame/drivers/vulgus.cpp index f7722214ea6..a8ec4d9ce68 100644 --- a/src/mame/drivers/vulgus.cpp +++ b/src/mame/drivers/vulgus.cpp @@ -214,7 +214,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( vulgus ) +MACHINE_CONFIG_START(vulgus_state::vulgus) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz */ diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp index ded61a8c7af..9e41c4f9c3b 100644 --- a/src/mame/drivers/wacky_gator.cpp +++ b/src/mame/drivers/wacky_gator.cpp @@ -83,6 +83,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(nmi_timer) { m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } + void wackygtr(machine_config &config); private: int m_adpcm_sel; uint16_t m_adpcm_pos; @@ -271,7 +272,7 @@ static ADDRESS_MAP_START( program_map, AS_PROGRAM, 8, wackygtr_state ) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END -static MACHINE_CONFIG_START( wackygtr ) +MACHINE_CONFIG_START(wackygtr_state::wackygtr) MCFG_CPU_ADD("maincpu", MC6809, XTAL_3_579545MHz) // HD68B09P MCFG_CPU_PROGRAM_MAP(program_map) diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp index 7aadabad847..8f5acfd6507 100644 --- a/src/mame/drivers/wallc.cpp +++ b/src/mame/drivers/wallc.cpp @@ -84,6 +84,8 @@ public: DECLARE_DRIVER_INIT(sidam); DECLARE_DRIVER_INIT(unkitpkr); + void unkitpkr(machine_config &config); + void wallc(machine_config &config); protected: virtual void video_start() override; @@ -468,7 +470,7 @@ DRIVER_INIT_MEMBER(wallc_state, wallca) } -static MACHINE_CONFIG_START( wallc ) +MACHINE_CONFIG_START(wallc_state::wallc) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 12288000 / 4) /* 3.072 MHz ? */ MCFG_CPU_PROGRAM_MAP(wallc_map) @@ -494,7 +496,7 @@ static MACHINE_CONFIG_START( wallc ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( unkitpkr, wallc ) +MACHINE_CONFIG_DERIVED(wallc_state::unkitpkr, wallc) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(unkitpkr_map) diff --git a/src/mame/drivers/wangpc.cpp b/src/mame/drivers/wangpc.cpp index 1cdd9ce91af..793ee78737a 100644 --- a/src/mame/drivers/wangpc.cpp +++ b/src/mame/drivers/wangpc.cpp @@ -214,6 +214,7 @@ public: int m_ds2; int m_led[6]; + void wangpc(machine_config &config); }; @@ -1265,7 +1266,7 @@ void wangpc_state::on_disk1_unload(floppy_image_device *image) // MACHINE_CONFIG( wangpc ) //------------------------------------------------- -static MACHINE_CONFIG_START( wangpc ) +MACHINE_CONFIG_START(wangpc_state::wangpc) MCFG_CPU_ADD(I8086_TAG, I8086, 8000000) MCFG_CPU_PROGRAM_MAP(wangpc_mem) MCFG_CPU_IO_MAP(wangpc_io) diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp index 834881e7c3f..2e0e87e8345 100644 --- a/src/mame/drivers/wardner.cpp +++ b/src/mame/drivers/wardner.cpp @@ -152,6 +152,7 @@ public: DECLARE_WRITE8_MEMBER(wardner_bank_w); DECLARE_DRIVER_INIT(wardner); + void wardner(machine_config &config); protected: virtual void driver_start() override; virtual void machine_reset() override; @@ -360,7 +361,7 @@ void wardner_state::machine_reset() m_membank->set_bank(0); } -static MACHINE_CONFIG_START( wardner ) +MACHINE_CONFIG_START(wardner_state::wardner) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* 6MHz */ diff --git a/src/mame/drivers/warpsped.cpp b/src/mame/drivers/warpsped.cpp index 3e594948206..e0ba6794f4b 100644 --- a/src/mame/drivers/warpsped.cpp +++ b/src/mame/drivers/warpsped.cpp @@ -120,6 +120,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_circles(bitmap_ind16 &bitmap); + void warpspeed(machine_config &config); }; WRITE8_MEMBER(warpspeed_state::hardware_w) @@ -315,7 +316,7 @@ PALETTE_INIT_MEMBER(warpspeed_state, warpspeed) } } -static MACHINE_CONFIG_START( warpspeed ) +MACHINE_CONFIG_START(warpspeed_state::warpspeed) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz/2) diff --git a/src/mame/drivers/warpwarp.cpp b/src/mame/drivers/warpwarp.cpp index 60bc71de95e..c151982dd15 100644 --- a/src/mame/drivers/warpwarp.cpp +++ b/src/mame/drivers/warpwarp.cpp @@ -705,7 +705,7 @@ GFXDECODE_END -static MACHINE_CONFIG_START( geebee ) +MACHINE_CONFIG_START(warpwarp_state::geebee) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* verified on pcb */ @@ -742,12 +742,12 @@ static MACHINE_CONFIG_START( geebee ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( geebeeb, geebee ) +MACHINE_CONFIG_DERIVED(warpwarp_state::geebeeb, geebee) MCFG_DEVICE_MODIFY("latch") MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // remove coin lockout MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( navarone, geebee ) +MACHINE_CONFIG_DERIVED(warpwarp_state::navarone, geebee) /* basic machine hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", 2k) @@ -758,7 +758,7 @@ static MACHINE_CONFIG_DERIVED( navarone, geebee ) MCFG_VIDEO_START_OVERRIDE(warpwarp_state,navarone) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( bombbee ) +MACHINE_CONFIG_START(warpwarp_state::bombbee) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) @@ -796,7 +796,7 @@ static MACHINE_CONFIG_START( bombbee ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( warpwarp, bombbee ) +MACHINE_CONFIG_DERIVED(warpwarp_state::warpwarp, bombbee) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/warriorb.cpp b/src/mame/drivers/warriorb.cpp index 1d1f4a4f968..ae999186ceb 100644 --- a/src/mame/drivers/warriorb.cpp +++ b/src/mame/drivers/warriorb.cpp @@ -432,7 +432,7 @@ void warriorb_state::machine_reset() machine().sound().system_enable(true); /* mixer enabled */ } -static MACHINE_CONFIG_START( darius2d ) +MACHINE_CONFIG_START(warriorb_state::darius2d) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? (Might well be 16!) */ @@ -521,7 +521,7 @@ static MACHINE_CONFIG_START( darius2d ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( warriorb ) +MACHINE_CONFIG_START(warriorb_state::warriorb) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ? */ diff --git a/src/mame/drivers/wc90.cpp b/src/mame/drivers/wc90.cpp index 5116d20b951..e075433c1f4 100644 --- a/src/mame/drivers/wc90.cpp +++ b/src/mame/drivers/wc90.cpp @@ -343,7 +343,7 @@ void wc90_state::machine_start() } -static MACHINE_CONFIG_START( wc90 ) +MACHINE_CONFIG_START(wc90_state::wc90) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz) /* verified on pcb */ @@ -389,11 +389,11 @@ static MACHINE_CONFIG_START( wc90 ) MCFG_SOUND_ROUTE(2, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wc90t, wc90 ) +MACHINE_CONFIG_DERIVED(wc90_state::wc90t, wc90) MCFG_VIDEO_START_OVERRIDE(wc90_state, wc90t ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pac90, wc90 ) +MACHINE_CONFIG_DERIVED(wc90_state::pac90, wc90) MCFG_DEVICE_MODIFY("spritegen") MCFG_TECMO_SPRITE_YOFFSET(16) // sprites need shifting, why? MACHINE_CONFIG_END diff --git a/src/mame/drivers/wc90b.cpp b/src/mame/drivers/wc90b.cpp index 826d18ee438..3cbab3cefc9 100644 --- a/src/mame/drivers/wc90b.cpp +++ b/src/mame/drivers/wc90b.cpp @@ -350,7 +350,7 @@ void wc90b_state::machine_start() } -static MACHINE_CONFIG_START( wc90b ) +MACHINE_CONFIG_START(wc90b_state::wc90b) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp index 4364a2cc76f..2bc21262fc9 100644 --- a/src/mame/drivers/wecleman.cpp +++ b/src/mame/drivers/wecleman.cpp @@ -1070,7 +1070,7 @@ MACHINE_RESET_MEMBER(wecleman_state,wecleman) m_k007232->set_bank( 0, 1 ); } -static MACHINE_CONFIG_START( wecleman ) +MACHINE_CONFIG_START(wecleman_state::wecleman) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* Schems show 10MHz */ @@ -1141,7 +1141,7 @@ MACHINE_RESET_MEMBER(wecleman_state,hotchase) } -static MACHINE_CONFIG_START( hotchase ) +MACHINE_CONFIG_START(wecleman_state::hotchase) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */ diff --git a/src/mame/drivers/welltris.cpp b/src/mame/drivers/welltris.cpp index 8d0cb8556c0..f7864970e26 100644 --- a/src/mame/drivers/welltris.cpp +++ b/src/mame/drivers/welltris.cpp @@ -667,7 +667,7 @@ void welltris_state::machine_start() membank("soundbank")->configure_entries(0, 4, memregion("audiocpu")->base(), 0x8000); } -static MACHINE_CONFIG_START( welltris ) +MACHINE_CONFIG_START(welltris_state::welltris) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* 10 MHz */ @@ -712,7 +712,7 @@ static MACHINE_CONFIG_START( welltris ) MCFG_SOUND_ROUTE(2, "mono", 0.75) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( quiz18k, welltris ) +MACHINE_CONFIG_DERIVED(welltris_state::quiz18k, welltris) /* basic machine hardware */ diff --git a/src/mame/drivers/wgp.cpp b/src/mame/drivers/wgp.cpp index 96f4ad409eb..323bb8cf0bd 100644 --- a/src/mame/drivers/wgp.cpp +++ b/src/mame/drivers/wgp.cpp @@ -902,7 +902,7 @@ void wgp_state::machine_start() machine().save().register_postload(save_prepost_delegate(FUNC(wgp_state::postload), this)); } -static MACHINE_CONFIG_START( wgp ) +MACHINE_CONFIG_START(wgp_state::wgp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */ @@ -962,7 +962,7 @@ static MACHINE_CONFIG_START( wgp ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wgp2, wgp ) +MACHINE_CONFIG_DERIVED(wgp_state::wgp2, wgp) MCFG_QUANTUM_TIME(attotime::from_hz(12000)) /* video hardware */ diff --git a/src/mame/drivers/wheelfir.cpp b/src/mame/drivers/wheelfir.cpp index ab7097256a0..17c5f02f83c 100644 --- a/src/mame/drivers/wheelfir.cpp +++ b/src/mame/drivers/wheelfir.cpp @@ -288,6 +288,7 @@ public: uint32_t screen_update_wheelfir(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_wheelfir); TIMER_DEVICE_CALLBACK_MEMBER(scanline_timer_callback); + void wheelfir(machine_config &config); }; @@ -747,7 +748,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, wheelfir_state ) AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb888_w) ADDRESS_MAP_END -static MACHINE_CONFIG_START( wheelfir ) +MACHINE_CONFIG_START(wheelfir_state::wheelfir) MCFG_CPU_ADD("maincpu", M68000, 32000000/2) MCFG_CPU_PROGRAM_MAP(wheelfir_main) diff --git a/src/mame/drivers/white_mod.cpp b/src/mame/drivers/white_mod.cpp index 6722aaa2a45..e8ecfb7385f 100644 --- a/src/mame/drivers/white_mod.cpp +++ b/src/mame/drivers/white_mod.cpp @@ -16,6 +16,7 @@ public: m_maincpu(*this, "maincpu") { } + void whitestar_mod(machine_config &config); protected: // devices @@ -43,7 +44,7 @@ DRIVER_INIT_MEMBER(whitestar_mod_state,whitestar_mod) { } -static MACHINE_CONFIG_START( whitestar_mod ) +MACHINE_CONFIG_START(whitestar_mod_state::whitestar_mod) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, 2000000) MCFG_CPU_PROGRAM_MAP(whitestar_mod_map) diff --git a/src/mame/drivers/whitestar.cpp b/src/mame/drivers/whitestar.cpp index 74c53efed53..1ae100ff657 100644 --- a/src/mame/drivers/whitestar.cpp +++ b/src/mame/drivers/whitestar.cpp @@ -39,6 +39,7 @@ public: DECLARE_WRITE8_MEMBER(switch_w); virtual void machine_start() override; INTERRUPT_GEN_MEMBER(whitestar_firq_interrupt); + void whitestar(machine_config &config); }; static INPUT_PORTS_START( whitestar ) @@ -113,7 +114,7 @@ INTERRUPT_GEN_MEMBER(whitestar_state::whitestar_firq_interrupt) device.execute().set_input_line(M6809_FIRQ_LINE, HOLD_LINE); } -static MACHINE_CONFIG_START( whitestar ) +MACHINE_CONFIG_START(whitestar_state::whitestar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, 2000000) MCFG_CPU_PROGRAM_MAP(whitestar_map) diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp index a81237738a3..2cb12a50a54 100644 --- a/src/mame/drivers/wicat.cpp +++ b/src/mame/drivers/wicat.cpp @@ -127,6 +127,7 @@ public: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + void wicat(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; @@ -763,7 +764,7 @@ I8275_DRAW_CHARACTER_MEMBER(wicat_state::wicat_display_pixels) } } -static MACHINE_CONFIG_START( wicat ) +MACHINE_CONFIG_START(wicat_state::wicat) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(wicat_mem) diff --git a/src/mame/drivers/wico.cpp b/src/mame/drivers/wico.cpp index b7362edd9cc..cf5648e6fa1 100644 --- a/src/mame/drivers/wico.cpp +++ b/src/mame/drivers/wico.cpp @@ -70,6 +70,7 @@ public: DECLARE_READ8_MEMBER(gentmrcl_r); TIMER_DEVICE_CALLBACK_MEMBER(irq_housekeeping); TIMER_DEVICE_CALLBACK_MEMBER(firq_housekeeping); + void wico(machine_config &config); private: bool m_zcen; bool m_gten; @@ -428,7 +429,7 @@ void wico_state::machine_reset() } -static MACHINE_CONFIG_START( wico ) +MACHINE_CONFIG_START(wico_state::wico) /* basic machine hardware */ MCFG_CPU_ADD("ccpu", MC6809E, XTAL_10MHz / 8) // MC68A09EP @ U51 MCFG_CPU_PROGRAM_MAP(ccpu_map) diff --git a/src/mame/drivers/wildpkr.cpp b/src/mame/drivers/wildpkr.cpp index 701a69d4346..ef00f7599ee 100644 --- a/src/mame/drivers/wildpkr.cpp +++ b/src/mame/drivers/wildpkr.cpp @@ -217,6 +217,8 @@ public: DECLARE_WRITE16_MEMBER(clock_rate_w); DECLARE_WRITE16_MEMBER(unknown_trigger_w); IRQ_CALLBACK_MEMBER(tabpkr_irq_ack); + void wildpkr(machine_config &config); + void tabpkr(machine_config &config); }; @@ -449,7 +451,7 @@ IRQ_CALLBACK_MEMBER(wildpkr_state::tabpkr_irq_ack) * Machine Drivers * *************************/ -static MACHINE_CONFIG_START( wildpkr ) +MACHINE_CONFIG_START(wildpkr_state::wildpkr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MAIN_CLOCK) @@ -480,7 +482,7 @@ static MACHINE_CONFIG_START( wildpkr ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( tabpkr ) +MACHINE_CONFIG_START(wildpkr_state::tabpkr) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) diff --git a/src/mame/drivers/williams.cpp b/src/mame/drivers/williams.cpp index db3d05b2103..cb89505a767 100644 --- a/src/mame/drivers/williams.cpp +++ b/src/mame/drivers/williams.cpp @@ -1448,7 +1448,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( williams ) +MACHINE_CONFIG_START(williams_state::williams) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/3/4) @@ -1498,7 +1498,7 @@ static MACHINE_CONFIG_START( williams ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( defender, williams ) +MACHINE_CONFIG_DERIVED(williams_state::defender, williams) /* basic machine hardware */ @@ -1523,14 +1523,14 @@ static MACHINE_CONFIG_DERIVED( defender, williams ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jin, defender ) // needs a different screen size or the credit text is clipped +MACHINE_CONFIG_DERIVED(williams_state::jin, defender) // needs a different screen size or the credit text is clipped /* basic machine hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 315, 7, 247-1) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( williams_muxed, williams ) +MACHINE_CONFIG_DERIVED(williams_state::williams_muxed, williams) /* basic machine hardware */ @@ -1554,7 +1554,7 @@ static MACHINE_CONFIG_DERIVED( williams_muxed, williams ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( spdball, williams ) +MACHINE_CONFIG_DERIVED(williams_state::spdball, williams) /* basic machine hardware */ @@ -1565,7 +1565,7 @@ static MACHINE_CONFIG_DERIVED( spdball, williams ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( lottofun, williams ) +MACHINE_CONFIG_DERIVED(williams_state::lottofun, williams) /* basic machine hardware */ @@ -1578,7 +1578,7 @@ static MACHINE_CONFIG_DERIVED( lottofun, williams ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( sinistar, williams ) +MACHINE_CONFIG_DERIVED(williams_state::sinistar, williams) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1598,7 +1598,7 @@ static MACHINE_CONFIG_DERIVED( sinistar, williams ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( playball, williams ) +MACHINE_CONFIG_DERIVED(williams_state::playball, williams) /* basic machine hardware */ @@ -1620,7 +1620,7 @@ static MACHINE_CONFIG_DERIVED( playball, williams ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( blastkit, williams ) +MACHINE_CONFIG_DERIVED(blaster_state::blastkit, williams) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1647,7 +1647,7 @@ static MACHINE_CONFIG_DERIVED( blastkit, williams ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( blaster, blastkit ) +MACHINE_CONFIG_DERIVED(blaster_state::blaster, blastkit) /* basic machine hardware */ MCFG_CPU_ADD("soundcpu_b", M6808, SOUND_CLOCK) // internal clock divider of 4, effective frequency is 894.886kHz @@ -1693,7 +1693,7 @@ static MACHINE_CONFIG_DERIVED( blaster, blastkit ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( williams2 ) +MACHINE_CONFIG_START(williams2_state::williams2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/3/4) @@ -1756,7 +1756,7 @@ static MACHINE_CONFIG_START( williams2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( inferno, williams2 ) +MACHINE_CONFIG_DERIVED(williams2_state::inferno, williams2) MCFG_DEVICE_MODIFY("pia_0") MCFG_PIA_READPA_HANDLER(DEVREAD8("mux", ls157_x2_device, output_r)) MCFG_PIA_CA2_HANDLER(DEVWRITELINE("mux", ls157_x2_device, select_w)) @@ -1767,7 +1767,7 @@ static MACHINE_CONFIG_DERIVED( inferno, williams2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mysticm, williams2 ) +MACHINE_CONFIG_DERIVED(williams2_state::mysticm, williams2) /* basic machine hardware */ @@ -1782,7 +1782,7 @@ static MACHINE_CONFIG_DERIVED( mysticm, williams2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( tshoot, williams2 ) +MACHINE_CONFIG_DERIVED(tshoot_state::tshoot, williams2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1809,7 +1809,7 @@ static MACHINE_CONFIG_DERIVED( tshoot, williams2 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( joust2, williams2 ) +MACHINE_CONFIG_DERIVED(joust2_state::joust2, williams2) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp index af611ebee0c..f58c49eb94a 100644 --- a/src/mame/drivers/wink.cpp +++ b/src/mame/drivers/wink.cpp @@ -62,6 +62,7 @@ public: uint32_t screen_update_wink(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(wink_sound); + void wink(machine_config &config); }; @@ -354,7 +355,7 @@ void wink_state::machine_reset() m_sound_flag = 0; } -static MACHINE_CONFIG_START( wink ) +MACHINE_CONFIG_START(wink_state::wink) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 12000000 / 4) MCFG_CPU_PROGRAM_MAP(wink_map) diff --git a/src/mame/drivers/wiping.cpp b/src/mame/drivers/wiping.cpp index 75ba2093546..a0948cea089 100644 --- a/src/mame/drivers/wiping.cpp +++ b/src/mame/drivers/wiping.cpp @@ -283,7 +283,7 @@ INTERRUPT_GEN_MEMBER(wiping_state::sound_timer_irq) -static MACHINE_CONFIG_START( wiping ) +MACHINE_CONFIG_START(wiping_state::wiping) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz */ diff --git a/src/mame/drivers/witch.cpp b/src/mame/drivers/witch.cpp index fc989d249dd..e0b4bfd7a03 100644 --- a/src/mame/drivers/witch.cpp +++ b/src/mame/drivers/witch.cpp @@ -301,6 +301,7 @@ public: uint32_t screen_update_witch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); virtual void machine_reset() override; + void witch(machine_config &config); }; @@ -767,7 +768,7 @@ void witch_state::machine_reset() m_motor_active = (ioport("YM_PortB")->read() & 0x08) ? 0 : 1; } -static MACHINE_CONFIG_START( witch ) +MACHINE_CONFIG_START(witch_state::witch) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* 3 MHz */ MCFG_CPU_PROGRAM_MAP(map_main) diff --git a/src/mame/drivers/wiz.cpp b/src/mame/drivers/wiz.cpp index 256b9bb885a..6861b9abec3 100644 --- a/src/mame/drivers/wiz.cpp +++ b/src/mame/drivers/wiz.cpp @@ -784,7 +784,7 @@ INTERRUPT_GEN_MEMBER(wiz_state::wiz_sound_interrupt) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( kungfut ) +MACHINE_CONFIG_START(wiz_state::kungfut) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz ??? */ @@ -823,7 +823,7 @@ static MACHINE_CONFIG_START( kungfut ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wiz, kungfut ) +MACHINE_CONFIG_DERIVED(wiz_state::wiz, kungfut) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -836,7 +836,7 @@ static MACHINE_CONFIG_DERIVED( wiz, kungfut ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( stinger, kungfut ) +MACHINE_CONFIG_DERIVED(wiz_state::stinger, kungfut) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -861,7 +861,7 @@ static MACHINE_CONFIG_DERIVED( stinger, kungfut ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( scion, stinger ) +MACHINE_CONFIG_DERIVED(wiz_state::scion, stinger) MCFG_CPU_MODIFY("maincpu") MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_OPCODES) diff --git a/src/mame/drivers/wmg.cpp b/src/mame/drivers/wmg.cpp index 86919a257c7..f829eb21188 100644 --- a/src/mame/drivers/wmg.cpp +++ b/src/mame/drivers/wmg.cpp @@ -104,6 +104,7 @@ public: DECLARE_WRITE8_MEMBER(wmg_vram_select_w); DECLARE_CUSTOM_INPUT_MEMBER(wmg_mux_r); + void wmg(machine_config &config); private: uint8_t m_wmg_c400; @@ -489,7 +490,7 @@ DRIVER_INIT_MEMBER( wmg_state, wmg ) * Machine Driver * *************************************/ -static MACHINE_CONFIG_START( wmg ) +MACHINE_CONFIG_START(wmg_state::wmg) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/3/4) diff --git a/src/mame/drivers/wms.cpp b/src/mame/drivers/wms.cpp index 03727c7ec1b..8dfdd38c463 100644 --- a/src/mame/drivers/wms.cpp +++ b/src/mame/drivers/wms.cpp @@ -101,6 +101,7 @@ public: DECLARE_READ8_MEMBER(test_r); uint32_t screen_update_wms(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void wms(machine_config &config); protected: // devices @@ -168,7 +169,7 @@ static GFXDECODE_START( wms ) GFXDECODE_END -static MACHINE_CONFIG_START( wms ) +MACHINE_CONFIG_START(wms_state::wms) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80188, MAIN_CLOCK ) // AMD N80C188-20, ( 40 MHz. internally divided by 2) MCFG_CPU_PROGRAM_MAP(wms_map) diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp index d158671c222..fe23e166beb 100644 --- a/src/mame/drivers/wolfpack.cpp +++ b/src/mame/drivers/wolfpack.cpp @@ -304,7 +304,7 @@ static GFXDECODE_START( wolfpack ) GFXDECODE_END -static MACHINE_CONFIG_START( wolfpack ) +MACHINE_CONFIG_START(wolfpack_state::wolfpack) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 12096000 / 16) diff --git a/src/mame/drivers/wpc_95.cpp b/src/mame/drivers/wpc_95.cpp index bfc9c66646d..7e78b1eb79c 100644 --- a/src/mame/drivers/wpc_95.cpp +++ b/src/mame/drivers/wpc_95.cpp @@ -60,6 +60,7 @@ public: DECLARE_WRITE_LINE_MEMBER(scanline_irq); TIMER_DEVICE_CALLBACK_MEMBER(zc_timer); + void wpc_95(machine_config &config); protected: // devices required_device maincpu; @@ -2244,7 +2245,7 @@ static INPUT_PORTS_START( ttt ) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button") INPUT_PORTS_END -static MACHINE_CONFIG_START( wpc_95 ) +MACHINE_CONFIG_START(wpc_95_state::wpc_95) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_8MHz/4) // 68B09E MCFG_CPU_PROGRAM_MAP(wpc_95_map) diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp index 3d2475be108..cbdc91b9795 100644 --- a/src/mame/drivers/wpc_an.cpp +++ b/src/mame/drivers/wpc_an.cpp @@ -30,6 +30,9 @@ public: m_wpc(*this,"wpc") { } + void wpc_an_dd(machine_config &config); + void wpc_an(machine_config &config); + void wpc_an_base(machine_config &config); protected: // devices @@ -315,7 +318,7 @@ DRIVER_INIT_MEMBER(wpc_an_state,wpc_an) memcpy(fixed,&ROM[codeoff],0x8000); // copy static code from end of U6 ROM. } -static MACHINE_CONFIG_START( wpc_an_base ) +MACHINE_CONFIG_START(wpc_an_state::wpc_an_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_8MHz / 4) // 68B09E MCFG_CPU_PROGRAM_MAP(wpc_an_map) @@ -331,7 +334,7 @@ static MACHINE_CONFIG_START( wpc_an_base ) MCFG_DEFAULT_LAYOUT(layout_wpc_an) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wpc_an ) +MACHINE_CONFIG_START(wpc_an_state::wpc_an) MCFG_FRAGMENT_ADD(wpc_an_base) MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -341,7 +344,7 @@ static MACHINE_CONFIG_START( wpc_an ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( wpc_an_dd ) +MACHINE_CONFIG_START(wpc_an_state::wpc_an_dd) MCFG_FRAGMENT_ADD(wpc_an_base) MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/mame/drivers/wpc_dcs.cpp b/src/mame/drivers/wpc_dcs.cpp index 9a0758151aa..48ce3ecfb11 100644 --- a/src/mame/drivers/wpc_dcs.cpp +++ b/src/mame/drivers/wpc_dcs.cpp @@ -52,6 +52,7 @@ public: DECLARE_WRITE_LINE_MEMBER(scanline_irq); TIMER_DEVICE_CALLBACK_MEMBER(zc_timer); + void wpc_dcs(machine_config &config); protected: // devices required_device maincpu; @@ -420,7 +421,7 @@ static INPUT_PORTS_START( wpc_dcs ) INPUT_PORTS_END -static MACHINE_CONFIG_START( wpc_dcs ) +MACHINE_CONFIG_START(wpc_dcs_state::wpc_dcs) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, XTAL_8MHz/4) MCFG_CPU_PROGRAM_MAP(wpc_dcs_map) diff --git a/src/mame/drivers/wpc_dot.cpp b/src/mame/drivers/wpc_dot.cpp index f3c57bc10ab..3fd3f879adb 100644 --- a/src/mame/drivers/wpc_dot.cpp +++ b/src/mame/drivers/wpc_dot.cpp @@ -301,7 +301,7 @@ uint32_t wpc_dot_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma return 0; } -static MACHINE_CONFIG_START( wpc_dot ) +MACHINE_CONFIG_START(wpc_dot_state::wpc_dot) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(wpc_dot_map) diff --git a/src/mame/drivers/wpc_flip1.cpp b/src/mame/drivers/wpc_flip1.cpp index 143f3732ba6..6402a28be05 100644 --- a/src/mame/drivers/wpc_flip1.cpp +++ b/src/mame/drivers/wpc_flip1.cpp @@ -157,7 +157,7 @@ DRIVER_INIT_MEMBER(wpc_flip1_state,wpc_flip1) wpc_dot_state::init_wpc_dot(); } -static MACHINE_CONFIG_START( wpc_flip1 ) +MACHINE_CONFIG_START(wpc_flip1_state::wpc_flip1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(wpc_flip1_map) diff --git a/src/mame/drivers/wpc_flip2.cpp b/src/mame/drivers/wpc_flip2.cpp index 781440fd570..f221ec95bea 100644 --- a/src/mame/drivers/wpc_flip2.cpp +++ b/src/mame/drivers/wpc_flip2.cpp @@ -186,7 +186,7 @@ DRIVER_INIT_MEMBER(wpc_flip2_state,wpc_flip2) wpc_flip1_state::init_wpc_flip1(); } -static MACHINE_CONFIG_START( wpc_flip2 ) +MACHINE_CONFIG_START(wpc_flip2_state::wpc_flip2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, 2000000) MCFG_CPU_PROGRAM_MAP(wpc_flip2_map) diff --git a/src/mame/drivers/wpc_s.cpp b/src/mame/drivers/wpc_s.cpp index 0a75254bda2..5269e43c18d 100644 --- a/src/mame/drivers/wpc_s.cpp +++ b/src/mame/drivers/wpc_s.cpp @@ -55,6 +55,7 @@ public: DECLARE_WRITE_LINE_MEMBER(scanline_irq); TIMER_DEVICE_CALLBACK_MEMBER(zc_timer); + void wpc_s(machine_config &config); protected: // devices required_device maincpu; @@ -1967,7 +1968,7 @@ static INPUT_PORTS_START( tfs ) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button") INPUT_PORTS_END -static MACHINE_CONFIG_START( wpc_s ) +MACHINE_CONFIG_START(wpc_s_state::wpc_s) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_8MHz/4) MCFG_CPU_PROGRAM_MAP(wpc_s_map) diff --git a/src/mame/drivers/wrally.cpp b/src/mame/drivers/wrally.cpp index 78eb2a94eb9..372169a167f 100644 --- a/src/mame/drivers/wrally.cpp +++ b/src/mame/drivers/wrally.cpp @@ -259,7 +259,7 @@ static GFXDECODE_START( wrally ) GFXDECODE_END -static MACHINE_CONFIG_START( wrally ) +MACHINE_CONFIG_START(wrally_state::wrally) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,XTAL_24MHz/2) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(wrally_map) diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp index d1ce530b94b..0c2ee17a582 100644 --- a/src/mame/drivers/wswan.cpp +++ b/src/mame/drivers/wswan.cpp @@ -108,7 +108,7 @@ static SLOT_INTERFACE_START(wswan_cart) SLOT_INTERFACE_INTERNAL("ws_eeprom", WS_ROM_EEPROM) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( wswan ) +MACHINE_CONFIG_START(wswan_state::wswan) /* Basic machine hardware */ MCFG_CPU_ADD("maincpu", V30MZ, XTAL_3_072MHz) MCFG_CPU_PROGRAM_MAP(wswan_mem) @@ -154,7 +154,7 @@ static MACHINE_CONFIG_START( wswan ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("pc2_list","pockchalv2") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( wscolor, wswan ) +MACHINE_CONFIG_DERIVED(wswan_state::wscolor, wswan) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(wscolor_mem) MCFG_MACHINE_START_OVERRIDE(wswan_state, wscolor) diff --git a/src/mame/drivers/wwfsstar.cpp b/src/mame/drivers/wwfsstar.cpp index f2b8274669e..4447948e4c2 100644 --- a/src/mame/drivers/wwfsstar.cpp +++ b/src/mame/drivers/wwfsstar.cpp @@ -411,7 +411,7 @@ GFXDECODE_END Machine Driver(s) *******************************************************************************/ -static MACHINE_CONFIG_START( wwfsstar ) +MACHINE_CONFIG_START(wwfsstar_state::wwfsstar) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) diff --git a/src/mame/drivers/wyse.cpp b/src/mame/drivers/wyse.cpp index 4d188b4c187..e3288c86847 100644 --- a/src/mame/drivers/wyse.cpp +++ b/src/mame/drivers/wyse.cpp @@ -39,6 +39,7 @@ public: // , m_maincpu(*this, "maincpu") { } +void wyse(machine_config &config); private: // required_device m_maincpu; }; @@ -54,7 +55,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( wyse ) INPUT_PORTS_END -static MACHINE_CONFIG_START( wyse ) +MACHINE_CONFIG_START(wyse_state::wyse) MCFG_CPU_ADD("maincpu", I8031, 11'000'000) // confirmed for WY-50 MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp index 9009fc8642c..19f353b7389 100644 --- a/src/mame/drivers/wyvernf0.cpp +++ b/src/mame/drivers/wyvernf0.cpp @@ -107,6 +107,7 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_soundlatch; + void wyvernf0(machine_config &config); }; @@ -636,7 +637,7 @@ MACHINE_RESET_MEMBER(wyvernf0_state,wyvernf0) m_mcu_ready = 0; } -static MACHINE_CONFIG_START( wyvernf0 ) +MACHINE_CONFIG_START(wyvernf0_state::wyvernf0) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, 6000000) // ? diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp index d8e7abcb6fc..6c8ac77bd29 100644 --- a/src/mame/drivers/x07.cpp +++ b/src/mame/drivers/x07.cpp @@ -1477,7 +1477,7 @@ void x07_state::machine_reset() m_maincpu->set_state_int(Z80_PC, 0xc3c3); } -static MACHINE_CONFIG_START( x07 ) +MACHINE_CONFIG_START(x07_state::x07) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", NSC800, XTAL_15_36MHz / 4) diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index bbbb229a2fa..914ced01170 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -2526,7 +2526,7 @@ static SLOT_INTERFACE_START( x1_floppies ) SLOT_INTERFACE("dd", FLOPPY_525_DD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( x1 ) +MACHINE_CONFIG_START(x1_state::x1) /* basic machine hardware */ MCFG_CPU_ADD("x1_cpu", Z80, MAIN_CLOCK/4) MCFG_CPU_PROGRAM_MAP(x1_mem) @@ -2609,7 +2609,7 @@ static MACHINE_CONFIG_START( x1 ) MCFG_TIMER_DRIVER_ADD_PERIODIC("cmt_wind_timer", x1_state, x1_cmt_wind_timer, attotime::from_hz(16)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( x1turbo, x1 ) +MACHINE_CONFIG_DERIVED(x1_state::x1turbo, x1) MCFG_CPU_MODIFY("x1_cpu") MCFG_CPU_PROGRAM_MAP(x1turbo_mem) MCFG_CPU_IO_MAP(x1turbo_io) diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp index 231c96afece..a385a405c89 100644 --- a/src/mame/drivers/x1twin.cpp +++ b/src/mame/drivers/x1twin.cpp @@ -34,6 +34,7 @@ public: uint32_t screen_update_x1pce(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_INPUT_CHANGED_MEMBER(ipl_reset); DECLARE_INPUT_CHANGED_MEMBER(nmi_reset); + void x1twin(machine_config &config); }; @@ -401,7 +402,7 @@ static SLOT_INTERFACE_START( x1_floppies ) SLOT_INTERFACE("dd", FLOPPY_525_DD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( x1twin ) +MACHINE_CONFIG_START(x1twin_state::x1twin) /* basic machine hardware */ MCFG_CPU_ADD("x1_cpu", Z80, X1_MAIN_CLOCK/4) MCFG_CPU_PROGRAM_MAP(x1_mem) diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index 010709f2301..a3a82e6e61b 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -1644,7 +1644,7 @@ static SLOT_INTERFACE_START(keyboard) SLOT_INTERFACE("x68k", X68K_KEYBOARD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( x68000 ) +MACHINE_CONFIG_START(x68k_state::x68000) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */ MCFG_CPU_PROGRAM_MAP(x68k_map) @@ -1746,7 +1746,7 @@ static MACHINE_CONFIG_START( x68000 ) MCFG_X68KHDC_ADD( "x68k_hdc" ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( x68ksupr, x68000 ) +MACHINE_CONFIG_DERIVED(x68k_state::x68ksupr, x68000) MCFG_DEVICE_REMOVE("x68k_hdc") MCFG_CPU_MODIFY("maincpu") @@ -1767,12 +1767,12 @@ static MACHINE_CONFIG_DERIVED( x68ksupr, x68000 ) MCFG_MB89352A_DRQ_CB(WRITELINE(x68k_state, x68k_scsi_drq)) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( x68kxvi, x68ksupr ) +MACHINE_CONFIG_DERIVED(x68k_state::x68kxvi, x68ksupr) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(16000000) /* 16 MHz */ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( x68030, x68ksupr ) +MACHINE_CONFIG_DERIVED(x68k_state::x68030, x68ksupr) MCFG_CPU_REPLACE("maincpu", M68030, 25000000) /* 25 MHz 68EC030 */ MCFG_CPU_PROGRAM_MAP(x68030_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(x68k_state,x68k_int_ack) diff --git a/src/mame/drivers/xain.cpp b/src/mame/drivers/xain.cpp index a240746e953..59ef91f715f 100644 --- a/src/mame/drivers/xain.cpp +++ b/src/mame/drivers/xain.cpp @@ -448,7 +448,7 @@ void xain_state::machine_start() save_item(NAME(m_vblank)); } -static MACHINE_CONFIG_START( xsleena ) +MACHINE_CONFIG_START(xain_state::xsleena) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, CPU_CLOCK) // 68B09E @@ -496,7 +496,7 @@ static MACHINE_CONFIG_START( xsleena ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( xsleenab, xsleena ) +MACHINE_CONFIG_DERIVED(xain_state::xsleenab, xsleena) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bootleg_map) diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp index 5dea9927fb5..ac69159b8d9 100644 --- a/src/mame/drivers/xavix.cpp +++ b/src/mame/drivers/xavix.cpp @@ -68,6 +68,7 @@ public: // screen updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void xavix(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -173,7 +174,7 @@ void xavix_state::machine_reset() } -static MACHINE_CONFIG_START( xavix ) +MACHINE_CONFIG_START(xavix_state::xavix) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",G65816,MAIN_CLOCK/4) diff --git a/src/mame/drivers/xbox.cpp b/src/mame/drivers/xbox.cpp index c0906a553ea..92e802f04dd 100644 --- a/src/mame/drivers/xbox.cpp +++ b/src/mame/drivers/xbox.cpp @@ -35,6 +35,7 @@ public: xbox_base_state(mconfig, type, tag) { } + void xbox(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -162,7 +163,7 @@ SLOT_INTERFACE_START(xbox_ata_devices) SLOT_INTERFACE("cdrom", ATAPI_CDROM) SLOT_INTERFACE_END -static MACHINE_CONFIG_DERIVED(xbox, xbox_base) +MACHINE_CONFIG_DERIVED(xbox_state::xbox, xbox_base) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(xbox_map) MCFG_CPU_IO_MAP(xbox_map_io) diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp index 0bab5ad7940..8eb95d802c0 100644 --- a/src/mame/drivers/xerox820.cpp +++ b/src/mame/drivers/xerox820.cpp @@ -545,7 +545,7 @@ GFXDECODE_END /* Machine Drivers */ -static MACHINE_CONFIG_START( xerox820 ) +MACHINE_CONFIG_START(xerox820_state::xerox820) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_20MHz/8) MCFG_CPU_PROGRAM_MAP(xerox820_mem) @@ -612,14 +612,14 @@ static MACHINE_CONFIG_START( xerox820 ) MCFG_SOFTWARE_LIST_ADD("flop_list", "xerox820") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( bigboard, xerox820 ) +MACHINE_CONFIG_DERIVED(bigboard_state::bigboard, xerox820) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("beeper", BEEP, 950) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* bigboard only */ MACHINE_CONFIG_END -static MACHINE_CONFIG_START( xerox820ii ) +MACHINE_CONFIG_START(xerox820ii_state::xerox820ii) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4) MCFG_CPU_PROGRAM_MAP(xerox820ii_mem) @@ -714,7 +714,7 @@ static MACHINE_CONFIG_START( xerox820ii ) MCFG_SOFTWARE_LIST_ADD("flop_list", "xerox820ii") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( xerox168, xerox820ii ) +MACHINE_CONFIG_DERIVED(xerox820ii_state::xerox168, xerox820ii) MCFG_CPU_ADD(I8086_TAG, I8086, 4770000) MCFG_CPU_PROGRAM_MAP(xerox168_mem) @@ -724,7 +724,7 @@ static MACHINE_CONFIG_DERIVED( xerox168, xerox820ii ) MCFG_RAM_EXTRA_OPTIONS("320K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( mk83, xerox820 ) +MACHINE_CONFIG_DERIVED(xerox820_state::mk83, xerox820) MCFG_CPU_MODIFY(Z80_TAG) MCFG_CPU_PROGRAM_MAP(mk83_mem) MACHINE_CONFIG_END diff --git a/src/mame/drivers/xexex.cpp b/src/mame/drivers/xexex.cpp index 586995d2dcc..8578b0aafcc 100644 --- a/src/mame/drivers/xexex.cpp +++ b/src/mame/drivers/xexex.cpp @@ -465,7 +465,7 @@ void xexex_state::machine_reset() m_k054539->init_flags(k054539_device::REVERSE_STEREO); } -static MACHINE_CONFIG_START( xexex ) +MACHINE_CONFIG_START(xexex_state::xexex) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // 16MHz diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp index aca0f39192b..00739273a70 100644 --- a/src/mame/drivers/xmen.cpp +++ b/src/mame/drivers/xmen.cpp @@ -294,7 +294,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(xmen_state::xmen_scanline) } -static MACHINE_CONFIG_START( xmen ) +MACHINE_CONFIG_START(xmen_state::xmen) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */ @@ -346,7 +346,7 @@ static MACHINE_CONFIG_START( xmen ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( xmen6p ) +MACHINE_CONFIG_START(xmen_state::xmen6p) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) diff --git a/src/mame/drivers/xor100.cpp b/src/mame/drivers/xor100.cpp index 4f31ca6cb76..2e39e09afe0 100644 --- a/src/mame/drivers/xor100.cpp +++ b/src/mame/drivers/xor100.cpp @@ -503,7 +503,7 @@ void xor100_state::post_load() /* Machine Driver */ -static MACHINE_CONFIG_START( xor100 ) +MACHINE_CONFIG_START(xor100_state::xor100) /* basic machine hardware */ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(xor100_mem) diff --git a/src/mame/drivers/xorworld.cpp b/src/mame/drivers/xorworld.cpp index 498b3948d45..e9dbd7af021 100644 --- a/src/mame/drivers/xorworld.cpp +++ b/src/mame/drivers/xorworld.cpp @@ -151,7 +151,7 @@ static GFXDECODE_START( xorworld ) GFXDECODE_END -static MACHINE_CONFIG_START( xorworld ) +MACHINE_CONFIG_START(xorworld_state::xorworld) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, 10000000) // 10 MHz MCFG_CPU_PROGRAM_MAP(xorworld_map) diff --git a/src/mame/drivers/xtheball.cpp b/src/mame/drivers/xtheball.cpp index b3a1a5ba6f3..04af32d898d 100644 --- a/src/mame/drivers/xtheball.cpp +++ b/src/mame/drivers/xtheball.cpp @@ -58,6 +58,7 @@ public: TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg); TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg); TMS340X0_SCANLINE_RGB32_CB_MEMBER(scanline_update); + void xtheball(machine_config &config); }; @@ -293,7 +294,7 @@ INPUT_PORTS_END * *************************************/ -static MACHINE_CONFIG_START( xtheball ) +MACHINE_CONFIG_START(xtheball_state::xtheball) MCFG_CPU_ADD("maincpu", TMS34010, 40000000) MCFG_CPU_PROGRAM_MAP(main_map) diff --git a/src/mame/drivers/xtom3d.cpp b/src/mame/drivers/xtom3d.cpp index 69d3bd02433..28628b76f30 100644 --- a/src/mame/drivers/xtom3d.cpp +++ b/src/mame/drivers/xtom3d.cpp @@ -78,6 +78,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; void intel82439tx_init(); + void xtom3d(machine_config &config); }; // Intel 82439TX System Controller (MTXC) @@ -394,7 +395,7 @@ void xtom3d_state::machine_reset() membank("video_bank2")->set_base(memregion("video_bios")->base() + 0x4000); } -static MACHINE_CONFIG_START( xtom3d ) +MACHINE_CONFIG_START(xtom3d_state::xtom3d) MCFG_CPU_ADD("maincpu", PENTIUM2, 450000000/16) // actually Pentium II 450 MCFG_CPU_PROGRAM_MAP(xtom3d_map) MCFG_CPU_IO_MAP(xtom3d_io) diff --git a/src/mame/drivers/xxmissio.cpp b/src/mame/drivers/xxmissio.cpp index 09fcf163042..09771b0b933 100644 --- a/src/mame/drivers/xxmissio.cpp +++ b/src/mame/drivers/xxmissio.cpp @@ -260,7 +260,7 @@ GFXDECODE_END /****************************************************************************/ -static MACHINE_CONFIG_START( xxmissio ) +MACHINE_CONFIG_START(xxmissio_state::xxmissio) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,12000000/4) /* 3.0MHz */ diff --git a/src/mame/drivers/xybots.cpp b/src/mame/drivers/xybots.cpp index 971fd419a48..7b3172b57b8 100644 --- a/src/mame/drivers/xybots.cpp +++ b/src/mame/drivers/xybots.cpp @@ -180,7 +180,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( xybots ) +MACHINE_CONFIG_START(xybots_state::xybots) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) diff --git a/src/mame/drivers/xyonix.cpp b/src/mame/drivers/xyonix.cpp index 24aca691bb6..ceddb9c604a 100644 --- a/src/mame/drivers/xyonix.cpp +++ b/src/mame/drivers/xyonix.cpp @@ -224,7 +224,7 @@ GFXDECODE_END /* MACHINE driver *************************************************************/ -static MACHINE_CONFIG_START( xyonix ) +MACHINE_CONFIG_START(xyonix_state::xyonix) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,16000000 / 4) /* 4 MHz ? */ diff --git a/src/mame/drivers/yiear.cpp b/src/mame/drivers/yiear.cpp index 94b76900587..d1e3312642b 100644 --- a/src/mame/drivers/yiear.cpp +++ b/src/mame/drivers/yiear.cpp @@ -278,7 +278,7 @@ void yiear_state::machine_reset() m_yiear_nmi_enable = 0; } -static MACHINE_CONFIG_START( yiear ) +MACHINE_CONFIG_START(yiear_state::yiear) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, XTAL_18_432MHz/12) /* verified on pcb */ diff --git a/src/mame/drivers/ymmu100.cpp b/src/mame/drivers/ymmu100.cpp index 389c56869ff..6f0c6f1fbb8 100644 --- a/src/mame/drivers/ymmu100.cpp +++ b/src/mame/drivers/ymmu100.cpp @@ -199,6 +199,7 @@ public: float lightlevel(const uint8_t *src, const uint8_t *render); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); virtual void machine_start() override; + void mu100(machine_config &config); }; class mu100r_state : public mu100_state { @@ -431,7 +432,7 @@ static ADDRESS_MAP_START( mu100_iomap, AS_IO, 16, mu100_state ) AM_RANGE(h8_device::ADC_7, h8_device::ADC_7) AM_READ(adc7_r) ADDRESS_MAP_END -static MACHINE_CONFIG_START( mu100 ) +MACHINE_CONFIG_START(mu100_state::mu100) MCFG_CPU_ADD( "maincpu", H8S2655, XTAL_16MHz ) MCFG_CPU_PROGRAM_MAP( mu100_map ) MCFG_CPU_IO_MAP( mu100_iomap ) diff --git a/src/mame/drivers/yunsun16.cpp b/src/mame/drivers/yunsun16.cpp index 35d09e67ab0..3309ed60599 100644 --- a/src/mame/drivers/yunsun16.cpp +++ b/src/mame/drivers/yunsun16.cpp @@ -586,7 +586,7 @@ MACHINE_RESET_MEMBER(yunsun16_state, shocking) Magic Bubble ***************************************************************************/ -static MACHINE_CONFIG_START( magicbub ) +MACHINE_CONFIG_START(yunsun16_state::magicbub) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) @@ -629,7 +629,7 @@ MACHINE_CONFIG_END Shocking ***************************************************************************/ -static MACHINE_CONFIG_START( shocking ) +MACHINE_CONFIG_START(yunsun16_state::shocking) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) diff --git a/src/mame/drivers/yunsung8.cpp b/src/mame/drivers/yunsung8.cpp index 53a77152b65..4fb6d56d8f6 100644 --- a/src/mame/drivers/yunsung8.cpp +++ b/src/mame/drivers/yunsung8.cpp @@ -350,7 +350,7 @@ void yunsung8_state::machine_reset() } -static MACHINE_CONFIG_START( yunsung8 ) +MACHINE_CONFIG_START(yunsung8_state::yunsung8) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* Z80B @ 8MHz? */ diff --git a/src/mame/drivers/yuvomz80.cpp b/src/mame/drivers/yuvomz80.cpp index 5662ce7ee4e..f0052279001 100644 --- a/src/mame/drivers/yuvomz80.cpp +++ b/src/mame/drivers/yuvomz80.cpp @@ -48,6 +48,8 @@ public: m_maincpu(*this, "maincpu") { } + void goldhexa(machine_config &config); + void hexapres(machine_config &config); private: required_device m_maincpu; }; @@ -83,7 +85,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( goldhexa ) INPUT_PORTS_END -static MACHINE_CONFIG_START( goldhexa ) +MACHINE_CONFIG_START(yuvomz80_state::goldhexa) MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) @@ -103,7 +105,7 @@ static MACHINE_CONFIG_START( goldhexa ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( hexapres ) +MACHINE_CONFIG_START(yuvomz80_state::hexapres) MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz) MCFG_DEVICE_DISABLE() diff --git a/src/mame/drivers/z100.cpp b/src/mame/drivers/z100.cpp index 622fe87d98a..9f61636b54f 100644 --- a/src/mame/drivers/z100.cpp +++ b/src/mame/drivers/z100.cpp @@ -219,6 +219,7 @@ public: virtual void video_start() override; uint32_t screen_update_z100(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_INPUT_CHANGED_MEMBER(key_stroke); + void z100(machine_config &config); }; #define mc6845_h_char_total (m_crtc_vreg[0]) @@ -665,7 +666,7 @@ static SLOT_INTERFACE_START( z100_floppies ) SLOT_INTERFACE("dd", FLOPPY_525_DD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( z100 ) +MACHINE_CONFIG_START(z100_state::z100) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",I8088, XTAL_14_31818MHz/3) MCFG_CPU_PROGRAM_MAP(z100_mem) diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp index cb081f103bf..32eeb47da86 100644 --- a/src/mame/drivers/z1013.cpp +++ b/src/mame/drivers/z1013.cpp @@ -77,6 +77,8 @@ public: DECLARE_SNAPSHOT_LOAD_MEMBER(z1013); uint32_t screen_update_z1013(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void z1013k76(machine_config &config); + void z1013(machine_config &config); private: uint8_t m_keyboard_line; bool m_keyboard_part; @@ -362,7 +364,7 @@ static GFXDECODE_START( z1013 ) GFXDECODE_END /* Machine driver */ -static MACHINE_CONFIG_START( z1013 ) +MACHINE_CONFIG_START(z1013_state::z1013) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_1MHz ) MCFG_CPU_PROGRAM_MAP(z1013_mem) @@ -396,7 +398,7 @@ static MACHINE_CONFIG_START( z1013 ) MCFG_SNAPSHOT_ADD("snapshot", z1013_state, z1013, "z80", 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( z1013k76, z1013 ) +MACHINE_CONFIG_DERIVED(z1013_state::z1013k76, z1013) MCFG_DEVICE_REMOVE("z80pio") MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_1MHz) MCFG_Z80PIO_IN_PB_CB(READ8(z1013_state, k7659_port_b_r)) diff --git a/src/mame/drivers/z80dev.cpp b/src/mame/drivers/z80dev.cpp index 87d1fbb455d..ac68e67604f 100644 --- a/src/mame/drivers/z80dev.cpp +++ b/src/mame/drivers/z80dev.cpp @@ -35,6 +35,7 @@ public: DECLARE_WRITE8_MEMBER( display_w ); DECLARE_READ8_MEMBER( test_r ); + void z80dev(machine_config &config); private: required_device m_maincpu; }; @@ -106,7 +107,7 @@ INPUT_PORTS_START( z80dev ) PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("LD") PORT_CODE(KEYCODE_L) INPUT_PORTS_END -static MACHINE_CONFIG_START( z80dev ) +MACHINE_CONFIG_START(z80dev_state::z80dev) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp index d7c59bb2c73..6f7310073c2 100644 --- a/src/mame/drivers/z80ne.cpp +++ b/src/mame/drivers/z80ne.cpp @@ -410,7 +410,7 @@ static SLOT_INTERFACE_START( z80ne_floppies ) SLOT_INTERFACE("sssd", FLOPPY_525_SSSD) SLOT_INTERFACE_END -static MACHINE_CONFIG_START( z80ne ) +MACHINE_CONFIG_START(z80ne_state::z80ne) /* basic machine hardware */ MCFG_CPU_ADD("z80ne", Z80, Z80NE_CPU_SPEED_HZ) MCFG_CPU_PROGRAM_MAP(z80ne_mem) @@ -441,7 +441,7 @@ static MACHINE_CONFIG_START( z80ne ) //MCFG_SOFTWARE_LIST_ADD("cass_list","z80ne_cass") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( z80net, z80ne ) +MACHINE_CONFIG_DERIVED(z80ne_state::z80net, z80ne) MCFG_CPU_MODIFY("z80ne") MCFG_CPU_PROGRAM_MAP(z80net_mem) @@ -470,7 +470,7 @@ static MACHINE_CONFIG_DERIVED( z80net, z80ne ) MCFG_SOFTWARE_LIST_ADD("cass_list","z80ne_cass") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( z80netb ) +MACHINE_CONFIG_START(z80ne_state::z80netb) /* basic machine hardware */ MCFG_CPU_ADD("z80ne", Z80, Z80NE_CPU_SPEED_HZ) MCFG_CPU_PROGRAM_MAP(z80netb_mem) @@ -511,7 +511,7 @@ static MACHINE_CONFIG_START( z80netb ) MCFG_SOFTWARE_LIST_ADD("cass_list","z80ne_cass") MACHINE_CONFIG_END -static MACHINE_CONFIG_START( z80netf ) +MACHINE_CONFIG_START(z80ne_state::z80netf) /* basic machine hardware */ MCFG_CPU_ADD("z80ne", Z80, Z80NE_CPU_SPEED_HZ) MCFG_CPU_PROGRAM_MAP(z80netf_mem) diff --git a/src/mame/drivers/z88.cpp b/src/mame/drivers/z88.cpp index e7637b03c1f..0cad0467b8b 100644 --- a/src/mame/drivers/z88.cpp +++ b/src/mame/drivers/z88.cpp @@ -621,7 +621,7 @@ static SLOT_INTERFACE_START(z88_cart) SLOT_INTERFACE("1024kflash", Z88_1024K_FLASH) // 1024KB Flash cart SLOT_INTERFACE_END -static MACHINE_CONFIG_START( z88 ) +MACHINE_CONFIG_START(z88_state::z88) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_9_8304MHz/3) // divided by 3 through the uPD65031 MCFG_CPU_PROGRAM_MAP(z88_mem) diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp index 797f7b3ad12..e9e57befae7 100644 --- a/src/mame/drivers/z9001.cpp +++ b/src/mame/drivers/z9001.cpp @@ -63,6 +63,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(timer_callback); uint32_t screen_update_z9001(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void z9001(machine_config &config); private: uint8_t m_framecnt; bool m_cassbit; @@ -198,7 +199,7 @@ static GFXDECODE_START( z9001 ) GFXDECODE_END -static MACHINE_CONFIG_START( z9001 ) +MACHINE_CONFIG_START(z9001_state::z9001) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_9_8304MHz / 4) MCFG_CPU_PROGRAM_MAP(z9001_mem) diff --git a/src/mame/drivers/zac2650.cpp b/src/mame/drivers/zac2650.cpp index c4c3444f0f3..5b47f63a44d 100644 --- a/src/mame/drivers/zac2650.cpp +++ b/src/mame/drivers/zac2650.cpp @@ -229,7 +229,7 @@ static GFXDECODE_START( tinvader ) GFXDECODE_SCALE( nullptr, 0x1F00, s2636_character, 0, 2, 8, 6 ) /* dynamic */ GFXDECODE_END -static MACHINE_CONFIG_START( tinvader ) +MACHINE_CONFIG_START(zac2650_state::tinvader) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 3800000/4) diff --git a/src/mame/drivers/zac_1.cpp b/src/mame/drivers/zac_1.cpp index 6eb2a5b506d..57a0f33a490 100644 --- a/src/mame/drivers/zac_1.cpp +++ b/src/mame/drivers/zac_1.cpp @@ -53,6 +53,8 @@ public: DECLARE_WRITE8_MEMBER(reset_int_w); TIMER_DEVICE_CALLBACK_MEMBER(zac_1_inttimer); TIMER_DEVICE_CALLBACK_MEMBER(zac_1_outtimer); + void locomotp(machine_config &config); + void zac_1(machine_config &config); protected: // devices @@ -247,7 +249,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(zac_1_state::zac_1_outtimer) } } -static MACHINE_CONFIG_START( zac_1 ) +MACHINE_CONFIG_START(zac_1_state::zac_1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 6000000/2) // no xtal, just 2 chips forming a random oscillator MCFG_CPU_PROGRAM_MAP(zac_1_map) @@ -291,7 +293,7 @@ READ8_MEMBER( zac_1_state::reset_int_r ) return 0; } -static MACHINE_CONFIG_DERIVED( locomotp, zac_1 ) +MACHINE_CONFIG_DERIVED(zac_1_state::locomotp, zac_1) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(locomotp_map) diff --git a/src/mame/drivers/zac_2.cpp b/src/mame/drivers/zac_2.cpp index daccf3470ac..0e7b1324ddb 100644 --- a/src/mame/drivers/zac_2.cpp +++ b/src/mame/drivers/zac_2.cpp @@ -37,6 +37,7 @@ public: required_ioport_array<6> m_row; TIMER_DEVICE_CALLBACK_MEMBER(zac_2_inttimer); TIMER_DEVICE_CALLBACK_MEMBER(zac_2_outtimer); + void zac_2(machine_config &config); protected: // devices @@ -204,7 +205,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(zac_2_state::zac_2_outtimer) } } -static MACHINE_CONFIG_START( zac_2 ) +MACHINE_CONFIG_START(zac_2_state::zac_2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", S2650, 6000000/2) MCFG_CPU_PROGRAM_MAP(zac_2_map) diff --git a/src/mame/drivers/zac_proto.cpp b/src/mame/drivers/zac_proto.cpp index aa2faf52ab6..bf971826804 100644 --- a/src/mame/drivers/zac_proto.cpp +++ b/src/mame/drivers/zac_proto.cpp @@ -37,6 +37,7 @@ public: DECLARE_WRITE8_MEMBER(out1_w); DECLARE_WRITE8_MEMBER(digit_w); DECLARE_WRITE8_MEMBER(sound_w); + void zac_proto(machine_config &config); private: virtual void machine_reset() override; required_device m_maincpu; @@ -233,7 +234,7 @@ void zac_proto_state::machine_reset() output().set_digit_value(10, 0x3f); // units shows zero all the time } -static MACHINE_CONFIG_START( zac_proto ) +MACHINE_CONFIG_START(zac_proto_state::zac_proto) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", INS8060, XTAL_4MHz / 2) // Using SC/MP II chip which has an internal /2 circuit. MCFG_CPU_PROGRAM_MAP(zac_proto_map) diff --git a/src/mame/drivers/zaccaria.cpp b/src/mame/drivers/zaccaria.cpp index 4df1465e1d4..46ea13015b9 100644 --- a/src/mame/drivers/zaccaria.cpp +++ b/src/mame/drivers/zaccaria.cpp @@ -330,7 +330,7 @@ INTERRUPT_GEN_MEMBER(zaccaria_state::vblank_irq) } -static MACHINE_CONFIG_START( zaccaria ) +MACHINE_CONFIG_START(zaccaria_state::zaccaria) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,XTAL_18_432MHz/6) /* verified on pcb */ diff --git a/src/mame/drivers/zapcomputer.cpp b/src/mame/drivers/zapcomputer.cpp index 4987095d1b9..65b52946970 100644 --- a/src/mame/drivers/zapcomputer.cpp +++ b/src/mame/drivers/zapcomputer.cpp @@ -42,6 +42,7 @@ public: DECLARE_READ8_MEMBER(keyboard_r); DECLARE_WRITE8_MEMBER(display_7seg_w); + void zapcomp(machine_config &config); private: uint8_t decode7seg(uint8_t data); virtual void machine_start() override; @@ -156,7 +157,7 @@ void zapcomp_state::machine_start() { } -static MACHINE_CONFIG_START( zapcomp ) +MACHINE_CONFIG_START(zapcomp_state::zapcomp) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, XTAL_2MHz) MCFG_CPU_PROGRAM_MAP(zapcomp_mem) diff --git a/src/mame/drivers/zaurus.cpp b/src/mame/drivers/zaurus.cpp index 82a659fde36..1a8df06ec52 100644 --- a/src/mame/drivers/zaurus.cpp +++ b/src/mame/drivers/zaurus.cpp @@ -1445,6 +1445,7 @@ public: // screen updates uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void zaurus(machine_config &config); protected: // driver_device overrides virtual void machine_start() override; @@ -1748,7 +1749,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(zaurus_state::rtc_irq_callback) } // TODO: main CPU differs greatly between versions! -static MACHINE_CONFIG_START( zaurus ) +MACHINE_CONFIG_START(zaurus_state::zaurus) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",PXA255,MAIN_CLOCK) diff --git a/src/mame/drivers/zaxxon.cpp b/src/mame/drivers/zaxxon.cpp index d448b49db87..7b12a293c75 100644 --- a/src/mame/drivers/zaxxon.cpp +++ b/src/mame/drivers/zaxxon.cpp @@ -910,7 +910,7 @@ GFXDECODE_END * *************************************/ -static MACHINE_CONFIG_START( root ) +MACHINE_CONFIG_START(zaxxon_state::root) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/16) @@ -948,7 +948,7 @@ static MACHINE_CONFIG_START( root ) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zaxxon, root ) +MACHINE_CONFIG_DERIVED(zaxxon_state::zaxxon, root) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -957,13 +957,13 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( szaxxon, zaxxon ) +MACHINE_CONFIG_DERIVED(zaxxon_state::szaxxon, zaxxon) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( szaxxone, zaxxon ) +MACHINE_CONFIG_DERIVED(zaxxon_state::szaxxone, zaxxon) MCFG_CPU_REPLACE("maincpu", SEGA_315_5013, MASTER_CLOCK/16) MCFG_CPU_PROGRAM_MAP(zaxxon_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) @@ -973,7 +973,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( futspye, root ) +MACHINE_CONFIG_DERIVED(zaxxon_state::futspye, root) MCFG_CPU_REPLACE("maincpu", SEGA_315_5061, MASTER_CLOCK/16) MCFG_CPU_PROGRAM_MAP(zaxxon_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) @@ -994,7 +994,7 @@ MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( razmataze, root ) +MACHINE_CONFIG_DERIVED(zaxxon_state::razmataze, root) MCFG_CPU_REPLACE("maincpu", SEGA_315_5098, MASTER_CLOCK/16) MCFG_CPU_PROGRAM_MAP(ixion_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) @@ -1013,7 +1013,7 @@ static MACHINE_CONFIG_DERIVED( razmataze, root ) MCFG_SEGAUSBROM_ADD("usbsnd") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ixion, razmataze ) +MACHINE_CONFIG_DERIVED(zaxxon_state::ixion, razmataze) MCFG_CPU_REPLACE("maincpu", SEGA_315_5013, MASTER_CLOCK/16) MCFG_CPU_PROGRAM_MAP(ixion_map) MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) @@ -1024,7 +1024,7 @@ static MACHINE_CONFIG_DERIVED( ixion, razmataze ) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // flip screen not used MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( congo, root ) +MACHINE_CONFIG_DERIVED(zaxxon_state::congo, root) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(congo_map) diff --git a/src/mame/drivers/zerozone.cpp b/src/mame/drivers/zerozone.cpp index 5670cc958aa..238c56fc23e 100644 --- a/src/mame/drivers/zerozone.cpp +++ b/src/mame/drivers/zerozone.cpp @@ -168,7 +168,7 @@ void zerozone_state::machine_reset() m_tilebank = 0; } -static MACHINE_CONFIG_START( zerozone ) +MACHINE_CONFIG_START(zerozone_state::zerozone) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */ diff --git a/src/mame/drivers/zexall.cpp b/src/mame/drivers/zexall.cpp index 95188d72e8f..e9cf07d78e5 100644 --- a/src/mame/drivers/zexall.cpp +++ b/src/mame/drivers/zexall.cpp @@ -46,6 +46,7 @@ public: DECLARE_WRITE8_MEMBER( output_req_w ); DECLARE_WRITE8_MEMBER( output_data_w ); + void zexall(machine_config &config); private: required_device m_maincpu; required_device m_terminal; @@ -154,7 +155,7 @@ INPUT_PORTS_END Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( zexall ) +MACHINE_CONFIG_START(zexall_state::zexall) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) MCFG_CPU_PROGRAM_MAP(z80_mem) diff --git a/src/mame/drivers/zms8085.cpp b/src/mame/drivers/zms8085.cpp index 7d8053d314a..b216b6a5302 100644 --- a/src/mame/drivers/zms8085.cpp +++ b/src/mame/drivers/zms8085.cpp @@ -32,6 +32,7 @@ public: DECLARE_READ8_MEMBER(special_r); + void zephyr(machine_config &config); private: required_device m_maincpu; required_device m_screen; @@ -83,7 +84,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( zephyr ) INPUT_PORTS_END -static MACHINE_CONFIG_START( zephyr ) +MACHINE_CONFIG_START(zms8085_state::zephyr) MCFG_CPU_ADD("maincpu", I8085A, XTAL_15_582MHz / 2) // divider not verified MCFG_CPU_PROGRAM_MAP(mem_map) MCFG_CPU_IO_MAP(io_map) diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp index 10c21d30040..b488b270f7e 100644 --- a/src/mame/drivers/zn.cpp +++ b/src/mame/drivers/zn.cpp @@ -139,6 +139,27 @@ public: void atpsx_dma_write(uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size ); void jdredd_vblank(screen_device &screen, bool vblank_state); + void zn1_1mb_vram(machine_config &config); + void zn1_2mb_vram(machine_config &config); + void zn2(machine_config &config); + void jdredd(machine_config &config); + void coh1002msnd(machine_config &config); + void coh1002tb(machine_config &config); + void coh1000a(machine_config &config); + void coh1000tb(machine_config &config); + void coh1002m(machine_config &config); + void coh1002ml(machine_config &config); + void coh1001l(machine_config &config); + void bam2(machine_config &config); + void glpracr(machine_config &config); + void coh1000ta(machine_config &config); + void coh1002v(machine_config &config); + void nbajamex(machine_config &config); + void coh1000c(machine_config &config); + void coh1000w(machine_config &config); + void coh1002e(machine_config &config); + void coh3002c(machine_config &config); + void coh1002c(machine_config &config); protected: virtual void machine_start() override; @@ -320,7 +341,7 @@ static ADDRESS_MAP_START( zn_map, AS_PROGRAM, 32, zn_state ) AM_RANGE(0x1fb20000, 0x1fb20007) AM_READ16(unknown_r, 0xffffffff) ADDRESS_MAP_END -static MACHINE_CONFIG_START( zn1_1mb_vram ) +MACHINE_CONFIG_START(zn_state::zn1_1mb_vram) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz ) @@ -361,11 +382,11 @@ static MACHINE_CONFIG_START( zn1_1mb_vram ) MCFG_DEVICE_ADD("at28c16", AT28C16, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zn1_2mb_vram, zn1_1mb_vram ) +MACHINE_CONFIG_DERIVED(zn_state::zn1_2mb_vram, zn1_1mb_vram) MCFG_PSXGPU_REPLACE( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL_53_693175MHz ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( zn2 ) +MACHINE_CONFIG_START(zn_state::zn2) /* basic machine hardware */ MCFG_CPU_ADD( "maincpu", CXD8661R, XTAL_100MHz ) @@ -588,7 +609,7 @@ static ADDRESS_MAP_START( qsound_portmap, AS_IO, 8, zn_state ) AM_RANGE(0x00, 0x00) AM_DEVREAD("soundlatch", generic_latch_8_device, read) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( coh1000c, zn1_1mb_vram ) +MACHINE_CONFIG_DERIVED(zn_state::coh1000c, zn1_1mb_vram) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1000c_map) @@ -604,11 +625,11 @@ static MACHINE_CONFIG_DERIVED( coh1000c, zn1_1mb_vram ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( glpracr, coh1000c ) +MACHINE_CONFIG_DERIVED(zn_state::glpracr, coh1000c) MCFG_MACHINE_RESET_OVERRIDE(zn_state, glpracr) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( coh1002c, zn1_2mb_vram ) +MACHINE_CONFIG_DERIVED(zn_state::coh1002c, zn1_2mb_vram) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1000c_map) @@ -765,7 +786,7 @@ Notes: Unpopulated sockets on Rival Schools - None */ -static MACHINE_CONFIG_DERIVED(coh3002c, zn2) +MACHINE_CONFIG_DERIVED(zn_state::coh3002c, zn2) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1000c_map) @@ -1047,7 +1068,7 @@ static ADDRESS_MAP_START( fx1a_sound_map, AS_PROGRAM, 8, zn_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( coh1000ta, zn1_1mb_vram ) +MACHINE_CONFIG_DERIVED(zn_state::coh1000ta, zn1_1mb_vram) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1000ta_map) @@ -1105,7 +1126,7 @@ MACHINE_RESET_MEMBER(zn_state,coh1000tb) m_bankedroms->set_entry( 0 ); } -static MACHINE_CONFIG_DERIVED(coh1000tb, zn1_1mb_vram) +MACHINE_CONFIG_DERIVED(zn_state::coh1000tb, zn1_1mb_vram) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1122,10 +1143,10 @@ static MACHINE_CONFIG_DERIVED(coh1000tb, zn1_1mb_vram) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) - MCFG_FRAGMENT_ADD(taito_zoom_sound) + MCFG_TAITO_ZOOM_ADD("taito_zoom") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED(coh1002tb, zn1_2mb_vram) +MACHINE_CONFIG_DERIVED(zn_state::coh1002tb, zn1_2mb_vram) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -1142,7 +1163,7 @@ static MACHINE_CONFIG_DERIVED(coh1002tb, zn1_2mb_vram) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) - MCFG_FRAGMENT_ADD(taito_zoom_sound) + MCFG_TAITO_ZOOM_ADD("taito_zoom") MACHINE_CONFIG_END /* @@ -1370,7 +1391,7 @@ static ADDRESS_MAP_START(coh1000w_map, AS_PROGRAM, 32, zn_state) AM_IMPORT_FROM(zn_map) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( coh1000w, zn1_2mb_vram ) +MACHINE_CONFIG_DERIVED(zn_state::coh1000w, zn1_2mb_vram) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1000w_map) @@ -1379,8 +1400,8 @@ static MACHINE_CONFIG_DERIVED( coh1000w, zn1_2mb_vram ) MCFG_VT83C461_ADD("ide", ata_devices, "hdd", nullptr, true) MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10)) - MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&zn_state::atpsx_dma_read, (zn_state *) owner ) ) - MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&zn_state::atpsx_dma_write, (zn_state *) owner ) ) + MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&zn_state::atpsx_dma_read, this ) ) + MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&zn_state::atpsx_dma_write, this ) ) MACHINE_CONFIG_END /* @@ -1567,7 +1588,7 @@ static ADDRESS_MAP_START( psarc_snd_map, AS_PROGRAM, 16, zn_state ) AM_RANGE(0x100020, 0xffffff) AM_WRITENOP ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED(coh1002e, zn1_2mb_vram) +MACHINE_CONFIG_DERIVED(zn_state::coh1002e, zn1_2mb_vram) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1002e_map) @@ -1699,7 +1720,7 @@ MACHINE_RESET_MEMBER(zn_state,bam2) m_bankedroms->set_entry( 1 ); } -static MACHINE_CONFIG_DERIVED( bam2, zn1_2mb_vram ) +MACHINE_CONFIG_DERIVED(zn_state::bam2, zn1_2mb_vram) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bam2_map) @@ -2030,12 +2051,12 @@ static ADDRESS_MAP_START(jdredd_map, AS_PROGRAM, 32, zn_state) AM_IMPORT_FROM(coh1000a_map) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( coh1000a, zn1_2mb_vram ) +MACHINE_CONFIG_DERIVED(zn_state::coh1000a, zn1_2mb_vram) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1000a_map) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( nbajamex, coh1000a ) +MACHINE_CONFIG_DERIVED(zn_state::nbajamex, coh1000a) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(nbajamex_map) MCFG_NVRAM_ADD_1FILL("71256") @@ -2043,12 +2064,12 @@ static MACHINE_CONFIG_DERIVED( nbajamex, coh1000a ) MCFG_DEVICE_ADD("rax", ACCLAIM_RAX, 0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( jdredd, coh1000a ) +MACHINE_CONFIG_DERIVED(zn_state::jdredd, coh1000a) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(jdredd_map) MCFG_DEVICE_MODIFY("gpu") - MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate(&zn_state::jdredd_vblank, (zn_state *) owner)) + MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate(&zn_state::jdredd_vblank, this)) MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true) MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10)) @@ -2210,7 +2231,7 @@ static ADDRESS_MAP_START( atlus_snd_map, AS_PROGRAM, 16, zn_state ) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED(coh1001l, zn1_2mb_vram) +MACHINE_CONFIG_DERIVED(zn_state::coh1001l, zn1_2mb_vram) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1001l_map) @@ -2259,7 +2280,7 @@ MACHINE_RESET_MEMBER(zn_state,coh1002v) m_bankedroms->set_entry( 0 ); } -static MACHINE_CONFIG_DERIVED( coh1002v, zn1_2mb_vram ) +MACHINE_CONFIG_DERIVED(zn_state::coh1002v, zn1_2mb_vram) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1002v_map) @@ -2443,7 +2464,7 @@ MACHINE_RESET_MEMBER(zn_state,coh1002m) m_bankedroms->set_entry( 0 ); } -static MACHINE_CONFIG_DERIVED( coh1002m, zn1_2mb_vram ) +MACHINE_CONFIG_DERIVED(zn_state::coh1002m, zn1_2mb_vram) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(coh1002m_map) @@ -2492,7 +2513,7 @@ static ADDRESS_MAP_START( coh1002ml_link_port_map, AS_IO, 8, zn_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_END -static MACHINE_CONFIG_DERIVED( coh1002msnd, coh1002m ) +MACHINE_CONFIG_DERIVED(zn_state::coh1002msnd, coh1002m) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") @@ -2513,7 +2534,7 @@ static MACHINE_CONFIG_DERIVED( coh1002msnd, coh1002m ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.35) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( coh1002ml, coh1002m ) +MACHINE_CONFIG_DERIVED(zn_state::coh1002ml, coh1002m) MCFG_CPU_ADD("link", Z80, 4000000) // ? MCFG_CPU_PROGRAM_MAP(coh1002ml_link_map) MCFG_CPU_IO_MAP(coh1002ml_link_port_map) @@ -4252,10 +4273,10 @@ ROM_START( ftimpcta ) ROM_LOAD( "e25-02.2", 0x0800000, 0x400000, CRC(8e8b4c82) SHA1(55c9d4d3a08fc3226a75ab3a674be433af83e289) ) ROM_LOAD( "e25-03.12", 0x0c00000, 0x400000, CRC(43b1c085) SHA1(6e53550e9be0d2f415fc6b4f3b8a71185c5370b2) ) - ROM_REGION( 0x080000, "mn10200", 0 ) + ROM_REGION( 0x080000, ":taito_zoom:mn10200", 0 ) ROM_LOAD( "e25-10.14", 0x0000000, 0x080000, CRC(2b2ad1b1) SHA1(6d064d0b6805d43ce42929ac8f5645b56384f53c) ) - ROM_REGION32_LE( 0x600000, "zsg2", 0 ) + ROM_REGION32_LE( 0x600000, ":taito_zoom:zsg2", 0 ) ROM_LOAD( "e25-04.27", 0x0000000, 0x400000, CRC(09a66d35) SHA1(f0df24bc9bfc9eb0f5150dc035c19fc5b8a39bf9) ) ROM_LOAD( "e25-05.28", 0x0400000, 0x200000, CRC(3fb57636) SHA1(aa38bfac11ecf10fd55143cf4525a2a529be8bb6) ) @@ -4273,10 +4294,10 @@ ROM_START( ftimpact ) ROM_LOAD( "e25-02.2", 0x0800000, 0x400000, CRC(8e8b4c82) SHA1(55c9d4d3a08fc3226a75ab3a674be433af83e289) ) ROM_LOAD( "e25-03.12", 0x0c00000, 0x400000, CRC(43b1c085) SHA1(6e53550e9be0d2f415fc6b4f3b8a71185c5370b2) ) - ROM_REGION( 0x080000, "mn10200", 0 ) + ROM_REGION( 0x080000, ":taito_zoom:mn10200", 0 ) ROM_LOAD( "e25-10.14", 0x0000000, 0x080000, CRC(2b2ad1b1) SHA1(6d064d0b6805d43ce42929ac8f5645b56384f53c) ) - ROM_REGION32_LE( 0x600000, "zsg2", 0 ) + ROM_REGION32_LE( 0x600000, ":taito_zoom:zsg2", 0 ) ROM_LOAD( "e25-04.27", 0x0000000, 0x400000, CRC(09a66d35) SHA1(f0df24bc9bfc9eb0f5150dc035c19fc5b8a39bf9) ) ROM_LOAD( "e25-05.28", 0x0400000, 0x200000, CRC(3fb57636) SHA1(aa38bfac11ecf10fd55143cf4525a2a529be8bb6) ) @@ -4294,10 +4315,10 @@ ROM_START( ftimpactu ) ROM_LOAD( "e25-02.2", 0x0800000, 0x400000, CRC(8e8b4c82) SHA1(55c9d4d3a08fc3226a75ab3a674be433af83e289) ) ROM_LOAD( "e25-03.12", 0x0c00000, 0x400000, CRC(43b1c085) SHA1(6e53550e9be0d2f415fc6b4f3b8a71185c5370b2) ) - ROM_REGION( 0x080000, "mn10200", 0 ) + ROM_REGION( 0x080000, ":taito_zoom:mn10200", 0 ) ROM_LOAD( "e25-10.14", 0x0000000, 0x080000, CRC(2b2ad1b1) SHA1(6d064d0b6805d43ce42929ac8f5645b56384f53c) ) - ROM_REGION32_LE( 0x600000, "zsg2", 0 ) + ROM_REGION32_LE( 0x600000, ":taito_zoom:zsg2", 0 ) ROM_LOAD( "e25-04.27", 0x0000000, 0x400000, CRC(09a66d35) SHA1(f0df24bc9bfc9eb0f5150dc035c19fc5b8a39bf9) ) ROM_LOAD( "e25-05.28", 0x0400000, 0x200000, CRC(3fb57636) SHA1(aa38bfac11ecf10fd55143cf4525a2a529be8bb6) ) @@ -4315,10 +4336,10 @@ ROM_START( ftimpactj ) ROM_LOAD( "e25-02.2", 0x0800000, 0x400000, CRC(8e8b4c82) SHA1(55c9d4d3a08fc3226a75ab3a674be433af83e289) ) ROM_LOAD( "e25-03.12", 0x0c00000, 0x400000, CRC(43b1c085) SHA1(6e53550e9be0d2f415fc6b4f3b8a71185c5370b2) ) - ROM_REGION( 0x080000, "mn10200", 0 ) + ROM_REGION( 0x080000, ":taito_zoom:mn10200", 0 ) ROM_LOAD( "e25-10.14", 0x0000000, 0x080000, CRC(2b2ad1b1) SHA1(6d064d0b6805d43ce42929ac8f5645b56384f53c) ) - ROM_REGION32_LE( 0x600000, "zsg2", 0 ) + ROM_REGION32_LE( 0x600000, ":taito_zoom:zsg2", 0 ) ROM_LOAD( "e25-04.27", 0x0000000, 0x400000, CRC(09a66d35) SHA1(f0df24bc9bfc9eb0f5150dc035c19fc5b8a39bf9) ) ROM_LOAD( "e25-05.28", 0x0400000, 0x200000, CRC(3fb57636) SHA1(aa38bfac11ecf10fd55143cf4525a2a529be8bb6) ) @@ -4336,10 +4357,10 @@ ROM_START( gdarius ) ROM_LOAD( "e39-02.2", 0x0800000, 0x400000, CRC(a47aab5d) SHA1(64b58e47035ad9d8d6dcaf475cbcc3ad85f4d82f) ) ROM_LOAD( "e39-03.12", 0x0c00000, 0x400000, CRC(a883b6a5) SHA1(b8d00d944c90f8cd9c2b076688f4c68b2e6d557a) ) - ROM_REGION( 0x080000, "mn10200", 0 ) + ROM_REGION( 0x080000, ":taito_zoom:mn10200", 0 ) ROM_LOAD( "e39-07.14", 0x0000000, 0x080000, CRC(2252c7c1) SHA1(92b9908e0d87cad6587f1acc0eef69eaae8c6a98) ) - ROM_REGION32_LE( 0x400000, "zsg2", 0 ) + ROM_REGION32_LE( 0x400000, ":taito_zoom:zsg2", 0 ) ROM_LOAD( "e39-04.27", 0x0000000, 0x400000, CRC(6ee35e68) SHA1(fdfe63203d8cecf84cb869039fb893d5b63cdd67) ) ROM_REGION( 0x8, "cat702_2", 0 ) @@ -4356,10 +4377,10 @@ ROM_START( gdariusb ) ROM_LOAD( "e39-02.2", 0x0800000, 0x400000, CRC(a47aab5d) SHA1(64b58e47035ad9d8d6dcaf475cbcc3ad85f4d82f) ) ROM_LOAD( "e39-03.12", 0x0c00000, 0x400000, CRC(a883b6a5) SHA1(b8d00d944c90f8cd9c2b076688f4c68b2e6d557a) ) - ROM_REGION( 0x080000, "mn10200", 0 ) + ROM_REGION( 0x080000, ":taito_zoom:mn10200", 0 ) ROM_LOAD( "e39-07.14", 0x0000000, 0x080000, CRC(2252c7c1) SHA1(92b9908e0d87cad6587f1acc0eef69eaae8c6a98) ) - ROM_REGION32_LE( 0x400000, "zsg2", 0 ) + ROM_REGION32_LE( 0x400000, ":taito_zoom:zsg2", 0 ) ROM_LOAD( "e39-04.27", 0x0000000, 0x400000, CRC(6ee35e68) SHA1(fdfe63203d8cecf84cb869039fb893d5b63cdd67) ) ROM_REGION( 0x8, "cat702_2", 0 ) @@ -4376,10 +4397,10 @@ ROM_START( gdarius2 ) ROM_LOAD( "e39-02.2", 0x0800000, 0x400000, CRC(a47aab5d) SHA1(64b58e47035ad9d8d6dcaf475cbcc3ad85f4d82f) ) ROM_LOAD( "e39-03.12", 0x0c00000, 0x400000, CRC(a883b6a5) SHA1(b8d00d944c90f8cd9c2b076688f4c68b2e6d557a) ) - ROM_REGION( 0x080000, "mn10200", 0 ) + ROM_REGION( 0x080000, ":taito_zoom:mn10200", 0 ) ROM_LOAD( "e39-07.14", 0x0000000, 0x080000, CRC(2252c7c1) SHA1(92b9908e0d87cad6587f1acc0eef69eaae8c6a98) ) - ROM_REGION32_LE( 0x400000, "zsg2", 0 ) + ROM_REGION32_LE( 0x400000, ":taito_zoom:zsg2", 0 ) ROM_LOAD( "e39-04.27", 0x0000000, 0x400000, CRC(6ee35e68) SHA1(fdfe63203d8cecf84cb869039fb893d5b63cdd67) ) ROM_REGION( 0x8, "cat702_2", 0 ) @@ -4496,10 +4517,10 @@ ROM_START( raystorm ) ROM_LOAD( "e24-02.1", 0x0400000, 0x400000, CRC(9f70950d) SHA1(b3e4f925a61ae2e5dd4cc5d7ec3030a0d5c2c04d) ) ROM_LOAD( "e24-03.2", 0x0800000, 0x400000, CRC(6c1f0a5d) SHA1(1aac37a7ff23e54021a4cec18c9bb93242337180) ) - ROM_REGION16_LE( 0x080000, "mn10200", 0 ) + ROM_REGION16_LE( 0x080000, ":taito_zoom:mn10200", 0 ) ROM_LOAD( "e24-09.14", 0x0000000, 0x080000, CRC(808589e1) SHA1(46ada4c6d68c2462186a0b962abb435ee740c0ba) ) - ROM_REGION32_LE( 0x400000, "zsg2", 0 ) + ROM_REGION32_LE( 0x400000, ":taito_zoom:zsg2", 0 ) ROM_LOAD( "e24-04.27", 0x0000000, 0x400000, CRC(f403493a) SHA1(3e49fd2a060a3893e26f14cc3cf47c4ba91e17d4) ) ROM_REGION( 0x8, "cat702_2", 0 ) @@ -4515,10 +4536,10 @@ ROM_START( raystormo ) ROM_LOAD( "e24-02.1", 0x0400000, 0x400000, CRC(9f70950d) SHA1(b3e4f925a61ae2e5dd4cc5d7ec3030a0d5c2c04d) ) ROM_LOAD( "e24-03.2", 0x0800000, 0x400000, CRC(6c1f0a5d) SHA1(1aac37a7ff23e54021a4cec18c9bb93242337180) ) - ROM_REGION( 0x080000, "mn10200", 0 ) + ROM_REGION( 0x080000, ":taito_zoom:mn10200", 0 ) ROM_LOAD( "e24-09.14", 0x0000000, 0x080000, CRC(808589e1) SHA1(46ada4c6d68c2462186a0b962abb435ee740c0ba) ) - ROM_REGION32_LE( 0x400000, "zsg2", 0 ) + ROM_REGION32_LE( 0x400000, ":taito_zoom:zsg2", 0 ) ROM_LOAD( "e24-04.27", 0x0000000, 0x400000, CRC(f403493a) SHA1(3e49fd2a060a3893e26f14cc3cf47c4ba91e17d4) ) ROM_REGION( 0x8, "cat702_2", 0 ) @@ -4534,10 +4555,10 @@ ROM_START( raystormu ) ROM_LOAD( "e24-02.1", 0x0400000, 0x400000, CRC(9f70950d) SHA1(b3e4f925a61ae2e5dd4cc5d7ec3030a0d5c2c04d) ) ROM_LOAD( "e24-03.2", 0x0800000, 0x400000, CRC(6c1f0a5d) SHA1(1aac37a7ff23e54021a4cec18c9bb93242337180) ) - ROM_REGION( 0x080000, "mn10200", 0 ) + ROM_REGION( 0x080000, ":taito_zoom:mn10200", 0 ) ROM_LOAD( "e24-09.14", 0x0000000, 0x080000, CRC(808589e1) SHA1(46ada4c6d68c2462186a0b962abb435ee740c0ba) ) - ROM_REGION32_LE( 0x400000, "zsg2", 0 ) + ROM_REGION32_LE( 0x400000, ":taito_zoom:zsg2", 0 ) ROM_LOAD( "e24-04.27", 0x0000000, 0x400000, CRC(f403493a) SHA1(3e49fd2a060a3893e26f14cc3cf47c4ba91e17d4) ) ROM_REGION( 0x8, "cat702_2", 0 ) @@ -4553,10 +4574,10 @@ ROM_START( raystormj ) ROM_LOAD( "e24-02.1", 0x0400000, 0x400000, CRC(9f70950d) SHA1(b3e4f925a61ae2e5dd4cc5d7ec3030a0d5c2c04d) ) ROM_LOAD( "e24-03.2", 0x0800000, 0x400000, CRC(6c1f0a5d) SHA1(1aac37a7ff23e54021a4cec18c9bb93242337180) ) - ROM_REGION( 0x080000, "mn10200", 0 ) + ROM_REGION( 0x080000, ":taito_zoom:mn10200", 0 ) ROM_LOAD( "e24-09.14", 0x0000000, 0x080000, CRC(808589e1) SHA1(46ada4c6d68c2462186a0b962abb435ee740c0ba) ) - ROM_REGION32_LE( 0x400000, "zsg2", 0 ) + ROM_REGION32_LE( 0x400000, ":taito_zoom:zsg2", 0 ) ROM_LOAD( "e24-04.27", 0x0000000, 0x400000, CRC(f403493a) SHA1(3e49fd2a060a3893e26f14cc3cf47c4ba91e17d4) ) ROM_REGION( 0x8, "cat702_2", 0 ) diff --git a/src/mame/drivers/zodiack.cpp b/src/mame/drivers/zodiack.cpp index 7b5a41fb5c8..f622bd80858 100644 --- a/src/mame/drivers/zodiack.cpp +++ b/src/mame/drivers/zodiack.cpp @@ -563,7 +563,7 @@ void zodiack_state::machine_reset() } -static MACHINE_CONFIG_START( zodiack ) +MACHINE_CONFIG_START(zodiack_state::zodiack) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index df697c0d64e..6e37277f3dc 100644 --- a/src/mame/drivers/zorba.cpp +++ b/src/mame/drivers/zorba.cpp @@ -130,8 +130,10 @@ GFXDECODE_START( zorba ) GFXDECODE_ENTRY( "chargen", 0x0000, u5_charlayout, 0, 1 ) GFXDECODE_END +} // anonymous namespace + -MACHINE_CONFIG_START( zorba ) +MACHINE_CONFIG_START(zorba_state::zorba) // basic machine hardware MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 6) MCFG_CPU_PROGRAM_MAP(zorba_mem) @@ -262,8 +264,6 @@ MACHINE_CONFIG_START( zorba ) MCFG_SOFTWARE_LIST_ADD("flop_list", "zorba") MACHINE_CONFIG_END -} // anonymous namespace - //------------------------------------------------- // Initialise/reset diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp index 932fcfa7a7d..7595425bd1d 100644 --- a/src/mame/drivers/zr107.cpp +++ b/src/mame/drivers/zr107.cpp @@ -261,6 +261,8 @@ public: ADC083X_INPUT_CB(adc0838_callback); K056832_CB_MEMBER(tile_callback); + void zr107(machine_config &config); + void jetwave(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -756,7 +758,7 @@ void zr107_state::machine_reset() m_dsp->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } -static MACHINE_CONFIG_START( zr107 ) +MACHINE_CONFIG_START(zr107_state::zr107) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */ @@ -827,7 +829,7 @@ static MACHINE_CONFIG_START( zr107 ) MACHINE_CONFIG_END -static MACHINE_CONFIG_START( jetwave ) +MACHINE_CONFIG_START(zr107_state::jetwave) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */ diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp index f1c8752b64b..d5126429a88 100644 --- a/src/mame/drivers/zrt80.cpp +++ b/src/mame/drivers/zrt80.cpp @@ -51,6 +51,7 @@ public: void kbd_put(u8 data); MC6845_UPDATE_ROW(crtc_update_row); + void zrt80(machine_config &config); private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; uint8_t m_term_data; @@ -267,7 +268,7 @@ static GFXDECODE_START( zrt80 ) GFXDECODE_ENTRY( "chargen", 0x0000, zrt80_charlayout, 0, 1 ) GFXDECODE_END -static MACHINE_CONFIG_START( zrt80 ) +MACHINE_CONFIG_START(zrt80_state::zrt80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_2_4576MHz) MCFG_CPU_PROGRAM_MAP(mem_map) diff --git a/src/mame/drivers/zsbc3.cpp b/src/mame/drivers/zsbc3.cpp index bae5b77a8c1..8e9965c7a3e 100644 --- a/src/mame/drivers/zsbc3.cpp +++ b/src/mame/drivers/zsbc3.cpp @@ -51,6 +51,7 @@ public: , m_maincpu(*this, "maincpu") { } + void zsbc3(machine_config &config); private: required_device m_maincpu; }; @@ -76,7 +77,7 @@ static INPUT_PORTS_START( zsbc3 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( zsbc3 ) +MACHINE_CONFIG_START(zsbc3_state::zsbc3) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4) MCFG_CPU_PROGRAM_MAP(zsbc3_mem) diff --git a/src/mame/drivers/zt8802.cpp b/src/mame/drivers/zt8802.cpp index 975b29c3e11..bc5ecbe86f5 100644 --- a/src/mame/drivers/zt8802.cpp +++ b/src/mame/drivers/zt8802.cpp @@ -25,6 +25,7 @@ public: // , m_maincpu(*this, "maincpu") { } +void zt8802(machine_config &config); private: // required_device m_maincpu; }; @@ -36,7 +37,7 @@ private: static INPUT_PORTS_START( zt8802 ) INPUT_PORTS_END -static MACHINE_CONFIG_START( zt8802 ) +MACHINE_CONFIG_START(zt8802_state::zt8802) MACHINE_CONFIG_END ROM_START( zt8802 ) diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp index 9ab968ff334..72862e18cd8 100644 --- a/src/mame/drivers/zwackery.cpp +++ b/src/mame/drivers/zwackery.cpp @@ -71,6 +71,7 @@ public: DECLARE_READ8_MEMBER(ptm_r); + void zwackery(machine_config &config); protected: virtual void machine_start() override; @@ -489,7 +490,7 @@ void zwackery_state::machine_start() // MACHINE DEFINTIONS //************************************************************************** -static MACHINE_CONFIG_START( zwackery ) +MACHINE_CONFIG_START(zwackery_state::zwackery) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, 7652400) // based on counter usage, should be XTAL_16MHz/2 MCFG_CPU_PROGRAM_MAP(zwackery_map) diff --git a/src/mame/drivers/zx.cpp b/src/mame/drivers/zx.cpp index 1b2b4442568..0708b92a05c 100644 --- a/src/mame/drivers/zx.cpp +++ b/src/mame/drivers/zx.cpp @@ -318,7 +318,7 @@ PALETTE_INIT_MEMBER(zx_state, zx) /* Machine Configs */ -static MACHINE_CONFIG_START( zx80 ) +MACHINE_CONFIG_START(zx_state::zx80) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_6_5MHz/2) MCFG_CPU_PROGRAM_MAP(zx80_map) @@ -352,7 +352,7 @@ static MACHINE_CONFIG_START( zx80 ) MCFG_RAM_EXTRA_OPTIONS("1K,2K,3K,16K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zx81, zx80 ) +MACHINE_CONFIG_DERIVED(zx_state::zx81, zx80) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(zx81_map) MCFG_CPU_IO_MAP(zx81_io_map) @@ -370,7 +370,7 @@ static MACHINE_CONFIG_DERIVED( zx81, zx80 ) MCFG_RAM_EXTRA_OPTIONS("1K,32K,48K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( zx81_spk, zx81 ) +MACHINE_CONFIG_DERIVED(zx_state::zx81_spk, zx81 ) /* sound hardware */ /* Used by pc8300/lambda/pow3000 */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -380,20 +380,20 @@ static MACHINE_CONFIG_DERIVED( zx81_spk, zx81 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ts1000, zx81 ) +MACHINE_CONFIG_DERIVED(zx_state::ts1000, zx81) /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("2K") MCFG_RAM_EXTRA_OPTIONS("1K,16K,32K,48K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( ts1500, ts1000 ) +MACHINE_CONFIG_DERIVED(zx_state::ts1500, ts1000) /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("16K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pc8300, zx81_spk ) +MACHINE_CONFIG_DERIVED(zx_state::pc8300, zx81_spk) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(pc8300_io_map) @@ -402,7 +402,7 @@ static MACHINE_CONFIG_DERIVED( pc8300, zx81_spk ) MCFG_RAM_DEFAULT_SIZE("16K") MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( pow3000, zx81_spk ) +MACHINE_CONFIG_DERIVED(zx_state::pow3000, zx81_spk) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(pow3000_io_map) diff --git a/src/mame/etc/korgm1.cpp b/src/mame/etc/korgm1.cpp index c0977a3a47d..3b2ae6a1dd8 100644 --- a/src/mame/etc/korgm1.cpp +++ b/src/mame/etc/korgm1.cpp @@ -33,6 +33,8 @@ public: // screen updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void korgm1(machine_config &config); + protected: // driver_device overrides virtual void machine_start(); @@ -160,7 +162,7 @@ PALETTE_INIT_MEMBER(korgm1_state, korgm1) { } -static MACHINE_CONFIG_START( korgm1, korgm1_state ) +MACHINE_CONFIG_START(korgm1_state::korgm1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",V30,MAIN_CLOCK) // V50 actually diff --git a/src/mame/etc/template_device.cpp b/src/mame/etc/template_device.cpp index a3f19e6901b..c19f2814b98 100644 --- a/src/mame/etc/template_device.cpp +++ b/src/mame/etc/template_device.cpp @@ -40,7 +40,7 @@ xxx_device::xxx_device(const machine_config &mconfig, const char *tag, device_t // configuration addiitons //------------------------------------------------- -MACHINE_CONFIG_MEMBER(xxx_device::device_add_mconfig) +MACHINE_CONFIG_START(xxx_device::device_add_mconfig) //MCFG_CPU_ADD(...) MACHINE_CONFIG_END diff --git a/src/mame/etc/template_driver.cpp b/src/mame/etc/template_driver.cpp index 0879ded9a03..1e4d97672ff 100644 --- a/src/mame/etc/template_driver.cpp +++ b/src/mame/etc/template_driver.cpp @@ -28,6 +28,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_PALETTE_INIT(xxx); + void xxx(machine_config &config); + protected: // driver_device overrides virtual void machine_start() override; @@ -141,7 +143,7 @@ PALETTE_INIT_MEMBER(xxx_state, xxx) { } -static MACHINE_CONFIG_START( xxx ) +MACHINE_CONFIG_START(xxx_state::xxx) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,MAIN_CLOCK/2) diff --git a/src/mame/etc/unkfr.cpp b/src/mame/etc/unkfr.cpp index 296f58b3cbd..8892c2203e8 100644 --- a/src/mame/etc/unkfr.cpp +++ b/src/mame/etc/unkfr.cpp @@ -25,6 +25,8 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } required_device m_maincpu; + + void unkfr(machine_config &config); }; @@ -58,7 +60,7 @@ static INPUT_PORTS_START( unkfr ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) INPUT_PORTS_END -static MACHINE_CONFIG_START( unkfr, unkfr_state ) +MACHINE_CONFIG_START( unkfr_state::unkfr ) MACHINE_CONFIG_END ROM_START( unkfr ) diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index a9f4192f495..afff730a44e 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -65,4 +65,6 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_soundlatch; + void _1942p(machine_config &config); + void _1942(machine_config &config); }; diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index 2ea1f3d22ea..92e36ac0955 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -63,4 +63,5 @@ public: DECLARE_PALETTE_INIT(1943); uint32_t screen_update_1943(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); + void _1943(machine_config &config); }; diff --git a/src/mame/includes/20pacgal.h b/src/mame/includes/20pacgal.h index 03e3fc39d7c..107bba20b7b 100644 --- a/src/mame/includes/20pacgal.h +++ b/src/mame/includes/20pacgal.h @@ -70,6 +70,8 @@ public: void draw_sprite(bitmap_rgb32 &bitmap, int y, int x, uint8_t code, uint8_t color, int flip_y, int flip_x); void common_save_state(); + void _20pacgal(machine_config &config); + void _20pacgal_video(machine_config &config); }; @@ -82,7 +84,5 @@ public: DECLARE_READ8_MEMBER( _25pacman_io_87_r ); virtual void machine_start() override; + void _25pacman(machine_config &config); }; - -/*----------- defined in video/20pacgal.c -----------*/ -MACHINE_CONFIG_EXTERN( 20pacgal_video ); diff --git a/src/mame/includes/3do.h b/src/mame/includes/3do.h index b8958100e8d..049439e60b6 100644 --- a/src/mame/includes/3do.h +++ b/src/mame/includes/3do.h @@ -178,6 +178,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER( timer_x16_cb ); + void _3do(machine_config &config); + void _3do_pal(machine_config &config); protected: required_memory_bank m_bank1; required_memory_bank m_bank2; diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h index a06f2518960..b1a40dce8a4 100644 --- a/src/mame/includes/40love.h +++ b/src/mame/includes/40love.h @@ -120,6 +120,8 @@ public: TIMER_NMI_CALLBACK }; + void undoukai(machine_config &config); + void _40love(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index 69aac584470..f02bb9896b2 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -52,4 +52,6 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; + void unkpacg(machine_config &config); + void _4enraya(machine_config &config); }; diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h index fefcf45b1e0..3a7419b3053 100644 --- a/src/mame/includes/8080bw.h +++ b/src/mame/includes/8080bw.h @@ -175,6 +175,36 @@ public: inline void set_pixel( bitmap_rgb32 &bitmap, uint8_t y, uint8_t x, int color ); inline void set_8_pixels( bitmap_rgb32 &bitmap, uint8_t y, uint8_t x, uint8_t data, int fore_color, int back_color ); void clear_extra_columns( bitmap_rgb32 &bitmap, int color ); + void indianbtbr(machine_config &config); + void claybust(machine_config &config); + void shuttlei(machine_config &config); + void spcewarla(machine_config &config); + void escmars(machine_config &config); + void lrescue(machine_config &config); + void invmulti(machine_config &config); + void yosakdon(machine_config &config); + void polaris(machine_config &config); + void attackfc(machine_config &config); + void astropal(machine_config &config); + void rollingc(machine_config &config); + void vortex(machine_config &config); + void invrvnge(machine_config &config); + void sflush(machine_config &config); + void invadpt2(machine_config &config); + void lupin3a(machine_config &config); + void indianbt(machine_config &config); + void starw1(machine_config &config); + void cosmo(machine_config &config); + void spcewars(machine_config &config); + void cosmicmo(machine_config &config); + void darthvdr(machine_config &config); + void ballbomb(machine_config &config); + void spacecom(machine_config &config); + void schasercv(machine_config &config); + void lupin3(machine_config &config); + void spacerng(machine_config &config); + void steelwkr(machine_config &config); + void schaser(machine_config &config); }; diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h index 6f2cc2a8e38..c7791e39919 100644 --- a/src/mame/includes/88games.h +++ b/src/mame/includes/88games.h @@ -65,4 +65,5 @@ public: K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); DECLARE_WRITE8_MEMBER(banking_callback); + void _88games(machine_config &config); }; diff --git a/src/mame/includes/abc1600.h b/src/mame/includes/abc1600.h index 2e24b965dd9..d64bed61f72 100644 --- a/src/mame/includes/abc1600.h +++ b/src/mame/includes/abc1600.h @@ -138,6 +138,7 @@ public: uint8_t m_cause; int m_partst; // parity test + void abc1600(machine_config &config); // peripherals int m_cs7; // card select address bit 7 int m_bus0; // BUS 0 selected diff --git a/src/mame/includes/abc80.h b/src/mame/includes/abc80.h index 6c10d9a1576..b7e94b1ecf6 100644 --- a/src/mame/includes/abc80.h +++ b/src/mame/includes/abc80.h @@ -186,10 +186,8 @@ public: emu_timer *m_blink_timer; emu_timer *m_vsync_on_timer; emu_timer *m_vsync_off_timer; + void abc80(machine_config &config); + void abc80_video(machine_config &config); }; -//----------- defined in video/abc80.c ----------- - -MACHINE_CONFIG_EXTERN( abc80_video ); - #endif // MAME_INCLUDES_ABC80_H diff --git a/src/mame/includes/abc80x.h b/src/mame/includes/abc80x.h index a75b01e7cba..b1553305520 100644 --- a/src/mame/includes/abc80x.h +++ b/src/mame/includes/abc80x.h @@ -176,6 +176,8 @@ public: void hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect); MC6845_UPDATE_ROW( abc800m_update_row ); + void abc800m(machine_config &config); + void abc800m_video(machine_config &config); }; @@ -202,6 +204,8 @@ public: DECLARE_READ8_MEMBER( char_ram_r ); DECLARE_PALETTE_INIT( abc800c ); + void abc800c(machine_config &config); + void abc800c_video(machine_config &config); }; @@ -244,6 +248,9 @@ public: int m_flshclk_ctr; // flash clock counter int m_flshclk; // flash clock int m_80_40_mux; // 40/80 column mode + + void abc802(machine_config &config); + void abc802_video(machine_config &config); }; @@ -316,6 +323,9 @@ public: uint32_t m_vsync_shift; // vertical sync shift register int m_vsync; // vertical sync int m_d_vsync; // delayed vertical sync + + void abc806(machine_config &config); + void abc806_video(machine_config &config); }; #endif diff --git a/src/mame/includes/ac1.h b/src/mame/includes/ac1.h index 842ebf30b14..0c6bb23b0ae 100644 --- a/src/mame/includes/ac1.h +++ b/src/mame/includes/ac1.h @@ -34,6 +34,8 @@ public: DECLARE_WRITE8_MEMBER(ac1_port_a_w); DECLARE_WRITE8_MEMBER(ac1_port_b_w); + void ac1_32(machine_config &config); + void ac1(machine_config &config); private: required_device m_cassette; required_device m_maincpu; diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h index e09368ff47d..d96c1cd0350 100644 --- a/src/mame/includes/actfancr.h +++ b/src/mame/includes/actfancr.h @@ -45,4 +45,6 @@ public: DECLARE_MACHINE_START(triothep); DECLARE_MACHINE_RESET(triothep); uint32_t screen_update_actfancr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void triothep(machine_config &config); + void actfancr(machine_config &config); }; diff --git a/src/mame/includes/adam.h b/src/mame/includes/adam.h index b21166751e4..edfa51fced8 100644 --- a/src/mame/includes/adam.h +++ b/src/mame/includes/adam.h @@ -112,6 +112,7 @@ public: // video state int m_vdp_nmi; + void adam(machine_config &config); }; #endif diff --git a/src/mame/includes/advision.h b/src/mame/includes/advision.h index 716e7522413..2932ae090fb 100644 --- a/src/mame/includes/advision.h +++ b/src/mame/includes/advision.h @@ -84,6 +84,7 @@ public: int m_sound_d; int m_sound_g; DECLARE_PALETTE_INIT(advision); + void advision(machine_config &config); }; #endif diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index d47bd1e555d..1cc03221a75 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -69,4 +69,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void formatz(machine_config &config); }; diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index bda9adc1338..2ee5264a3b2 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -141,4 +141,18 @@ public: void spikes91_draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); void aerfboot_draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); void wbbc97_draw_bitmap( bitmap_rgb32 &bitmap ); + void spinlbrk(machine_config &config); + void aerofgt(machine_config &config); + void karatblz(machine_config &config); + void pspikesb(machine_config &config); + void aerfboo2(machine_config &config); + void pspikes(machine_config &config); + void wbbc97(machine_config &config); + void aerfboot(machine_config &config); + void pspikesc(machine_config &config); + void karatblzbl(machine_config &config); + void spikes91(machine_config &config); + void aerofgtb(machine_config &config); + void turbofrc(machine_config &config); + void kickball(machine_config &config); }; diff --git a/src/mame/includes/aim65.h b/src/mame/includes/aim65.h index 1782c6fef28..9db8b749bd0 100644 --- a/src/mame/includes/aim65.h +++ b/src/mame/includes/aim65.h @@ -69,6 +69,7 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(z14_load) { return load_cart(image, m_z14, "z14"); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(z15_load) { return load_cart(image, m_z15, "z15"); } + void aim65(machine_config &config); protected: virtual void machine_start() override; diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index baeb879cdf1..b02a1f90f2c 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -85,4 +85,6 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank); INTERRUPT_GEN_MEMBER(slave_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(airbustr_scanline); + void airbustr(machine_config &config); + void airbustrb(machine_config &config); }; diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h index a0a36a5d444..9d7a6fe28a6 100644 --- a/src/mame/includes/ajax.h +++ b/src/mame/includes/ajax.h @@ -60,4 +60,5 @@ public: K051316_CB_MEMBER(zoom_callback); K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); + void ajax(machine_config &config); }; diff --git a/src/mame/includes/alesis.h b/src/mame/includes/alesis.h index 8cbadadd0ca..4bb762df078 100644 --- a/src/mame/includes/alesis.h +++ b/src/mame/includes/alesis.h @@ -94,6 +94,9 @@ public: DECLARE_WRITE8_MEMBER( sr16_lcd_w ); HD44780_PIXEL_UPDATE(sr16_pixel_update); + void mmt8(machine_config &config); + void hr16(machine_config &config); + void sr16(machine_config &config); private: uint8_t m_kb_matrix; uint8_t m_leds; diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h index 058118838c6..29dd1c211a1 100644 --- a/src/mame/includes/aliens.h +++ b/src/mame/includes/aliens.h @@ -48,4 +48,5 @@ public: K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); DECLARE_WRITE8_MEMBER(banking_callback); + void aliens(machine_config &config); }; diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index 15e1b5b85df..a902418f0a5 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -125,6 +125,16 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_soundlatch; + void tnextspc(machine_config &config); + void alpha68k_II(machine_config &config); + void btlfieldb(machine_config &config); + void alpha68k_I(machine_config &config); + void kyros(machine_config &config); + void alpha68k_V_sb(machine_config &config); + void sstingry(machine_config &config); + void jongbou(machine_config &config); + void alpha68k_V(machine_config &config); + void alpha68k_II_gm(machine_config &config); }; /* game_id - used to deal with a few game specific situations */ diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 75100fb7ef4..7a6fcbb0a8d 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -496,6 +496,9 @@ public: void blitter_setup(); + void amiga_base(machine_config &config); + void pal_video(machine_config &config); + void ntsc_video(machine_config &config); protected: // A bit of a trick here: some registers are 32-bit. In order to efficiently // read them on both big-endian and little-endian systems, we store the custom @@ -710,7 +713,4 @@ private: uint32_t amiga_gethvpos(); }; -MACHINE_CONFIG_EXTERN( pal_video ); -MACHINE_CONFIG_EXTERN( ntsc_video ); - #endif // MAME_INCLUDES_AMIGA_H diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h index 38f105f7b41..0a94fe9aef6 100644 --- a/src/mame/includes/ampoker2.h +++ b/src/mame/includes/ampoker2.h @@ -35,4 +35,6 @@ public: required_device m_maincpu; required_device m_watchdog; required_device m_gfxdecode; + void sigma2k(machine_config &config); + void ampoker2(machine_config &config); }; diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index ec6b3b265f4..131c169e72e 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -65,4 +65,5 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; + void amspdwy(machine_config &config); }; diff --git a/src/mame/includes/amstrad.h b/src/mame/includes/amstrad.h index 9fea9f0625b..d67636891de 100644 --- a/src/mame/includes/amstrad.h +++ b/src/mame/includes/amstrad.h @@ -260,6 +260,15 @@ public: DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); + void cpcplus_cartslot(machine_config &config); + void amstrad_base(machine_config &config); + void cpc664(machine_config &config); + void cpcplus(machine_config &config); + void gx4000(machine_config &config); + void cpc6128(machine_config &config); + void aleste(machine_config &config); + void kccomp(machine_config &config); + void cpc464(machine_config &config); protected: required_memory_region m_region_maincpu; optional_memory_region m_region_user1; diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index 5eb278f9926..268b5e0f488 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -66,4 +66,6 @@ public: required_device m_maincpu; required_device m_gfxdecode; optional_shared_ptr m_decrypted_opcodes; + void angelkds(machine_config &config); + void spcpostn(machine_config &config); }; diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h index ea06e5f7f9f..f311a36014c 100644 --- a/src/mame/includes/apollo.h +++ b/src/mame/includes/apollo.h @@ -254,6 +254,23 @@ public: DECLARE_WRITE_LINE_MEMBER(apollo_reset_instr_callback); DECLARE_READ32_MEMBER(apollo_instruction_hook); + void common(machine_config &config); + void apollo(machine_config &config); + void apollo_terminal(machine_config &config); + void apollo_graphics(machine_config &config); + void apollo_mono19i(machine_config &config); + void dn3500(machine_config &config); + void dn5500_19i(machine_config &config); + void dn3000(machine_config &config); + void dn3000_15i(machine_config &config); + void dn3000_19i(machine_config &config); + void dn3500_15i(machine_config &config); + void dsp3000(machine_config &config); + void dsp3500(machine_config &config); + void dsp5500(machine_config &config); + void dn5500(machine_config &config); + void dn5500_15i(machine_config &config); + void dn3500_19i(machine_config &config); private: uint32_t ptm_counter; uint8_t sio_output_data; @@ -262,9 +279,6 @@ private: emu_timer *m_dn3000_timer; }; -MACHINE_CONFIG_EXTERN( apollo ); -MACHINE_CONFIG_EXTERN( apollo_terminal ); - /*----------- machine/apollo_config.c -----------*/ // configuration bit definitions @@ -637,8 +651,6 @@ DECLARE_DEVICE_TYPE(APOLLO_GRAPHICS, apollo_graphics_15i) MCFG_FRAGMENT_ADD(apollo_graphics) \ MCFG_DEVICE_ADD(_tag, APOLLO_GRAPHICS, 0) -MACHINE_CONFIG_EXTERN( apollo_graphics ); - class apollo_graphics_19i : public apollo_graphics_15i { public: @@ -658,8 +670,6 @@ DECLARE_DEVICE_TYPE(APOLLO_MONO19I, apollo_graphics_19i) MCFG_FRAGMENT_ADD(apollo_mono19i) \ MCFG_DEVICE_ADD(_tag, APOLLO_MONO19I, 0) -MACHINE_CONFIG_EXTERN( apollo_mono19i ); - #ifdef APOLLO_XXL /*----------- machine/apollo_stdio.c -----------*/ diff --git a/src/mame/includes/apple2gs.h b/src/mame/includes/apple2gs.h index 377e0329d91..fb897ae331e 100644 --- a/src/mame/includes/apple2gs.h +++ b/src/mame/includes/apple2gs.h @@ -268,6 +268,8 @@ public: DECLARE_WRITE_LINE_MEMBER( apple2gs_doc_irq); DECLARE_READ8_MEMBER(apple2gs_adc_read); + void apple2gs(machine_config &config); + void apple2gsr1(machine_config &config); }; #endif /* APPLE2GS_H_ */ diff --git a/src/mame/includes/apple3.h b/src/mame/includes/apple3.h index bf0a446ee54..8c1503bb10f 100644 --- a/src/mame/includes/apple3.h +++ b/src/mame/includes/apple3.h @@ -133,6 +133,7 @@ public: uint32_t m_flags; int m_enable_mask; + void apple3(machine_config &config); private: int m_acia_irq; uint8_t m_via_0_a; diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index 1341db94218..91b12749e62 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -66,6 +66,10 @@ public: void appoooh_draw_sprites( bitmap_ind16 &dest_bmp, const rectangle &cliprect, gfx_element *gfx, uint8_t *sprite ); void robowres_draw_sprites( bitmap_ind16 &dest_bmp, const rectangle &cliprect, gfx_element *gfx, uint8_t *sprite ); DECLARE_WRITE_LINE_MEMBER(adpcm_int); + void robowrese(machine_config &config); + void robowres(machine_config &config); + void appoooh(machine_config &config); + void appoooh_common(machine_config &config); }; #define CHR1_OFST 0x00 /* palette page of char set #1 */ diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index e7ae1823942..efb857deccf 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -65,4 +65,5 @@ public: uint8_t aquarium_snd_bitswap( uint8_t scrambled_data ); void mix_sprite_bitmap(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority_mask, int priority_value); bitmap_ind16 m_temp_sprite_bitmap; + void aquarium(machine_config &config); }; diff --git a/src/mame/includes/aquarius.h b/src/mame/includes/aquarius.h index b942ede4576..94674f508f2 100644 --- a/src/mame/includes/aquarius.h +++ b/src/mame/includes/aquarius.h @@ -90,5 +90,6 @@ public: DECLARE_PALETTE_INIT(aquarius); uint32_t screen_update_aquarius(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_INPUT_CHANGED_MEMBER(aquarius_reset); + void aquarius(machine_config &config); }; #endif // MAME_INCLUDES_AQUARIUS_H diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h index bc56248d360..532c249cb5e 100644 --- a/src/mame/includes/arabian.h +++ b/src/mame/includes/arabian.h @@ -58,4 +58,5 @@ public: required_device m_maincpu; required_device m_mcu; required_device m_palette; + void arabian(machine_config &config); }; diff --git a/src/mame/includes/arcadecl.h b/src/mame/includes/arcadecl.h index 748ad6a6a66..f97d186102a 100644 --- a/src/mame/includes/arcadecl.h +++ b/src/mame/includes/arcadecl.h @@ -34,4 +34,6 @@ public: void arcadecl_bitmap_render(bitmap_ind16 &bitmap, const rectangle &cliprect); static const atari_motion_objects_config s_mob_config; + void sparkz(machine_config &config); + void arcadecl(machine_config &config); }; diff --git a/src/mame/includes/arcadia.h b/src/mame/includes/arcadia.h index 8b917835b25..171a3ad236f 100644 --- a/src/mame/includes/arcadia.h +++ b/src/mame/includes/arcadia.h @@ -103,6 +103,7 @@ public: uint32_t screen_update_arcadia(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(video_line); + void arcadia(machine_config &config); protected: required_device m_custom; required_ioport m_panel; diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index ffd1703a905..62c434b38ef 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -140,4 +140,7 @@ public: // valtric specific void valtric_draw_mosaic(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void valtric_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect); + void valtric(machine_config &config); + void argus(machine_config &config); + void butasan(machine_config &config); }; diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index 9f099e71c6d..6ba7b022fc7 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -96,4 +96,12 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void arkanoid_bootleg_init( ); + void bootleg(machine_config &config); + void p3mcuay(machine_config &config); + void aysnd(machine_config &config); + void hexa(machine_config &config); + void brixian(machine_config &config); + void hexaa(machine_config &config); + void p3mcu(machine_config &config); + void arkanoid(machine_config &config); }; diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index 3f0d64a6089..74018162908 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -103,6 +103,15 @@ public: void armedf_drawgfx(bitmap_ind16 &dest_bmp,const rectangle &clip,gfx_element *gfx, uint32_t code,uint32_t color, uint32_t clut,int flipx,int flipy,int offsx,int offsy, int transparent_color); + void terraf_sound(machine_config &config); + void terrafb(machine_config &config); + void legion(machine_config &config); + void terraf(machine_config &config); + void legionjb(machine_config &config); + void cclimbr2(machine_config &config); + void terrafjb(machine_config &config); + void armedf(machine_config &config); + void kozure(machine_config &config); }; class bigfghtr_state : public armedf_state @@ -121,4 +130,5 @@ public: DECLARE_WRITE8_MEMBER(main_sharedram_w); DECLARE_READ8_MEMBER(main_sharedram_r); DECLARE_WRITE8_MEMBER(mcu_spritelist_w); + void bigfghtr(machine_config &config); }; diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h index 2dc20cc866a..c49789b4705 100644 --- a/src/mame/includes/artmagic.h +++ b/src/mame/includes/artmagic.h @@ -85,6 +85,10 @@ public: void update_irq_state(); inline uint16_t *address_to_vram(offs_t *address); + void cheesech(machine_config &config); + void artmagic(machine_config &config); + void shtstar(machine_config &config); + void stonebal(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h index 4735df63f43..0a974f812f2 100644 --- a/src/mame/includes/ashnojoe.h +++ b/src/mame/includes/ashnojoe.h @@ -87,4 +87,5 @@ public: virtual void video_start() override; uint32_t screen_update_ashnojoe(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(ashnojoe_vclk_cb); + void ashnojoe(machine_config &config); }; diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h index 3deb52af3d7..2a5d43e8981 100644 --- a/src/mame/includes/asterix.h +++ b/src/mame/includes/asterix.h @@ -58,6 +58,7 @@ public: K056832_CB_MEMBER(tile_callback); void reset_spritebank(); + void asterix(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/asteroid.h b/src/mame/includes/asteroid.h index c89e6494b18..302a2742677 100644 --- a/src/mame/includes/asteroid.h +++ b/src/mame/includes/asteroid.h @@ -57,9 +57,12 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void asteroid_base(machine_config &config); + void asterock(machine_config &config); + void asteroid(machine_config &config); + void llander(machine_config &config); + void astdelux(machine_config &config); + void asteroid_sound(machine_config &config); + void astdelux_sound(machine_config &config); + void llander_sound(machine_config &config); }; - -/*----------- defined in audio/asteroid.cpp -----------*/ - -MACHINE_CONFIG_EXTERN(asteroid_sound); -MACHINE_CONFIG_EXTERN(astdelux_sound); diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index ed3872b854b..4f4c7582953 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -196,6 +196,19 @@ public: DECLARE_READ8_MEMBER( votrax_speech_r ); CUSTOM_INPUT_MEMBER( votrax_speech_status_r ); + void astrocade_base(machine_config &config); + void astrocade_16color_base(machine_config &config); + void astrocade_mono_sound(machine_config &config); + void astrocade_stereo_sound(machine_config &config); + void spacezap(machine_config &config); + void gorf(machine_config &config); + void seawolf2(machine_config &config); + void profpac(machine_config &config); + void robby(machine_config &config); + void ebases(machine_config &config); + void wow(machine_config &config); + void tenpindx(machine_config &config); + void demndrgn(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h index 8845b26e4eb..56dd277235f 100644 --- a/src/mame/includes/astrof.h +++ b/src/mame/includes/astrof.h @@ -91,12 +91,12 @@ public: void spfghmk2_set_video_control_2( uint8_t data ); void tomahawk_set_video_control_2( uint8_t data ); void video_update_common( bitmap_rgb32 &bitmap, const rectangle &cliprect, pen_t *pens, int num_pens ); + void base(machine_config &config); + void astrof(machine_config &config); + void abattle(machine_config &config); + void spfghmk2(machine_config &config); + void tomahawk(machine_config &config); + void astrof_audio(machine_config &config); + void spfghmk2_audio(machine_config &config); + void tomahawk_audio(machine_config &config); }; - -/*----------- defined in audio/astrof.c -----------*/ - -MACHINE_CONFIG_EXTERN( astrof_audio ); - -MACHINE_CONFIG_EXTERN( spfghmk2_audio ); - -MACHINE_CONFIG_EXTERN( tomahawk_audio ); diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h index 755488476c5..07a2b409bb1 100644 --- a/src/mame/includes/asuka.h +++ b/src/mame/includes/asuka.h @@ -102,6 +102,12 @@ public: DECLARE_WRITE16_MEMBER( bonzeadv_cchip_ram_w ); DECLARE_WRITE_LINE_MEMBER(asuka_msm5205_vck); + void mofflott(machine_config &config); + void asuka(machine_config &config); + void cadash(machine_config &config); + void eto(machine_config &config); + void galmedes(machine_config &config); + void bonzeadv(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index 3416739f23e..3368aed423b 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -98,6 +98,10 @@ public: void get_tile_info_common( tile_data &tileinfo, tilemap_memory_index tile_index, uint8_t *alpha_videoram ); void draw_playfield_and_alpha( bitmap_ind16 &bitmap, const rectangle &cliprect, int playfield_x_offset, int playfield_y_offset ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int gfx, int is_soccer ); + void atarifb4(machine_config &config); + void atarifb(machine_config &config); + void soccer(machine_config &config); + void abaseb(machine_config &config); }; /*----------- defined in audio/atarifb.c -----------*/ diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h index d3ad4308695..b6bbfac3327 100644 --- a/src/mame/includes/atarig1.h +++ b/src/mame/includes/atarig1.h @@ -64,6 +64,14 @@ public: DECLARE_MACHINE_RESET(atarig1); DECLARE_VIDEO_START(atarig1); uint32_t screen_update_atarig1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void atarig1(machine_config &config); + void pitfightj(machine_config &config); + void pitfight7(machine_config &config); + void pitfight9(machine_config &config); + void pitfightb(machine_config &config); + void pitfight(machine_config &config); + void hydrap(machine_config &config); + void hydra(machine_config &config); private: void pitfightb_cheap_slapstic_init(); }; diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h index 95fe69e81a6..5e03d0a1227 100644 --- a/src/mame/includes/atarig42.h +++ b/src/mame/includes/atarig42.h @@ -73,4 +73,7 @@ public: DECLARE_MACHINE_RESET(atarig42); DECLARE_VIDEO_START(atarig42); uint32_t screen_update_atarig42(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void atarig42(machine_config &config); + void atarig42_0x200(machine_config &config); + void atarig42_0x400(machine_config &config); }; diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h index 7e632b4d544..d3e1144d42c 100644 --- a/src/mame/includes/atarigt.h +++ b/src/mame/includes/atarigt.h @@ -87,6 +87,10 @@ public: DECLARE_MACHINE_RESET(atarigt); DECLARE_VIDEO_START(atarigt); uint32_t screen_update_atarigt(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void atarigt(machine_config &config); + void tmek(machine_config &config); + void primrage20(machine_config &config); + void primrage(machine_config &config); private: void tmek_update_mode(offs_t offset); void tmek_protection_w(address_space &space, offs_t offset, uint16_t data); diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h index 76e4199be92..7bbd6558ab0 100644 --- a/src/mame/includes/atarigx2.h +++ b/src/mame/includes/atarigx2.h @@ -68,4 +68,7 @@ public: DECLARE_VIDEO_START(atarigx2); uint32_t screen_update_atarigx2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE16_MEMBER( atarigx2_mo_control_w ); + void atarigx2(machine_config &config); + void atarigx2_0x200(machine_config &config); + void atarigx2_0x400(machine_config &config); }; diff --git a/src/mame/includes/atarist.h b/src/mame/includes/atarist.h index 180dfb4bc9b..7455667a3ef 100644 --- a/src/mame/includes/atarist.h +++ b/src/mame/includes/atarist.h @@ -335,6 +335,7 @@ public: required_device m_palette; DECLARE_WRITE_LINE_MEMBER( write_monochrome ); + void st(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -348,6 +349,7 @@ public: DECLARE_READ16_MEMBER( fpu_r ); DECLARE_WRITE16_MEMBER( fpu_w ); + void megast(machine_config &config); }; class ste_state : public st_state @@ -427,6 +429,10 @@ public: emu_timer *m_microwire_timer; emu_timer *m_dmasound_timer; + void falcon40(machine_config &config); + void tt030(machine_config &config); + void falcon(machine_config &config); + void ste(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -444,6 +450,7 @@ public: DECLARE_WRITE16_MEMBER( cache_w ); uint16_t m_cache; + void megaste(machine_config &config); }; class stbook_state : public ste_state diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h index 648bc9881b7..845ae5a6b02 100644 --- a/src/mame/includes/atarisy1.h +++ b/src/mame/includes/atarisy1.h @@ -107,4 +107,11 @@ public: DECLARE_WRITE16_MEMBER( atarisy1_priority_w ); static const atari_motion_objects_config s_mob_config; + void atarisy1(machine_config &config); + void indytemp(machine_config &config); + void roadb110(machine_config &config); + void peterpak(machine_config &config); + void roadrunn(machine_config &config); + void roadb109(machine_config &config); + void marble(machine_config &config); }; diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h index c19f3928787..44c53f0ab84 100644 --- a/src/mame/includes/atarisy2.h +++ b/src/mame/includes/atarisy2.h @@ -126,4 +126,10 @@ public: DECLARE_PALETTE_DECODER(RRRRGGGGBBBBIIII); static const atari_motion_objects_config s_mob_config; + void atarisy2(machine_config &config); + void apb(machine_config &config); + void paperboy(machine_config &config); + void ssprint(machine_config &config); + void _720(machine_config &config); + void csprint(machine_config &config); }; diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index e4bb9cc4b11..0ffc4b0423f 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -51,4 +51,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(interrupt_gen); void reset_bank(); + void atetrisb2(machine_config &config); + void atetrisb3(machine_config &config); + void atetris(machine_config &config); }; diff --git a/src/mame/includes/atom.h b/src/mame/includes/atom.h index b0951ca8943..990331a1095 100644 --- a/src/mame/includes/atom.h +++ b/src/mame/includes/atom.h @@ -118,6 +118,8 @@ public: image_init_result load_cart(device_image_interface &image, generic_slot_device *slot); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load) { return load_cart(image, m_cart); } DECLARE_QUICKLOAD_LOAD_MEMBER(atom_atm); + void atombb(machine_config &config); + void atom(machine_config &config); }; class atomeb_state : public atom_state @@ -164,6 +166,7 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(af_load) { return load_cart(image, m_ext[0xf]); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(e0_load) { return load_cart(image, m_e0); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(e1_load) { return load_cart(image, m_e1); } + void atomeb(machine_config &config); }; #endif // MAME_INCLUDES_ATOM_H diff --git a/src/mame/includes/aussiebyte.h b/src/mame/includes/aussiebyte.h index af21382022a..4553a68ba40 100644 --- a/src/mame/includes/aussiebyte.h +++ b/src/mame/includes/aussiebyte.h @@ -98,6 +98,7 @@ public: MC6845_UPDATE_ROW(crtc_update_row); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr); + void aussiebyte(machine_config &config); private: uint8_t crt8002(uint8_t ac_ra, uint8_t ac_chr, uint8_t ac_attr, uint16_t ac_cnt, bool ac_curs); bool m_port15; // rom switched in (0), out (1) diff --git a/src/mame/includes/avalnche.h b/src/mame/includes/avalnche.h index 12cbbc00fad..b73b7a008a2 100644 --- a/src/mame/includes/avalnche.h +++ b/src/mame/includes/avalnche.h @@ -36,10 +36,9 @@ public: DECLARE_WRITE_LINE_MEMBER(catch_aud1_w); DECLARE_WRITE_LINE_MEMBER(catch_aud2_w); required_device m_maincpu; + void avalnche_base(machine_config &config); + void acatch(machine_config &config); + void acatch_sound(machine_config &config); + void avalnche(machine_config &config); + void avalnche_sound(machine_config &config); }; - - -/*----------- defined in audio/avalnche.cpp -----------*/ - -MACHINE_CONFIG_EXTERN(avalnche_sound); -MACHINE_CONFIG_EXTERN(catch_sound); diff --git a/src/mame/includes/avigo.h b/src/mame/includes/avigo.h index 1463e94149e..3ee91aaac3d 100644 --- a/src/mame/includes/avigo.h +++ b/src/mame/includes/avigo.h @@ -111,6 +111,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(avigo_1hz_timer); DECLARE_QUICKLOAD_LOAD_MEMBER( avigo); + void avigo(machine_config &config); }; #endif // MAME_INCLUDES_AVIGO_H diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h index f34b5a94e60..7b7589c25d3 100644 --- a/src/mame/includes/aztarac.h +++ b/src/mame/includes/aztarac.h @@ -52,4 +52,5 @@ public: IRQ_CALLBACK_MEMBER(irq_callback); inline void read_vectorram(uint16_t *vectorram, int addr, int *x, int *y, int *c); + void aztarac(machine_config &config); }; diff --git a/src/mame/includes/b2m.h b/src/mame/includes/b2m.h index 03ab576cf62..1aa51bc4981 100644 --- a/src/mame/includes/b2m.h +++ b/src/mame/includes/b2m.h @@ -55,6 +55,8 @@ public: DECLARE_WRITE_LINE_MEMBER(b2m_fdc_drq); DECLARE_FLOPPY_FORMATS( b2m_floppy_formats ); + void b2mrom(machine_config &config); + void b2m(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h index f7ad1bf43d5..ed1e034fb0e 100644 --- a/src/mame/includes/badlands.h +++ b/src/mame/includes/badlands.h @@ -56,4 +56,6 @@ public: DECLARE_WRITE8_MEMBER(bootleg_main_irq_w); static const atari_motion_objects_config s_mob_config; + void badlandsb(machine_config &config); + void badlands(machine_config &config); }; diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h index fe2394a3b49..469c81e0bbe 100644 --- a/src/mame/includes/bagman.h +++ b/src/mame/includes/bagman.h @@ -80,6 +80,12 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void update_pal(); + void botanic(machine_config &config); + void squaitsa(machine_config &config); + void sbagman(machine_config &config); + void bagman(machine_config &config); + void pickin(machine_config &config); + void sbagmani(machine_config &config); }; /*----------- timings -----------*/ diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index 40bef15f176..ad48fe0e81b 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -243,6 +243,8 @@ public: required_device m_screen; required_device m_palette; required_shared_ptr m_generic_paletteram_8; + void shrike(machine_config &config); + void balsente(machine_config &config); }; diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index 285877fd484..a051a93558d 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -48,4 +48,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void bankp(machine_config &config); }; diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h index b6032c7efda..e8e4b41eb16 100644 --- a/src/mame/includes/baraduke.h +++ b/src/mame/includes/baraduke.h @@ -55,4 +55,5 @@ public: void scroll_w(address_space &space, int layer, int offset, int data); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int sprite_priority); void set_scroll(int layer); + void baraduke(machine_config &config); }; diff --git a/src/mame/includes/batman.h b/src/mame/includes/batman.h index b388e97fe38..674074a3559 100644 --- a/src/mame/includes/batman.h +++ b/src/mame/includes/batman.h @@ -36,4 +36,5 @@ public: uint32_t screen_update_batman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); static const atari_motion_objects_config s_mob_config; + void batman(machine_config &config); }; diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index f84c01007df..898a0bf63de 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -51,4 +51,5 @@ public: INTERRUPT_GEN_MEMBER(battlane_cpu1_interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_fg_bitmap( bitmap_ind16 &bitmap ); + void battlane(machine_config &config); }; diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index c684bf3d119..ed9a0fd84ae 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -43,4 +43,5 @@ public: virtual void machine_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void battlera(machine_config &config); }; diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index 1d7da84b4fb..12ba1b8a94c 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -49,4 +49,6 @@ public: DECLARE_VIDEO_START(dodgeman); TILE_GET_INFO_MEMBER(get_dodgeman_bg_tile_info); + void dodgeman(machine_config &config); + void battlex(machine_config &config); }; diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h index 7b6b2f896aa..7b41d0df071 100644 --- a/src/mame/includes/battlnts.h +++ b/src/mame/includes/battlnts.h @@ -41,4 +41,5 @@ public: INTERRUPT_GEN_MEMBER(battlnts_interrupt); K007342_CALLBACK_MEMBER(battlnts_tile_callback); K007420_CALLBACK_MEMBER(battlnts_sprite_callback); + void battlnts(machine_config &config); }; diff --git a/src/mame/includes/bbc.h b/src/mame/includes/bbc.h index 071e731f640..7ca0d652ab6 100644 --- a/src/mame/includes/bbc.h +++ b/src/mame/includes/bbc.h @@ -214,6 +214,30 @@ public: MC6845_UPDATE_ROW(crtc_update_row); + void bbc_eprom_sockets(machine_config &config); + void discmate(machine_config &config); + void reutapm(machine_config &config); + void bbcbp(machine_config &config); + void abc310(machine_config &config); + void bbcmc(machine_config &config); + void bbcmt(machine_config &config); + void bbcm(machine_config &config); + void ltmpm(machine_config &config); + void bbcmet(machine_config &config); + void cfa3000(machine_config &config); + void bbcbp128(machine_config &config); + void pro128s(machine_config &config); + void bbcm512(machine_config &config); + void bbcmarm(machine_config &config); + void abc110(machine_config &config); + void ltmpbp(machine_config &config); + void bbcb_de(machine_config &config); + void bbcb(machine_config &config); + void bbcmaiv(machine_config &config); + void bbca(machine_config &config); + void bbcb_us(machine_config &config); + void econx25(machine_config &config); + void acw443(machine_config &config); private: required_device m_maincpu; required_device m_ram; @@ -452,6 +476,9 @@ class torch240_state : public bbc_state public: using bbc_state::bbc_state; static constexpr feature_type imperfect_features() { return feature::KEYBOARD; } + void torchf(machine_config &config); + void torchh21(machine_config &config); + void torchh10(machine_config &config); }; #endif // MAME_INCLUDES_BBC_H diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index 261d6250005..b750da93f8c 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -73,4 +73,6 @@ public: inline const uint8_t *get_source_ptr(gfx_element *gfx, uint32_t sprite, int dx, int dy, int block); void draw_block(bitmap_ind16 &dest,int x,int y,int size,int flipx,int flipy,uint32_t sprite,int color,int bank,int block); void draw_sprites(bitmap_ind16 &bitmap, const uint16_t *source, int bank, int colval, int colmask); + void bbusters(machine_config &config); + void mechatt(machine_config &config); }; diff --git a/src/mame/includes/beathead.h b/src/mame/includes/beathead.h index 7fe2eae5bd6..e3c36514391 100644 --- a/src/mame/includes/beathead.h +++ b/src/mame/includes/beathead.h @@ -80,4 +80,5 @@ public: DECLARE_READ32_MEMBER( hsync_ram_r ); DECLARE_WRITE32_MEMBER( hsync_ram_w ); TIMER_DEVICE_CALLBACK_MEMBER(scanline_callback); + void beathead(machine_config &config); }; diff --git a/src/mame/includes/bebox.h b/src/mame/includes/bebox.h index 61128f08717..3307f4c48a0 100644 --- a/src/mame/includes/bebox.h +++ b/src/mame/includes/bebox.h @@ -120,6 +120,9 @@ public: void bebox_set_irq_bit(unsigned int interrupt_bit, int val); void bebox_update_interrupts(); + static void mpc105_config(device_t *device); + void bebox(machine_config &config); + void bebox2(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/bfm_ad5.h b/src/mame/includes/bfm_ad5.h index 980cf5eee9c..395d959ea7e 100644 --- a/src/mame/includes/bfm_ad5.h +++ b/src/mame/includes/bfm_ad5.h @@ -12,6 +12,7 @@ public: m_maincpu(*this, "maincpu") { } + void bfm_ad5(machine_config &config); protected: // devices diff --git a/src/mame/includes/bfm_sc4.h b/src/mame/includes/bfm_sc4.h index be08dd9d447..960007c369a 100644 --- a/src/mame/includes/bfm_sc4.h +++ b/src/mame/includes/bfm_sc4.h @@ -622,6 +622,30 @@ public: void find_mbus(uint16_t* rom); + void sc4_common(machine_config &config); + void sc4(machine_config &config); + void sc4_200_4r(machine_config &config); + void sc4_200_4ra(machine_config &config); + void sc4_200_4rb(machine_config &config); + void sc4_200_5r(machine_config &config); + void sc4_200_5ra(machine_config &config); + void sc4_200_5rb(machine_config &config); + void sc4_200_5rc(machine_config &config); + void sc4_200_alt(machine_config &config); + void sc4_200_alta(machine_config &config); + void sc4_200_altb(machine_config &config); + void sc4_200_std(machine_config &config); + void sc4_3reel(machine_config &config); + void sc4_3reel_200(machine_config &config); + void sc4_3reel_200_48(machine_config &config); + void sc4_4reel(machine_config &config); + void sc4_4reel_200(machine_config &config); + void sc4_4reel_alt(machine_config &config); + void sc4_5reel(machine_config &config); + void sc4_5reel_alt(machine_config &config); + void sc4_adder4(machine_config &config); + void sc4_no_reels(machine_config &config); + void sc4dmd(machine_config &config); protected: optional_ioport_array<16> m_io_ports; }; @@ -643,33 +667,10 @@ public: // devices required_device m_adder4cpu; + void sc4_adder4(machine_config &config); }; -MACHINE_CONFIG_EXTERN( sc4 ); -MACHINE_CONFIG_EXTERN( sc4_adder4 ); -MACHINE_CONFIG_EXTERN( sc4dmd ); -MACHINE_CONFIG_EXTERN(sc4_3reel); -MACHINE_CONFIG_EXTERN(sc4_4reel); -MACHINE_CONFIG_EXTERN(sc4_4reel_alt); -MACHINE_CONFIG_EXTERN(sc4_5reel); -MACHINE_CONFIG_EXTERN(sc4_5reel_alt); -MACHINE_CONFIG_EXTERN(sc4_200_std); -MACHINE_CONFIG_EXTERN(sc4_200_alt); -MACHINE_CONFIG_EXTERN(sc4_200_alta); -MACHINE_CONFIG_EXTERN(sc4_200_altb); -MACHINE_CONFIG_EXTERN(sc4_200_5r); -MACHINE_CONFIG_EXTERN(sc4_200_5ra); -MACHINE_CONFIG_EXTERN(sc4_200_5rb); -MACHINE_CONFIG_EXTERN(sc4_200_5rc); -MACHINE_CONFIG_EXTERN(sc4_200_5rc); -MACHINE_CONFIG_EXTERN(sc4_200_4r); -MACHINE_CONFIG_EXTERN(sc4_200_4ra); -MACHINE_CONFIG_EXTERN(sc4_200_4rb); -MACHINE_CONFIG_EXTERN(sc4_4reel_200); -MACHINE_CONFIG_EXTERN(sc4_3reel_200); -MACHINE_CONFIG_EXTERN(sc4_3reel_200_48); -MACHINE_CONFIG_EXTERN(sc4_no_reels); INPUT_PORTS_EXTERN( sc4_base ); diff --git a/src/mame/includes/bfm_sc5.h b/src/mame/includes/bfm_sc5.h index 2d381b078f6..03daa404323 100644 --- a/src/mame/includes/bfm_sc5.h +++ b/src/mame/includes/bfm_sc5.h @@ -11,6 +11,7 @@ public: m_maincpu(*this, "maincpu") { } + void bfm_sc5(machine_config &config); protected: diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index 04b52e6158c..0e11775de3f 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -87,4 +87,5 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void bigevglf(machine_config &config); }; diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index 2c33d7a1f07..1318cdfc86b 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -43,4 +43,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void bigstrkb(machine_config &config); }; diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index 69ed5f2c904..5252cd66f06 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -67,4 +67,5 @@ public: required_device m_palette; required_device m_spritegen; required_device m_soundlatch; + void bionicc(machine_config &config); }; diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h index 8acc704420d..279f1fdaab0 100644 --- a/src/mame/includes/bishi.h +++ b/src/mame/includes/bishi.h @@ -38,6 +38,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(bishi_scanline); K056832_CB_MEMBER(tile_callback); + void bishi(machine_config &config); + void dobouchn(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/bk.h b/src/mame/includes/bk.h index 6ac9b06d105..9d16bbf3b80 100644 --- a/src/mame/includes/bk.h +++ b/src/mame/includes/bk.h @@ -46,6 +46,8 @@ public: IRQ_CALLBACK_MEMBER(bk0010_irq_callback); required_device m_maincpu; required_device m_cassette; + void bk0010(machine_config &config); + void bk0010fd(machine_config &config); }; #endif /* BK_H_ */ diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h index c3483ec7ece..9beb140e197 100644 --- a/src/mame/includes/bking.h +++ b/src/mame/includes/bking.h @@ -93,4 +93,6 @@ public: DECLARE_MACHINE_RESET(common); uint32_t screen_update_bking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_bking); + void bking(machine_config &config); + void bking3(machine_config &config); }; diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index b50a142798b..864f09595e7 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -68,4 +68,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(bladestl_scanline); K007342_CALLBACK_MEMBER(bladestl_tile_callback); K007420_CALLBACK_MEMBER(bladestl_sprite_callback); + void bladestl(machine_config &config); }; diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index a722c75be9f..e101bc7e85a 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -74,4 +74,6 @@ public: required_device m_palette; DECLARE_DRIVER_INIT(blktigerb3); + void blktiger(machine_config &config); + void blktigerbl(machine_config &config); }; diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index 35b672f494b..980953c11b7 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -67,4 +67,6 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); + void watrball(machine_config &config); + void blmbycar(machine_config &config); }; diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h index 5062ef9b1e1..355381d7b14 100644 --- a/src/mame/includes/blockout.h +++ b/src/mame/includes/blockout.h @@ -54,4 +54,6 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(blockout_scanline); void setcolor( int color, int rgb ); void update_pixels( int x, int y ); + void blockout(machine_config &config); + void agress(machine_config &config); }; diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h index 1233b6882f8..6e9eea431f5 100644 --- a/src/mame/includes/bloodbro.h +++ b/src/mame/includes/bloodbro.h @@ -66,4 +66,7 @@ public: void weststry_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_DRIVER_INIT(weststry); + void bloodbro(machine_config &config); + void skysmash(machine_config &config); + void weststry(machine_config &config); }; diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h index 010707d5a94..a0c70eb44f0 100644 --- a/src/mame/includes/blstroid.h +++ b/src/mame/includes/blstroid.h @@ -46,6 +46,7 @@ public: static const atari_motion_objects_config s_mob_config; + void blstroid(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index 4434b9c3b81..1d976189011 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -56,4 +56,6 @@ public: DECLARE_PALETTE_INIT(blueprnt); uint32_t screen_update_blueprnt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void blueprnt(machine_config &config); + void grasspin(machine_config &config); }; diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h index 0df196af73b..57edfa08338 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -65,4 +65,5 @@ public: DECLARE_PALETTE_INIT(bogeyman); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void bogeyman(machine_config &config); }; diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index fb3d2d08fe4..ce251f6f7cd 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -37,6 +37,7 @@ public: TIMER_CALLBACK_MEMBER(soundlatch_callback); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void bombjack(machine_config &config); private: /* memory pointers */ required_shared_ptr m_videoram; diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h index 53e8e089426..7a8aa57acd9 100644 --- a/src/mame/includes/boogwing.h +++ b/src/mame/includes/boogwing.h @@ -70,4 +70,5 @@ public: DECO16IC_BANK_CB_MEMBER(bank_callback); DECO16IC_BANK_CB_MEMBER(bank_callback2); + void boogwing(machine_config &config); }; diff --git a/src/mame/includes/bosco.h b/src/mame/includes/bosco.h index 001abc62e73..d6aeb70c227 100644 --- a/src/mame/includes/bosco.h +++ b/src/mame/includes/bosco.h @@ -43,6 +43,7 @@ public: DECLARE_WRITE8_MEMBER( bosco_scrollx_w ); DECLARE_WRITE8_MEMBER( bosco_scrolly_w ); DECLARE_WRITE8_MEMBER( bosco_starclr_w ); + void bosco(machine_config &config); }; #endif // MAME_INCLUDES_BOSCO_H diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h index 4215e3e8508..924846edcf7 100644 --- a/src/mame/includes/bottom9.h +++ b/src/mame/includes/bottom9.h @@ -61,4 +61,5 @@ public: K051316_CB_MEMBER(zoom_callback); K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); + void bottom9(machine_config &config); }; diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index eda08536e94..cd61da90fdd 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -58,4 +58,6 @@ public: uint32_t screen_update_brkthru(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int prio ); + void brkthru(machine_config &config); + void darwin(machine_config &config); }; diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index 95b0ddf5a96..0195063f153 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -71,6 +71,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void bsktball(machine_config &config); }; /*----------- defined in audio/bsktball.c -----------*/ diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index edc0b14f1d2..27832ba1424 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -131,4 +131,14 @@ public: uint8_t sprite_y_adjust, uint8_t sprite_y_adjust_flip_screen, uint8_t *sprite_ram, offs_t interleave ); + void lnc(machine_config &config); + void disco(machine_config &config); + void mmonkey(machine_config &config); + void bnj(machine_config &config); + void cookrace(machine_config &config); + void wtennis(machine_config &config); + void sdtennis(machine_config &config); + void tisland(machine_config &config); + void zoar(machine_config &config); + void btime(machine_config &config); }; diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h index 7e4f2a55722..89466e26030 100644 --- a/src/mame/includes/btoads.h +++ b/src/mame/includes/btoads.h @@ -66,6 +66,7 @@ public: TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg); TMS340X0_SCANLINE_RGB32_CB_MEMBER(scanline_update); + void btoads(machine_config &config); protected: // device overrides virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index e8473db78ac..9a0b3cca40a 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -131,6 +131,12 @@ public: uint32_t screen_update_bublbobl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void configure_banks(); + void tokio(machine_config &config); + void boblbobl(machine_config &config); + void bublbobl(machine_config &config); + void bublbobl_nomcu(machine_config &config); + void bublboblp(machine_config &config); + void tokiob(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -158,6 +164,7 @@ public: DECLARE_MACHINE_START(bub68705); DECLARE_MACHINE_RESET(bub68705); + void bub68705(machine_config &config); protected: required_device m_mcu; required_ioport_array<4> m_mux_ports; diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index 84a87fb8a85..0edf66fb8b1 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -83,6 +83,7 @@ public: uint32_t screen_update_buggychl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_CUSTOM_INPUT_MEMBER( pedal_in_r ); + void buggychl(machine_config &config); private: void draw_sky( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_bg( bitmap_ind16 &bitmap, const rectangle &cliprect ); diff --git a/src/mame/includes/bullet.h b/src/mame/includes/bullet.h index 63ccb3ec42b..9311ec93036 100644 --- a/src/mame/includes/bullet.h +++ b/src/mame/includes/bullet.h @@ -83,6 +83,7 @@ public: DECLARE_READ8_MEMBER(io_read_byte); DECLARE_WRITE8_MEMBER(io_write_byte); + void bullet(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -159,6 +160,7 @@ public: DECLARE_WRITE_LINE_MEMBER( cstrb_w ); DECLARE_WRITE_LINE_MEMBER( req_w ); + void bulletf(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/busicom.h b/src/mame/includes/busicom.h index 61ffe789048..83d927b657a 100644 --- a/src/mame/includes/busicom.h +++ b/src/mame/includes/busicom.h @@ -45,6 +45,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(timer_callback); uint8_t get_bit_selected(uint32_t val,int num); + void busicom(machine_config &config); private: required_device m_maincpu; required_device m_palette; diff --git a/src/mame/includes/bw12.h b/src/mame/includes/bw12.h index 4448077ed03..2c1fd8b4dda 100644 --- a/src/mame/includes/bw12.h +++ b/src/mame/includes/bw12.h @@ -120,6 +120,10 @@ public: int m_centronics_busy; int m_centronics_fault; int m_centronics_perror; + + void common(machine_config &config); + void bw14(machine_config &config); + void bw12(machine_config &config); }; #endif diff --git a/src/mame/includes/bw2.h b/src/mame/includes/bw2.h index 4266a40667d..d1a5e1918e9 100644 --- a/src/mame/includes/bw2.h +++ b/src/mame/includes/bw2.h @@ -93,6 +93,7 @@ public: DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); int m_centronics_busy; + void bw2(machine_config &config); }; #endif // MAME_INCLUDES_BW2_H diff --git a/src/mame/includes/bwidow.h b/src/mame/includes/bwidow.h index bb4da41900b..c2fd4fffedf 100644 --- a/src/mame/includes/bwidow.h +++ b/src/mame/includes/bwidow.h @@ -29,12 +29,13 @@ public: optional_ioport m_in3; optional_ioport m_in4; optional_ioport m_dsw2; + void spacduel(machine_config &config); + void gravitar(machine_config &config); + void bwidowp(machine_config &config); + void bwidow(machine_config &config); + void lunarbat(machine_config &config); + void bwidow_audio(machine_config &config); + void gravitar_audio(machine_config &config); }; - -/*----------- defined in audio/bwidow.c -----------*/ - -MACHINE_CONFIG_EXTERN( bwidow_audio ); -MACHINE_CONFIG_EXTERN( gravitar_audio ); - #endif /* BWIDOW_H_ */ diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index 5432ef0c883..6b6edadfb84 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -89,4 +89,5 @@ public: void draw_sprites( bitmap_ind16 &bmp, const rectangle &clip, uint8_t *ram, int pri ); INTERRUPT_GEN_MEMBER(bwp3_interrupt); + void bwing(machine_config &config); }; diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h index 4a9bf9ec051..601fcbf3282 100644 --- a/src/mame/includes/bzone.h +++ b/src/mame/includes/bzone.h @@ -42,8 +42,8 @@ public: DECLARE_MACHINE_START(redbaron); INTERRUPT_GEN_MEMBER(bzone_interrupt); DECLARE_WRITE8_MEMBER(bzone_sounds_w); + void bzone_base(machine_config &config); + void redbaron(machine_config &config); + void bzone(machine_config &config); + void bzone_audio(machine_config &config); }; - - -/*----------- defined in audio/bzone.c -----------*/ -MACHINE_CONFIG_EXTERN( bzone_audio ); diff --git a/src/mame/includes/c80.h b/src/mame/includes/c80.h index de52c65a364..b8b90a93486 100644 --- a/src/mame/includes/c80.h +++ b/src/mame/includes/c80.h @@ -51,6 +51,7 @@ public: int m_digit; int m_pio1_a5; int m_pio1_brdy; + void c80(machine_config &config); }; #endif diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index b0ade251a62..178f3740056 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -67,4 +67,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void cabalt(machine_config &config); + void cabalbl2(machine_config &config); + void cabal(machine_config &config); + void cabalbl(machine_config &config); }; diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index 89a860513d5..6492e3e0dc3 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -54,6 +54,10 @@ public: uint32_t screen_update_calomega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_PALETTE_INIT(calomega); + void sys905(machine_config &config); + void s903mod(machine_config &config); + void sys906(machine_config &config); + void sys903(machine_config &config); protected: virtual void video_start() override; diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index 902e6484c4f..06b23f4a748 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -60,6 +60,7 @@ public: required_device m_watchdog; required_device m_gfxdecode; required_device m_palette; + void canyon(machine_config &config); }; diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index 5d856c1a27c..17859b1a67f 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -78,6 +78,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); inline rgb_t pen_for_pixel( uint8_t const *src, uint8_t pix ); + void bowlrama(machine_config &config); + void capbowl(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h index a2442cec6db..1fd7be788aa 100644 --- a/src/mame/includes/carpolo.h +++ b/src/mame/includes/carpolo.h @@ -130,4 +130,5 @@ public: int check_sprite_sprite_collision(int x1, int y1, int code1, int flipy1, int x2, int y2, int code2, int flipy2, int *col_x, int *col_y); + void carpolo(machine_config &config); }; diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index 8f9c2d5fa28..c37849d9c36 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -265,6 +265,26 @@ public: void esprade_unpack_sprites(const char *region); void sailormn_unpack_tiles(const char *region); + void uopoko(machine_config &config); + void sailormn(machine_config &config); + void paceight(machine_config &config); + void pacslot(machine_config &config); + void hotdogst(machine_config &config); + void crusherm(machine_config &config); + void donpachi(machine_config &config); + void tekkencw(machine_config &config); + void korokoro(machine_config &config); + void esprade(machine_config &config); + void mazinger(machine_config &config); + void tjumpman(machine_config &config); + void tekkenbs(machine_config &config); + void gaia(machine_config &config); + void metmqstr(machine_config &config); + void ppsatan(machine_config &config); + void guwange(machine_config &config); + void dfeveron(machine_config &config); + void ddonpach(machine_config &config); + void pwrinst2(machine_config &config); private: inline void get_tile_info( tile_data &tileinfo, int tile_index, int GFX ); inline void tilemap_draw( int chip, screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, uint32_t flags, uint32_t priority, uint32_t priority2, int GFX ); diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index f062fc47fe6..f37de9f0fec 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -58,4 +58,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void cbasebal(machine_config &config); }; diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h index 8930820e097..0e1d78252e1 100644 --- a/src/mame/includes/cbuster.h +++ b/src/mame/includes/cbuster.h @@ -68,4 +68,5 @@ public: DECLARE_WRITE16_MEMBER(cbuster_palette_w); DECLARE_WRITE16_MEMBER(cbuster_palette_ext_w); void update_palette(int offset); + void twocrude(machine_config &config); }; diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index a5d15811c47..f1560b27af7 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -82,4 +82,5 @@ public: inline void ccastles_write_vram( uint16_t addr, uint8_t data, uint8_t bitmd, uint8_t pixba ); inline void bitmode_autoinc( ); inline void schedule_next_irq( int curscanline ); + void ccastles(machine_config &config); }; diff --git a/src/mame/includes/cchasm.h b/src/mame/includes/cchasm.h index a34601cbd05..29ab204210b 100644 --- a/src/mame/includes/cchasm.h +++ b/src/mame/includes/cchasm.h @@ -75,6 +75,7 @@ public: void refresh(); + void cchasm(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index 4e42ad5282a..c19e86c488a 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -112,4 +112,14 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(bagmanf_vblank_irq); + void root(machine_config &config); + void swimmer(machine_config &config); + void guzzler(machine_config &config); + void toprollr(machine_config &config); + void cannonb(machine_config &config); + void yamato(machine_config &config); + void bagmanf(machine_config &config); + void cclimber(machine_config &config); + void cclimberx(machine_config &config); + void ckongb(machine_config &config); }; diff --git a/src/mame/includes/cdi.h b/src/mame/includes/cdi.h index 6b73b21c475..c835a87bcd6 100644 --- a/src/mame/includes/cdi.h +++ b/src/mame/includes/cdi.h @@ -120,6 +120,15 @@ public: uint32_t screen_update_cdimono1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_cdimono1_lcd(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void cdimono1(machine_config &config); + void cdimono2(machine_config &config); + void quizard4(machine_config &config); + void cdimono1_base(machine_config &config); + void cdi910(machine_config &config); + void quizard2(machine_config &config); + void quizard3(machine_config &config); + void quizard1(machine_config &config); + void quizard(machine_config &config); }; /*----------- debug defines -----------*/ diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index 83e4dd745b7..7d6e5fff8be 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -110,4 +110,14 @@ public: void init_common(); void milliped_set_color(offs_t offset, uint8_t data); inline int read_trackball(int idx, int switch_port); + void centiped_base(machine_config &config); + void milliped(machine_config &config); + void bullsdrt(machine_config &config); + void centipdb(machine_config &config); + void magworm(machine_config &config); + void caterplr(machine_config &config); + void centiped(machine_config &config); + void mazeinv(machine_config &config); + void warlords(machine_config &config); + void multiped(machine_config &config); }; diff --git a/src/mame/includes/cgc7900.h b/src/mame/includes/cgc7900.h index b70d38f5751..649fa782a6e 100644 --- a/src/mame/includes/cgc7900.h +++ b/src/mame/includes/cgc7900.h @@ -119,6 +119,8 @@ public: void kbd_put(u8 data); + void cgc7900(machine_config &config); + void cgc7900_video(machine_config &config); private: u16 kbd_mods; u8 kbd_data; @@ -127,8 +129,4 @@ private: void irq_encoder(int pin, int state); }; -/*----------- defined in video/cgc7900.c -----------*/ - -MACHINE_CONFIG_EXTERN( cgc7900_video ); - #endif diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index 35a859c6555..d20244a9586 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -59,4 +59,5 @@ public: void draw_bitmap(bitmap_ind16 &bitmap, const rectangle &cliprect); void mcu_update_seed(uint8_t data); + void chaknpop(machine_config &config); }; diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index 6bb32016d06..be79e52624e 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -80,4 +80,13 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void champbas(machine_config &config); + void champbb2(machine_config &config); + void exctsccr(machine_config &config); + void talbot(machine_config &config); + void tbasebal(machine_config &config); + void champbasjb(machine_config &config); + void champbasj(machine_config &config); + void exctsccrb(machine_config &config); + void champbasja(machine_config &config); }; diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index d7d904bb8d3..ae3ae4c30be 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -86,6 +86,7 @@ public: void draw_river( bitmap_ind16 &bitmap, int sy ); void draw_tree( bitmap_ind16 &bitmap, int sy, int tree_num ); + void changela(machine_config &config); protected: // memory pointers required_shared_ptr m_spriteram; diff --git a/src/mame/includes/channelf.h b/src/mame/includes/channelf.h index d9dc71da016..3897fd84ae1 100644 --- a/src/mame/includes/channelf.h +++ b/src/mame/includes/channelf.h @@ -48,6 +48,11 @@ public: required_device m_custom; required_device m_cart; int recalc_palette_offset(int reg1, int reg2); + void channelf_cart(machine_config &config); + void channelf(machine_config &config); + void sabavpl2(machine_config &config); + void sabavdpl(machine_config &config); + void channlf2(machine_config &config); }; #endif /* CHANNELF_H_ */ diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index 1aeeaec87ab..408e221eabf 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -42,6 +42,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void cheekyms(machine_config &config); protected: virtual void machine_start() override; virtual void video_start() override; diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h index ae70e7afe2b..5f21b1109d1 100644 --- a/src/mame/includes/chqflag.h +++ b/src/mame/includes/chqflag.h @@ -46,6 +46,7 @@ public: K051316_CB_MEMBER(zoom_callback_2); K051960_CB_MEMBER(sprite_callback); uint32_t screen_update_chqflag(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void chqflag(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h index 4c101366e49..e7743662804 100644 --- a/src/mame/includes/cidelsa.h +++ b/src/mame/includes/cidelsa.h @@ -84,6 +84,11 @@ public: std::unique_ptr m_pcbram; std::unique_ptr m_charram; + void destryera(machine_config &config); + void altair(machine_config &config); + void destryer(machine_config &config); + void destryer_video(machine_config &config); + void altair_video(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -115,12 +120,8 @@ public: // sound state int m_sound; int m_psg_latch; + void draco(machine_config &config); + void draco_video(machine_config &config); }; -/*----------- defined in video/cidelsa.c -----------*/ - -MACHINE_CONFIG_EXTERN( destryer_video ); -MACHINE_CONFIG_EXTERN( altair_video ); -MACHINE_CONFIG_EXTERN( draco_video ); - #endif // MAME_INCLUDES_CIDELSA_H diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h index b166638273a..7c63f9a4298 100644 --- a/src/mame/includes/cinemat.h +++ b/src/mame/includes/cinemat.h @@ -158,21 +158,41 @@ public: DECLARE_WRITE_LINE_MEMBER(wotw_sound4_w); DECLARE_WRITE_LINE_MEMBER(demon_sound4_w); DECLARE_WRITE8_MEMBER(qb3_sound_fifo_w); + void cinemat_nojmi_4k(machine_config &config); + void cinemat_jmi_4k(machine_config &config); + void cinemat_nojmi_8k(machine_config &config); + void cinemat_jmi_8k(machine_config &config); + void cinemat_jmi_16k(machine_config &config); + void cinemat_jmi_32k(machine_config &config); + void qb3(machine_config &config); + void ripoff(machine_config &config); + void demon(machine_config &config); + void wotwc(machine_config &config); + void wotw(machine_config &config); + void boxingb(machine_config &config); + void speedfrk(machine_config &config); + void sundance(machine_config &config); + void starcas(machine_config &config); + void spacewar(machine_config &config); + void solarq(machine_config &config); + void tailg(machine_config &config); + void warrior(machine_config &config); + void starhawk(machine_config &config); + void barrier(machine_config &config); + void armora(machine_config &config); + void spacewar_sound(machine_config &config); + void barrier_sound(machine_config &config); + void speedfrk_sound(machine_config &config); + void starhawk_sound(machine_config &config); + void sundance_sound(machine_config &config); + void tailg_sound(machine_config &config); + void warrior_sound(machine_config &config); + void armora_sound(machine_config &config); + void ripoff_sound(machine_config &config); + void starcas_sound(machine_config &config); + void solarq_sound(machine_config &config); + void boxingb_sound(machine_config &config); + void wotw_sound(machine_config &config); + void demon_sound(machine_config &config); + void qb3_sound(machine_config &config); }; - -/*----------- defined in audio/cinemat.c -----------*/ -MACHINE_CONFIG_EXTERN( spacewar_sound ); -MACHINE_CONFIG_EXTERN( barrier_sound ); -MACHINE_CONFIG_EXTERN( speedfrk_sound ); -MACHINE_CONFIG_EXTERN( starhawk_sound ); -MACHINE_CONFIG_EXTERN( sundance_sound ); -MACHINE_CONFIG_EXTERN( tailg_sound ); -MACHINE_CONFIG_EXTERN( warrior_sound ); -MACHINE_CONFIG_EXTERN( armora_sound ); -MACHINE_CONFIG_EXTERN( ripoff_sound ); -MACHINE_CONFIG_EXTERN( starcas_sound ); -MACHINE_CONFIG_EXTERN( solarq_sound ); -MACHINE_CONFIG_EXTERN( boxingb_sound ); -MACHINE_CONFIG_EXTERN( wotw_sound ); -MACHINE_CONFIG_EXTERN( demon_sound ); -MACHINE_CONFIG_EXTERN( qb3_sound ); diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index f7021106d21..de12b3d438d 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -61,6 +61,10 @@ public: void robotbwl_draw_bowling_alley( bitmap_ind16 &bitmap, const rectangle &cliprect ); void robotbwl_draw_ball( bitmap_ind16 &bitmap, const rectangle &cliprect ); void crash_draw_car( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void robotbwl(machine_config &config); + void ripcord(machine_config &config); + void crash(machine_config &config); + void circus(machine_config &config); }; /*----------- defined in audio/circus.c -----------*/ diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index 6e17e3b53bb..2b4cd031295 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -73,4 +73,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void circusc(machine_config &config); }; diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index 2f97c171b83..75fa7d49907 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -157,4 +157,12 @@ public: DECLARE_DRIVER_INIT(captflag); TIMER_DEVICE_CALLBACK_MEMBER(captflag_scanline); + void scudhamm(machine_config &config); + void armchmp2(machine_config &config); + void cischeat(machine_config &config); + void f1gpstr2(machine_config &config); + void f1gpstar(machine_config &config); + void captflag(machine_config &config); + void bigrun(machine_config &config); + void wildplt(machine_config &config); }; diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index 21085ae44ef..7058732e8ba 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -50,4 +50,5 @@ public: uint32_t screen_update_citycon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); inline void changecolor_RRRRGGGGBBBBxxxx( int color, int indx ); + void citycon(machine_config &config); }; diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h index 85e4d9e80a0..fa368e062da 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -59,4 +59,5 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void cloak(machine_config &config); }; diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index 5e34100a4f4..2263f03b94c 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -76,4 +76,5 @@ public: inline void cloud9_write_vram( uint16_t addr, uint8_t data, uint8_t bitmd, uint8_t pixba ); inline void bitmode_autoinc( ); inline void schedule_next_irq(int curscanline); + void cloud9(machine_config &config); }; diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h index e9bccb49791..06690153703 100644 --- a/src/mame/includes/clshroad.h +++ b/src/mame/includes/clshroad.h @@ -55,4 +55,6 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(sound_timer_irq); + void firebatl(machine_config &config); + void clshroad(machine_config &config); }; diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index 2679566d7f5..a5c79489211 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -110,4 +110,11 @@ public: DECLARE_WRITE16_MEMBER( cninja_protection_region_0_104_w ); DECLARE_READ16_MEMBER(cninjabl2_sprite_dma_r); + void cninjabl(machine_config &config); + void edrandy(machine_config &config); + void cninja(machine_config &config); + void robocop2(machine_config &config); + void stoneage(machine_config &config); + void cninjabl2(machine_config &config); + void mutantf(machine_config &config); }; diff --git a/src/mame/includes/coco.h b/src/mame/includes/coco.h index 698e5863d05..f0675dbf99c 100644 --- a/src/mame/includes/coco.h +++ b/src/mame/includes/coco.h @@ -76,10 +76,6 @@ SLOT_INTERFACE_EXTERN( coco_cart ); #define DIECOM_LIGHTGUN_LY_TAG "dclg_ly" #define DIECOM_LIGHTGUN_BUTTONS_TAG "dclg_triggers" -MACHINE_CONFIG_EXTERN( coco_sound ); -MACHINE_CONFIG_EXTERN( coco_floating ); - - //************************************************************************** // TYPE DEFINITIONS @@ -135,6 +131,9 @@ public: static offs_t os9_dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms); offs_t dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms); + void coco_sound(machine_config &config); + void coco_floating(machine_config &config); + protected: // device-level overrides virtual void device_start() override; diff --git a/src/mame/includes/coco12.h b/src/mame/includes/coco12.h index 55e81749a96..e93a8e65981 100644 --- a/src/mame/includes/coco12.h +++ b/src/mame/includes/coco12.h @@ -48,6 +48,13 @@ public: DECLARE_WRITE_LINE_MEMBER( horizontal_sync ); DECLARE_WRITE_LINE_MEMBER( field_sync ); + void coco2b(machine_config &config); + void cd6809(machine_config &config); + void coco2(machine_config &config); + void t4426(machine_config &config); + void cp400(machine_config &config); + void cocoe(machine_config &config); + void coco(machine_config &config); protected: virtual void device_start() override; virtual void update_cart_base(uint8_t *cart_base) override; diff --git a/src/mame/includes/coco3.h b/src/mame/includes/coco3.h index 1f642546940..eb8c5ae86bb 100644 --- a/src/mame/includes/coco3.h +++ b/src/mame/includes/coco3.h @@ -49,6 +49,10 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void coco3p(machine_config &config); + void coco3h(machine_config &config); + void coco3dw1(machine_config &config); + void coco3(machine_config &config); protected: virtual void update_cart_base(uint8_t *cart_base) override; diff --git a/src/mame/includes/coleco.h b/src/mame/includes/coleco.h index 43e9c540669..7c48d7d6046 100644 --- a/src/mame/includes/coleco.h +++ b/src/mame/includes/coleco.h @@ -59,6 +59,10 @@ public: uint8_t coleco_paddle_read(int port, int joy_mode, uint8_t joy_status); uint8_t coleco_scan_paddles(uint8_t *joy_status0, uint8_t *joy_status1); + void colecop(machine_config &config); + void coleco(machine_config &config); + void czz50(machine_config &config); + void dina(machine_config &config); private: required_device m_maincpu; required_device m_cart; diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index fd0a6d54a07..6ec23be4e8c 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -114,4 +114,6 @@ public: uint32_t screen_update_combatscb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, const uint8_t *source, int circuit, bitmap_ind8 &priority_bitmap, uint32_t pri_mask ); void bootleg_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, const uint8_t *source, int circuit ); + void combatscb(machine_config &config); + void combatsc(machine_config &config); }; diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index 95a2e1a009e..fbb96181f61 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -60,4 +60,5 @@ public: required_device m_gfxdecode; required_device m_palette; optional_shared_ptr m_decrypted_opcodes; + void commando(machine_config &config); }; diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index a22e01f05bf..09a63c9fe20 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -52,4 +52,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void compgolf(machine_config &config); }; diff --git a/src/mame/includes/comquest.h b/src/mame/includes/comquest.h index d6762bb6741..97e1b60a662 100644 --- a/src/mame/includes/comquest.h +++ b/src/mame/includes/comquest.h @@ -27,6 +27,7 @@ public: virtual void video_start() override; uint32_t screen_update_comquest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; + void comquest(machine_config &config); }; #endif /* COMQUEST_H_ */ diff --git a/src/mame/includes/comx35.h b/src/mame/includes/comx35.h index dad520607e0..5a620058e39 100644 --- a/src/mame/includes/comx35.h +++ b/src/mame/includes/comx35.h @@ -87,6 +87,11 @@ public: CDP1869_CHAR_RAM_WRITE_MEMBER(comx35_charram_w); CDP1869_PCB_READ_MEMBER(comx35_pcb_r); + void pal(machine_config &config); + void ntsc(machine_config &config); + void comx35_pal_video(machine_config &config); + void comx35_ntsc_video(machine_config &config); + // processor state int m_clear; // CPU mode int m_q; // Q flag @@ -97,9 +102,4 @@ public: int m_cr1; // interrupt enable }; -// ---------- defined in video/comx35.c ---------- - -MACHINE_CONFIG_EXTERN( comx35_pal_video ); -MACHINE_CONFIG_EXTERN( comx35_ntsc_video ); - #endif diff --git a/src/mame/includes/concept.h b/src/mame/includes/concept.h index 8a2ce42fc41..f5bd670d2ac 100644 --- a/src/mame/includes/concept.h +++ b/src/mame/includes/concept.h @@ -66,6 +66,7 @@ public: DECLARE_WRITE_LINE_MEMBER(via_out_cb2); DECLARE_WRITE_LINE_MEMBER(via_irq_func); void concept_set_interrupt(int level, int state); + void concept(machine_config &config); }; #endif // MAME_INCLUDES_CONCEPT_H diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index aa44759ebce..ac1bb79c5f6 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -76,4 +76,5 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void contra(machine_config &config); }; diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h index 4c2f0b95395..3e2f91f2437 100644 --- a/src/mame/includes/coolpool.h +++ b/src/mame/includes/coolpool.h @@ -77,4 +77,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(amerdart_audio_int_gen); void register_state_save(); int amerdart_trackball_direction(int num, int data); + void _9ballsht(machine_config &config); + void coolpool(machine_config &config); + void amerdart(machine_config &config); }; diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index 749c17c92f5..b3172c094e9 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -66,4 +66,6 @@ public: DECLARE_PALETTE_INIT(cop01); uint32_t screen_update_cop01(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void mightguy(machine_config &config); + void cop01(machine_config &config); }; diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index 08e47b223a2..143b754b75b 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -49,7 +49,6 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void copsnrob(machine_config &config); + void copsnrob_audio(machine_config &config); }; - -/*----------- defined in audio/copsnrob.c -----------*/ -MACHINE_CONFIG_EXTERN(copsnrob_audio); diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index 4c9b66d8ed2..2d327fabc84 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -108,4 +108,11 @@ public: pen_t cosmica_map_color(uint8_t x, uint8_t y); pen_t cosmicg_map_color(uint8_t x, uint8_t y); pen_t magspot_map_color(uint8_t x, uint8_t y); + void cosmic(machine_config &config); + void cosmica(machine_config &config); + void cosmicg(machine_config &config); + void nomnlnd(machine_config &config); + void devzone(machine_config &config); + void panic(machine_config &config); + void magspot(machine_config &config); }; diff --git a/src/mame/includes/cosmicos.h b/src/mame/includes/cosmicos.h index ccab84cbc43..7315ded1618 100644 --- a/src/mame/includes/cosmicos.h +++ b/src/mame/includes/cosmicos.h @@ -135,6 +135,7 @@ public: DECLARE_DRIVER_INIT(cosmicos); TIMER_DEVICE_CALLBACK_MEMBER(digit_tick); TIMER_DEVICE_CALLBACK_MEMBER(int_tick); + void cosmicos(machine_config &config); }; #endif // MAME_INCLUDES_COSMICOS_H diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 280f46d309c..ee81999ec7c 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -410,12 +410,34 @@ public: DECLARE_READ16_MEMBER(joy_or_paddle_ecofghtr_r); DECLARE_WRITE_LINE_MEMBER(m5205_int1); DECLARE_WRITE_LINE_MEMBER(m5205_int2); + void cps2(machine_config &config); + void gigaman2(machine_config &config); + void dead_cps2(machine_config &config); + void cawingbl(machine_config &config); + void sf2mdt(machine_config &config); + void sf2m1(machine_config &config); + void kodb(machine_config &config); + void varthb(machine_config &config); + void sgyxz(machine_config &config); + void punipic(machine_config &config); + void dinopic(machine_config &config); + void slampic(machine_config &config); + void sf2b(machine_config &config); + void knightsb(machine_config &config); + void fcrash(machine_config &config); + void sf2m10(machine_config &config); + void sf2m3(machine_config &config); + void forgottn(machine_config &config); + void ganbare(machine_config &config); + void qsound(machine_config &config); + void cps1_12MHz(machine_config &config); + void wofhfh(machine_config &config); + void cps1_10MHz(machine_config &config); + void pang3(machine_config &config); }; /*----------- defined in drivers/cps1.c -----------*/ -MACHINE_CONFIG_EXTERN(cps1_12MHz); - ADDRESS_MAP_EXTERN( qsound_sub_map, 8 ); GFXDECODE_EXTERN( cps1 ); diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h index c29d36441e5..ac737f04d1a 100644 --- a/src/mame/includes/cps3.h +++ b/src/mame/includes/cps3.h @@ -150,4 +150,18 @@ public: unsigned int code, unsigned int color, int flipx, int flipy, int sx, int sy, int transparency, int transparent_color, int scalex, int scaley, bitmap_ind8 *pri_buffer, uint32_t pri_mask); + void cps3(machine_config &config); + void jojo(machine_config &config); + void redearth(machine_config &config); + void sfiii2(machine_config &config); + void sfiii3(machine_config &config); + void sfiii(machine_config &config); + void jojoba(machine_config &config); + void simm1_64mbit(machine_config &config); + void simm2_64mbit(machine_config &config); + void simm3_128mbit(machine_config &config); + void simm4_128mbit(machine_config &config); + void simm5_128mbit(machine_config &config); + void simm5_32mbit(machine_config &config); + void simm6_128mbit(machine_config &config); }; diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h index d7cca7f735d..1945f18f96a 100644 --- a/src/mame/includes/crbaloon.h +++ b/src/mame/includes/crbaloon.h @@ -63,9 +63,6 @@ public: void crbaloon_audio_set_explosion_enable(int enabled); void crbaloon_audio_set_breath_enable(int enabled); void crbaloon_audio_set_appear_enable(int enabled); + void crbaloon(machine_config &config); + void crbaloon_audio(machine_config &config); }; - - -/*----------- defined in audio/crbaloon.c -----------*/ - -MACHINE_CONFIG_EXTERN( crbaloon_audio ); diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h index 0269f343bde..a03f52ccbff 100644 --- a/src/mame/includes/crgolf.h +++ b/src/mame/includes/crgolf.h @@ -79,7 +79,8 @@ public: TIMER_CALLBACK_MEMBER(sound_to_main_callback); void get_pens( pen_t *pens ); DECLARE_WRITE_LINE_MEMBER(vck_callback); + void crgolfhi(machine_config &config); + void crgolf(machine_config &config); + void crgolf_video(machine_config &config); + void mastrglf(machine_config &config); }; - -/*----------- defined in video/crgolf.c -----------*/ -MACHINE_CONFIG_EXTERN( crgolf_video ); diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h index 02092d57f6d..a97b6b74091 100644 --- a/src/mame/includes/crimfght.h +++ b/src/mame/includes/crimfght.h @@ -52,6 +52,7 @@ public: DECLARE_WRITE8_MEMBER(banking_callback); DECLARE_CUSTOM_INPUT_MEMBER(system_r); + void crimfght(machine_config &config); private: int m_woco; int m_rmrd; diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index 0049f726a56..54864e4d718 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -57,4 +57,7 @@ public: virtual void video_start() override; uint32_t screen_update_crospang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void tumblepb_gfx1_rearrange(); + void crospang(machine_config &config); + void bestri(machine_config &config); + void bestria(machine_config &config); }; diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index e4fb7271fad..1f9b81f2d23 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -65,4 +65,5 @@ public: uint32_t screen_update_crshrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_bg( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_fg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void crshrace(machine_config &config); }; diff --git a/src/mame/includes/crvision.h b/src/mame/includes/crvision.h index f1f3043128f..70e34043980 100644 --- a/src/mame/includes/crvision.h +++ b/src/mame/includes/crvision.h @@ -65,6 +65,8 @@ public: DECLARE_READ8_MEMBER( pia_pb_r ); DECLARE_INPUT_CHANGED_MEMBER( trigger_nmi ); + void creativision(machine_config &config); + void ntsc(machine_config &config); protected: virtual void machine_start() override; }; @@ -75,6 +77,7 @@ public: crvision_pal_state(const machine_config &mconfig, device_type type, const char *tag) : crvision_state(mconfig, type, tag) { } + void pal(machine_config &config); }; class laser2001_state : public crvision_state @@ -106,6 +109,7 @@ public: DECLARE_READ_LINE_MEMBER( pia_cb1_r ); DECLARE_WRITE_LINE_MEMBER( pia_cb2_w ); + void lasr2001(machine_config &config); protected: virtual void machine_start() override; }; diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index 3b3939f07c3..254e9adadcb 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -139,4 +139,5 @@ public: void cvs_init_stars( ); void cvs_update_stars(bitmap_ind16 &bitmap, const rectangle &cliprect, const pen_t star_pen, bool update_always); void start_393hz_timer(); + void cvs(machine_config &config); }; diff --git a/src/mame/includes/cxhumax.h b/src/mame/includes/cxhumax.h index 40a5121d0b3..b87cbfe578d 100644 --- a/src/mame/includes/cxhumax.h +++ b/src/mame/includes/cxhumax.h @@ -165,6 +165,7 @@ public: virtual void video_start() override; uint32_t screen_update_cxhumax(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(timer_tick); + void cxhumax(machine_config &config); }; #define INTDEST 0 // Interrupt destination (1=IRQ, 0=FIQ) diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index af85f7cfcda..6ba79e676b8 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -98,6 +98,9 @@ public: static const atari_motion_objects_config s_mob_config; + void cyberbalt(machine_config &config); + void cyberbal2p(machine_config &config); + void cyberbal(machine_config &config); private: void video_start_common(int screens); void cyberbal_sound_reset(); diff --git a/src/mame/includes/cybiko.h b/src/mame/includes/cybiko.h index 0a92fadb658..ffb9b16e84d 100644 --- a/src/mame/includes/cybiko.h +++ b/src/mame/includes/cybiko.h @@ -80,6 +80,9 @@ public: virtual void machine_reset() override; DECLARE_QUICKLOAD_LOAD_MEMBER( cybiko ); DECLARE_QUICKLOAD_LOAD_MEMBER( cybikoxt ); + void cybikoxt(machine_config &config); + void cybikov2(machine_config &config); + void cybikov1(machine_config &config); }; #endif // MAME_INCLUDES_CYBIKO_H diff --git a/src/mame/includes/cybstorm.h b/src/mame/includes/cybstorm.h index 2436989b5b2..e9be1394e00 100755 --- a/src/mame/includes/cybstorm.h +++ b/src/mame/includes/cybstorm.h @@ -48,4 +48,6 @@ public: uint32_t screen_update_cybstorm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); static const atari_motion_objects_config s_mob_config; + void cybstorm(machine_config &config); + void round2(machine_config &config); }; diff --git a/src/mame/includes/dai.h b/src/mame/includes/dai.h index 7b54b084902..656e1736eec 100644 --- a/src/mame/includes/dai.h +++ b/src/mame/includes/dai.h @@ -68,6 +68,7 @@ public: void dai_update_memory(int dai_rom_bank); IRQ_CALLBACK_MEMBER(int_ack); + void dai(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h index 1febec434f7..94d4e0b57b9 100644 --- a/src/mame/includes/darius.h +++ b/src/mame/includes/darius.h @@ -130,4 +130,5 @@ public: void update_psg1( int port ); void update_da( ); DECLARE_WRITE_LINE_MEMBER(darius_adpcm_int); + void darius(machine_config &config); }; diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index 856898ca682..633f06c2cd1 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -69,4 +69,5 @@ public: void decrypt_snd(); TIMER_DEVICE_CALLBACK_MEMBER(scanline); + void darkmist(machine_config &config); }; diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h index a3115354669..8f052307690 100644 --- a/src/mame/includes/darkseal.h +++ b/src/mame/includes/darkseal.h @@ -52,4 +52,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void update_24bitcol(int offset); + void darkseal(machine_config &config); }; diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h index 8c30eaa2efd..5b9e14d6429 100644 --- a/src/mame/includes/dassault.h +++ b/src/mame/includes/dassault.h @@ -71,4 +71,5 @@ public: uint32_t screen_update_dassault(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void mixdassaultlayer(bitmap_rgb32 &bitmap, bitmap_ind16* sprite_bitmap, const rectangle &cliprect, uint16_t pri, uint16_t primask, uint16_t penbase, uint8_t alpha); DECO16IC_BANK_CB_MEMBER(bank_callback); + void dassault(machine_config &config); }; diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index b3076f50093..5156ba19fba 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -77,4 +77,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(dbz_scanline); K056832_CB_MEMBER(tile_callback); K053246_CB_MEMBER(sprite_callback); + void dbz(machine_config &config); }; diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h index 1f755929218..6a954938048 100644 --- a/src/mame/includes/dc.h +++ b/src/mame/includes/dc.h @@ -97,6 +97,8 @@ class dc_state : public driver_device DECLARE_MACHINE_RESET(dc_console); DECLARE_INPUT_CHANGED_MEMBER(mastercpu_cheat_r); + + void naomi_aw_base(machine_config &config); }; /*--------- Ch2-DMA Control Registers ----------*/ diff --git a/src/mame/includes/dccons.h b/src/mame/includes/dccons.h index e8fd00ac0ea..8abf772155c 100644 --- a/src/mame/includes/dccons.h +++ b/src/mame/includes/dccons.h @@ -47,6 +47,8 @@ public: // DECLARE_READ8_MEMBER( dc_flash_r ); // DECLARE_WRITE8_MEMBER( dc_flash_w ); + static void gdrom_config(device_t *device); + void dc(machine_config &config); private: uint64_t PDTRA, PCTRA; emu_timer *atapi_timer; diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index 4d7e25627ce..3fc8e35614f 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -73,6 +73,8 @@ public: void do_clear( ); void do_blit( ); + void fredmem(machine_config &config); + void dcheese(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h index af8da933caf..f372a547396 100644 --- a/src/mame/includes/dcon.h +++ b/src/mame/includes/dcon.h @@ -59,4 +59,6 @@ public: uint32_t screen_update_dcon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_sdgndmps(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect); + void dcon(machine_config &config); + void sdgndmps(machine_config &config); }; diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index e844a732ce1..b755112e31f 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -67,4 +67,5 @@ public: required_device m_screen; required_device m_palette; required_device m_ay1; + void dday(machine_config &config); }; diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index 645043a6ede..9eb8baea7ca 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -126,6 +126,11 @@ public: DECLARE_DRIVER_INIT(ddragon2); DECLARE_DRIVER_INIT(ddragon); DECLARE_DRIVER_INIT(ddragon6809); + void ddragon(machine_config &config); + void ddragon6809(machine_config &config); + void ddragonb(machine_config &config); + void ddragonba(machine_config &config); + void ddragon2(machine_config &config); }; @@ -146,6 +151,7 @@ public: DECLARE_DRIVER_INIT(darktowr); + void darktowr(machine_config &config); protected: required_device m_mcu; @@ -164,4 +170,5 @@ public: DECLARE_WRITE8_MEMBER(toffy_bankswitch_w); DECLARE_DRIVER_INIT(toffy); + void toffy(machine_config &config); }; diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index e7c20062777..c50f62c478f 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -86,6 +86,9 @@ public: int vblank_level; int raster_level; + void ctribe(machine_config &config); + void ddragon3b(machine_config &config); + void ddragon3(machine_config &config); }; @@ -124,4 +127,6 @@ public: DECLARE_VIDEO_START(wwfwfstb); uint32_t screen_update_wwfwfest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void wwfwfest(machine_config &config); + void wwfwfstb(machine_config &config); }; diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index 3f949aa48ad..9204ef4ae64 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -76,4 +76,5 @@ public: INTERRUPT_GEN_MEMBER(ddribble_interrupt_0); INTERRUPT_GEN_MEMBER(ddribble_interrupt_1); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t* source, int lenght, int gfxset, int flipscreen ); + void ddribble(machine_config &config); }; diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index 56102852da5..92baf7b6ad7 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -62,4 +62,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(main_scanline); TIMER_DEVICE_CALLBACK_MEMBER(sub_scanline); + void deadang(machine_config &config); }; diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index 38a29f172b7..ca0622441e4 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -117,6 +117,21 @@ public: void dec0_i8751_write(int data); void dec0_i8751_reset(); void h6280_decrypt(const char *cputag); + void dec0_base(machine_config &config); + void dec0(machine_config &config); + void dec1(machine_config &config); + void midres(machine_config &config); + void birdtry(machine_config &config); + void baddudes(machine_config &config); + void midresbj(machine_config &config); + void slyspy(machine_config &config); + void hbarrel(machine_config &config); + void midresb(machine_config &config); + void ffantasybl(machine_config &config); + void drgninjab(machine_config &config); + void robocop(machine_config &config); + void robocopb(machine_config &config); + void hippodrm(machine_config &config); }; @@ -158,4 +173,6 @@ public: uint32_t screen_update_automat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_secretab(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void secretab(machine_config &config); + void automat(machine_config &config); }; diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index 23bde469f27..1373bf1b4eb 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -172,6 +172,16 @@ public: void srdarwin_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); DECLARE_WRITE_LINE_MEMBER(csilver_adpcm_int); + void shackled(machine_config &config); + void meikyuh(machine_config &config); + void lastmisn(machine_config &config); + void csilver(machine_config &config); + void cobracom(machine_config &config); + void garyoret(machine_config &config); + void srdarwin(machine_config &config); + void ghostb(machine_config &config); + void oscar(machine_config &config); + void gondo(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 3fe8acfa04c..4f0b8551adb 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -136,6 +136,7 @@ public: DECO16IC_BANK_CB_MEMBER(captaven_bank_callback); DECOSPR_PRIORITY_CB_MEMBER(captaven_pri_callback); + void captaven(machine_config &config); private: }; @@ -158,6 +159,9 @@ public: DECO16IC_BANK_CB_MEMBER(fghthist_bank_callback); + void fghthist(machine_config &config); + void fghthistu(machine_config &config); + void fghthsta(machine_config &config); private: }; @@ -188,6 +192,9 @@ public: DECLARE_READ16_MEMBER(port_b_tattass); DECO16IC_BANK_CB_MEMBER(tattass_bank_callback); + void nslasheru(machine_config &config); + void tattass(machine_config &config); + void nslasher(machine_config &config); private: void updateAceRam(); void mixDualAlphaSprites(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, gfx_element *gfx0, gfx_element *gfx1, int mixAlphaTilemap); @@ -264,6 +271,9 @@ public: DECO16IC_BANK_CB_MEMBER(bank_1_callback); DECO16IC_BANK_CB_MEMBER(bank_2_callback); + void dragngun(machine_config &config); + void lockload(machine_config &config); + void lockloadu(machine_config &config); private: bool m_gun_speaker_disabled; }; diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index ccbe15303cd..2f1f6442b3c 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -84,4 +84,8 @@ public: DECLARE_READ16_MEMBER( sh96_protection_region_0_146_r ); DECLARE_WRITE16_MEMBER( sh96_protection_region_0_146_w ); + void mlc(machine_config &config); + void mlc_6bpp(machine_config &config); + void avengrgs(machine_config &config); + void mlc_5bpp(machine_config &config); }; diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h index 99fc4fd61fd..7d1c35134c0 100644 --- a/src/mame/includes/decocass.h +++ b/src/mame/includes/decocass.h @@ -191,6 +191,7 @@ public: DECLARE_READ8_MEMBER(cdsteljn_input_r); DECLARE_WRITE8_MEMBER(cdsteljn_mux_w); TIMER_DEVICE_CALLBACK_MEMBER(decocass_audio_nmi_gen); + void decocass(machine_config &config); private: void draw_edge(bitmap_ind16 &bitmap, const rectangle &cliprect, int which, bool opaque); void draw_special_priority(bitmap_ind16 &bitmap, bitmap_ind8 &priority, const rectangle &cliprect); @@ -234,6 +235,23 @@ public: DECLARE_MACHINE_RESET(cfboy0a1); /* 12 */ DECLARE_MACHINE_RESET(clocknchj); /* 11 */ + void cprogolfj(machine_config &config); + void cfboy0a1(machine_config &config); + void cdsteljn(machine_config &config); + void csuperas(machine_config &config); + void clocknch(machine_config &config); + void cterrani(machine_config &config); + void chwy(machine_config &config); + void ctisland3(machine_config &config); + void cocean1a(machine_config &config); + void cluckypo(machine_config &config); + void cexplore(machine_config &config); + void cmanhat(machine_config &config); + void clocknchj(machine_config &config); + void cprogolf(machine_config &config); + void ctsttape(machine_config &config); + void castfant(machine_config &config); + void ctisland(machine_config &config); protected: virtual void machine_start() override; @@ -298,6 +316,20 @@ public: DECLARE_MACHINE_RESET(cppicf); DECLARE_MACHINE_RESET(cfghtice); + void csdtenis(machine_config &config); + void cburnrub(machine_config &config); + void cppicf(machine_config &config); + void cgraplop2(machine_config &config); + void cfghtice(machine_config &config); + void cpsoccer(machine_config &config); + void cnightst(machine_config &config); + void cprobowl(machine_config &config); + void cskater(machine_config &config); + void cbtime(machine_config &config); + void cgraplop(machine_config &config); + void clapapa(machine_config &config); + void cfishing(machine_config &config); + void czeroize(machine_config &config); protected: virtual void machine_start() override; diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index 81997468938..bc249474765 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -80,4 +80,6 @@ public: required_device m_gfxdecode; required_device m_palette; optional_device m_soundlatch; + void deniam16c(machine_config &config); + void deniam16b(machine_config &config); }; diff --git a/src/mame/includes/dgn_beta.h b/src/mame/includes/dgn_beta.h index cd7cdad4d92..b9a1bff1478 100644 --- a/src/mame/includes/dgn_beta.h +++ b/src/mame/includes/dgn_beta.h @@ -232,6 +232,7 @@ public: offs_t dgnbeta_dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms); + void dgnbeta(machine_config &config); private: void execute_beta_key_dump(int ref, const std::vector ¶ms); void execute_beta_dat_log(int ref, const std::vector ¶ms); diff --git a/src/mame/includes/dgnalpha.h b/src/mame/includes/dgnalpha.h index 128f5e3915b..ea6defa2088 100644 --- a/src/mame/includes/dgnalpha.h +++ b/src/mame/includes/dgnalpha.h @@ -66,6 +66,7 @@ public: DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void dgnalpha(machine_config &config); protected: /* driver overrides */ virtual void device_start(void) override; diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h index 5f5c38fbec2..6a7bd603266 100644 --- a/src/mame/includes/dietgo.h +++ b/src/mame/includes/dietgo.h @@ -48,4 +48,5 @@ public: DECLARE_READ16_MEMBER( dietgo_protection_region_0_104_r ); DECLARE_WRITE16_MEMBER( dietgo_protection_region_0_104_w ); + void dietgo(machine_config &config); }; diff --git a/src/mame/includes/digdug.h b/src/mame/includes/digdug.h index 6328da68541..848f19b211f 100644 --- a/src/mame/includes/digdug.h +++ b/src/mame/includes/digdug.h @@ -30,4 +30,6 @@ public: DECLARE_WRITE8_MEMBER(bg_select_w); DECLARE_WRITE_LINE_MEMBER(tx_color_mode_w); DECLARE_WRITE_LINE_MEMBER(bg_disable_w); + void dzigzag(machine_config &config); + void digdug(machine_config &config); }; diff --git a/src/mame/includes/divebomb.h b/src/mame/includes/divebomb.h index 61b5210296f..5a18807a365 100644 --- a/src/mame/includes/divebomb.h +++ b/src/mame/includes/divebomb.h @@ -88,4 +88,5 @@ public: DECLARE_READ8_MEMBER(rozcpu_comm_r); DECLARE_WRITE8_MEMBER(rozcpu_comm_w); DECLARE_WRITE8_MEMBER(rozcpu_pal_w); + void divebomb(machine_config &config); }; diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index 9768dc8306e..95b7acb5126 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -93,4 +93,5 @@ public: uint32_t screen_update_djboy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_djboy); TIMER_DEVICE_CALLBACK_MEMBER(djboy_scanline); + void djboy(machine_config &config); }; diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h index 5cbd75225ba..34c56084d61 100644 --- a/src/mame/includes/djmain.h +++ b/src/mame/includes/djmain.h @@ -77,4 +77,7 @@ public: required_device m_palette; K056832_CB_MEMBER(tile_callback); optional_ioport_array<2> m_turntable; + void djmainj(machine_config &config); + void djmainu(machine_config &config); + void djmaina(machine_config &config); }; diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 8b4a32702ad..d47b547d56f 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -285,6 +285,26 @@ public: DECLARE_WRITE8_MEMBER(memory_write_byte); double CD4049(double x); + void dkong_base(machine_config &config); + void braze(machine_config &config); + void strtheat(machine_config &config); + void spclforc(machine_config &config); + void s2650(machine_config &config); + void dkongjr(machine_config &config); + void radarscp1(machine_config &config); + void drktnjr(machine_config &config); + void dkong2b(machine_config &config); + void drakton(machine_config &config); + void radarscp(machine_config &config); + void pestplce(machine_config &config); + void herbiedk(machine_config &config); + void dkong3(machine_config &config); + void dkong3b(machine_config &config); + void radarscp_audio(machine_config &config); + void dkong2b_audio(machine_config &config); + void dkongjr_audio(machine_config &config); + void dkong3_audio(machine_config &config); + void radarscp1_audio(machine_config &config); private: // video/dkong.c void radarscp_step(int line_cnt); @@ -294,11 +314,3 @@ private: void radarscp_draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect); }; - -/*----------- defined in audio/dkong.c -----------*/ - -MACHINE_CONFIG_EXTERN( radarscp_audio ); -MACHINE_CONFIG_EXTERN( dkong2b_audio ); -MACHINE_CONFIG_EXTERN( dkongjr_audio ); -MACHINE_CONFIG_EXTERN( dkong3_audio ); -MACHINE_CONFIG_EXTERN( radarscp1_audio ); diff --git a/src/mame/includes/dm7000.h b/src/mame/includes/dm7000.h index 8b2b52b588d..6f2ab26ed00 100644 --- a/src/mame/includes/dm7000.h +++ b/src/mame/includes/dm7000.h @@ -55,6 +55,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_dm7000(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void dm7000(machine_config &config); }; /* */ diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index eade0a610ec..e88af30d9ec 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -78,4 +78,7 @@ public: void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(docastle_tint); DECLARE_WRITE_LINE_MEMBER(idsoccer_adpcm_int); + void dorunrun(machine_config &config); + void idsoccer(machine_config &config); + void docastle(machine_config &config); }; diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index 5556dfa1115..9e3fd850250 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -65,4 +65,5 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void dogfgt(machine_config &config); }; diff --git a/src/mame/includes/dragon.h b/src/mame/includes/dragon.h index 77fe00b8c93..6c6afe2b99c 100644 --- a/src/mame/includes/dragon.h +++ b/src/mame/includes/dragon.h @@ -42,6 +42,8 @@ public: { } + void dragon_base(machine_config &config); + void dragon32(machine_config &config); protected: virtual void pia1_pa_changed(uint8_t data) override; @@ -60,6 +62,8 @@ public: { } + void tanodr64(machine_config &config); + void dragon64(machine_config &config); protected: virtual DECLARE_READ8_MEMBER( ff00_read ) override; virtual DECLARE_WRITE8_MEMBER( ff00_write ) override; @@ -84,6 +88,7 @@ public: MC6847_GET_CHARROM_MEMBER(char_rom_r); + void dragon200e(machine_config &config); private: required_memory_region m_char_rom; }; @@ -107,6 +112,7 @@ public: DECLARE_WRITE8_MEMBER(d64plus_bank_w); MC6845_UPDATE_ROW(crtc_update_row); + void d64plus(machine_config &config); protected: virtual void device_start() override; virtual void device_reset() override; diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index 10b990e3f5c..3f1c3a3d198 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -74,6 +74,7 @@ public: uint32_t screen_update_dragrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(dragrace_frame_callback); void dragrace_update_misc_flags( address_space &space ); + void dragrace(machine_config &config); }; /*----------- defined in audio/dragrace.c -----------*/ diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index b65e29b8c5a..f089e617af8 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -78,4 +78,5 @@ public: required_device m_audiocpu; required_device m_gfxdecode; required_device m_palette; + void drgnmst(machine_config &config); }; diff --git a/src/mame/includes/dribling.h b/src/mame/includes/dribling.h index 613889c8bd6..34d7bcd716f 100644 --- a/src/mame/includes/dribling.h +++ b/src/mame/includes/dribling.h @@ -52,4 +52,5 @@ public: DECLARE_PALETTE_INIT(dribling); uint32_t screen_update_dribling(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(dribling_irq_gen); + void dribling(machine_config &config); }; diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index 33c0cba6522..ef11b197224 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -46,4 +46,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void drmicro(machine_config &config); }; diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index ec59be1f775..b90cc04ccac 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -304,4 +304,25 @@ public: void tenkai_update_irq(); void jantouki_sound_update_irq(); void tenkai_show_6c(); + void mjfriday(machine_config &config); + void yarunara(machine_config &config); + void janyuki(machine_config &config); + void hnoridur(machine_config &config); + void gekisha(machine_config &config); + void majrjhdx(machine_config &config); + void mcnpshnt(machine_config &config); + void nanajign(machine_config &config); + void cdracula(machine_config &config); + void tenkai(machine_config &config); + void hjingi(machine_config &config); + void mjreach(machine_config &config); + void neruton(machine_config &config); + void mjdialq2(machine_config &config); + void jantouki(machine_config &config); + void quiztvqq(machine_config &config); + void mjelctrn(machine_config &config); + void mjembase(machine_config &config); + void mjangels(machine_config &config); + void hanamai(machine_config &config); + void sprtmtch(machine_config &config); }; diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h index d3558a73388..bbd15cfea03 100644 --- a/src/mame/includes/dynduke.h +++ b/src/mame/includes/dynduke.h @@ -58,4 +58,6 @@ public: void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); INTERRUPT_GEN_MEMBER(interrupt); + void dynduke(machine_config &config); + void dbldyn(machine_config &config); }; diff --git a/src/mame/includes/electron.h b/src/mame/includes/electron.h index 539ac4119de..589e79d1554 100644 --- a/src/mame/includes/electron.h +++ b/src/mame/includes/electron.h @@ -114,6 +114,8 @@ public: void electron_interrupt_handler(int mode, int interrupt); DECLARE_INPUT_CHANGED_MEMBER( trigger_reset ); + void electron(machine_config &config); + void btm2105(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/elf.h b/src/mame/includes/elf.h index 1f737576319..0bb07f044b8 100644 --- a/src/mame/includes/elf.h +++ b/src/mame/includes/elf.h @@ -64,6 +64,7 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER( elf ); // display state uint8_t m_data; + void elf2(machine_config &config); }; #endif diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h index 1df41ff5d4f..bd17c893d82 100644 --- a/src/mame/includes/eolith.h +++ b/src/mame/includes/eolith.h @@ -56,6 +56,9 @@ public: uint32_t screen_update_eolith(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void ironfort(machine_config &config); + void eolith50(machine_config &config); + void eolith45(machine_config &config); protected: // shared with eolith16.cpp, vegaeo.cpp optional_ioport m_eepromoutport; diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h index 08af6fe3d1a..168f8f0eacf 100644 --- a/src/mame/includes/epos.h +++ b/src/mame/includes/epos.h @@ -44,4 +44,6 @@ public: void set_pal_color( uint8_t offset, uint8_t data ); required_device m_maincpu; required_device m_palette; + void epos(machine_config &config); + void dealer(machine_config &config); }; diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h index 081fd76cc59..fda070ef40f 100644 --- a/src/mame/includes/eprom.h +++ b/src/mame/includes/eprom.h @@ -54,4 +54,7 @@ public: required_device m_palette; static const atari_motion_objects_config s_mob_config; static const atari_motion_objects_config s_guts_mob_config; + void guts(machine_config &config); + void eprom(machine_config &config); + void klaxp(machine_config &config); }; diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index adf6878d140..9ae7273d876 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -134,4 +134,9 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void common_sound(machine_config &config); + void equites(machine_config &config); + void splndrbt(machine_config &config); + void gekisou(machine_config &config); + void hvoltage(machine_config &config); }; diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index 20751539fb7..2e6e19331d4 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -76,4 +76,10 @@ public: virtual void video_start() override; uint32_t screen_update_hedpanic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECOSPR_PRIORITY_CB_MEMBER(hedpanic_pri_callback); + void jumppop(machine_config &config); + void esd16(machine_config &config); + void tangtang(machine_config &config); + void mchampdx(machine_config &config); + void hedpanio(machine_config &config); + void hedpanic(machine_config &config); }; diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index 3b031f0920c..b59ca09a988 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -70,4 +70,6 @@ public: INTERRUPT_GEN_MEMBER(espial_sound_nmi_gen); TIMER_DEVICE_CALLBACK_MEMBER(espial_scanline); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void espial(machine_config &config); + void netwars(machine_config &config); }; diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h index 7730ea20306..a9a261c260c 100644 --- a/src/mame/includes/esripsys.h +++ b/src/mame/includes/esripsys.h @@ -126,6 +126,7 @@ public: required_device m_dac; required_device m_screen; ESRIP_DRAW(esripsys_draw); + void esripsys(machine_config &config); }; #endif // _ESRIPSYS_H_ diff --git a/src/mame/includes/eti660.h b/src/mame/includes/eti660.h index 034f75879e3..c760399ec51 100644 --- a/src/mame/includes/eti660.h +++ b/src/mame/includes/eti660.h @@ -54,6 +54,7 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER( eti660 ); required_shared_ptr m_p_videoram; + void eti660(machine_config &config); private: required_device m_maincpu; required_device m_cti; diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index 558ae79562d..879c7dddb15 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -60,4 +60,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void exedexes(machine_config &config); }; diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index 0973895ad93..c96ad806ccf 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -74,4 +74,5 @@ public: DECLARE_PALETTE_INIT(exerion); uint32_t screen_update_exerion(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_background( bitmap_ind16 &bitmap, const rectangle &cliprect); + void exerion(machine_config &config); }; diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index a3a872b862f..90db0aa04ec 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -126,6 +126,20 @@ public: SAMPLES_START_CB_MEMBER(spectar_audio_start); SAMPLES_START_CB_MEMBER(targ_audio_start); + void base(machine_config &config); + void mtrap(machine_config &config); + void mtrap_cvsd_audio(machine_config &config); + void venture(machine_config &config); + void venture_audio(machine_config &config); + void fax(machine_config &config); + void teetert(machine_config &config); + void sidetrac(machine_config &config); + void spectar(machine_config &config); + void spectar_audio(machine_config &config); + void rallys(machine_config &config); + void pepper2(machine_config &config); + void targ(machine_config &config); + void targ_audio(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h index 19b27b622f5..cc812d32b80 100644 --- a/src/mame/includes/exidy440.h +++ b/src/mame/includes/exidy440.h @@ -91,9 +91,9 @@ public: TIMER_CALLBACK_MEMBER(collide_firq_callback); void exidy440_update_firq(); void exidy440_bank_select(uint8_t bank); + void exidy440(machine_config &config); + void exidy440_video(machine_config &config); + void exidy440_audio(machine_config &config); + void topsecex(machine_config &config); + void topsecex_video(machine_config &config); }; - -/*----------- defined in video/exidy440.c -----------*/ - -MACHINE_CONFIG_EXTERN( exidy440_video ); -MACHINE_CONFIG_EXTERN( topsecex_video ); diff --git a/src/mame/includes/exp85.h b/src/mame/includes/exp85.h index f725df7f942..5a6767b4d78 100644 --- a/src/mame/includes/exp85.h +++ b/src/mame/includes/exp85.h @@ -42,6 +42,7 @@ public: /* cassette state */ int m_tape_control; + void exp85(machine_config &config); }; #endif // MAME_INCLUDES_EXP85_H diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index 33f497ac791..7bf8e1bd7bf 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -73,4 +73,6 @@ public: uint32_t screen_update_exprraid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void exprraid_gfx_expand(); + void exprraid(machine_config &config); + void exprboot(machine_config &config); }; diff --git a/src/mame/includes/exterm.h b/src/mame/includes/exterm.h index 9395b6e1c43..1735b479a85 100644 --- a/src/mame/includes/exterm.h +++ b/src/mame/includes/exterm.h @@ -57,4 +57,5 @@ public: TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg_slave); TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg_slave); uint16_t exterm_trackball_port_r(int which, uint16_t mem_mask); + void exterm(machine_config &config); }; diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h index 0f4841c23b7..472a41eb5a9 100644 --- a/src/mame/includes/exzisus.h +++ b/src/mame/includes/exzisus.h @@ -34,4 +34,5 @@ public: virtual void machine_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void exzisus(machine_config &config); }; diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index 479c0197110..3cb10178e52 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -101,4 +101,7 @@ public: uint32_t screen_update_f1gpb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_f1gp2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void f1gpb_draw_sprites( screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect ); + void f1gp2(machine_config &config); + void f1gpb(machine_config &config); + void f1gp(machine_config &config); }; diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index 64c308e94e8..db6d9c87fbe 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -79,4 +79,8 @@ public: void borntofi_adpcm_start( msm5205_device *device, int voice ); void borntofi_adpcm_stop( msm5205_device *device, int voice ); void borntofi_adpcm_int( msm5205_device *device, int voice ); + void fantland(machine_config &config); + void wheelrun(machine_config &config); + void borntofi(machine_config &config); + void galaxygn(machine_config &config); }; diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h index caea0089c12..cb92a7aa24d 100644 --- a/src/mame/includes/fastfred.h +++ b/src/mame/includes/fastfred.h @@ -91,4 +91,7 @@ public: uint32_t screen_update_fastfred(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_imago(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void jumpcoas(machine_config &config); + void imago(machine_config &config); + void fastfred(machine_config &config); }; diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index 71116e2f1b4..b619ef551b1 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -68,4 +68,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(fastlane_scanline); DECLARE_WRITE8_MEMBER(volume_callback0); DECLARE_WRITE8_MEMBER(volume_callback1); + void fastlane(machine_config &config); }; diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index b5561e7ace1..7c927d0bfa9 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -75,4 +75,5 @@ public: virtual void video_start() override; DECLARE_PALETTE_INIT(fcombat); uint32_t screen_update_fcombat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void fcombat(machine_config &config); }; diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index 9001237de66..af8e7f4c84e 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -73,6 +73,7 @@ public: int intensity(int bits); unsigned video_ram_address( ); + void fgoal(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index cb62abcba77..83f0470fe6b 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -68,4 +68,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_finalizr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(finalizr_scanline); + void finalizr(machine_config &config); }; diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index aca09ab65bb..99f291785ac 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -92,4 +92,6 @@ public: inline void get_bg_tile_info(tile_data &tileinfo, int tile_index, uint8_t *bgvideoram, int gfx_region); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(firetrap_adpcm_int); + void firetrapbl(machine_config &config); + void firetrap(machine_config &config); }; diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index 6f6c88cb7a9..eb7e2e5cbfd 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -151,6 +151,9 @@ public: void check_collision(int which); void set_service_mode(int enable); void draw_text(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t *alpha_ram, int x, int count, int height); + void firetrk(machine_config &config); + void montecar(machine_config &config); + void superbug(machine_config &config); }; diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index 827d90b3072..edaf25c2010 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -71,4 +71,6 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void bbprot(machine_config &config); + void fitfight(machine_config &config); }; diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index db23afff746..c2397e376ac 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -60,4 +60,5 @@ public: uint32_t screen_update_flkatck(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(flkatck_interrupt); DECLARE_WRITE8_MEMBER(volume_callback); + void flkatck(machine_config &config); }; diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index 36545251621..aaf81abb812 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -99,4 +99,9 @@ public: uint32_t screen_update_rumba(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void flstory_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); void victnine_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void flstory(machine_config &config); + void rumba(machine_config &config); + void onna34ro(machine_config &config); + void victnine(machine_config &config); + void onna34ro_mcu(machine_config &config); }; diff --git a/src/mame/includes/fm7.h b/src/mame/includes/fm7.h index 4d0a7315cdd..d43860b5ba9 100644 --- a/src/mame/includes/fm7.h +++ b/src/mame/includes/fm7.h @@ -281,6 +281,11 @@ public: uint32_t screen_update_fm7(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void fm16beta(machine_config &config); + void fm8(machine_config &config); + void fm7(machine_config &config); + void fm77av(machine_config &config); + void fm11(machine_config &config); protected: optional_shared_ptr m_shared_ram; optional_shared_ptr m_boot_ram; diff --git a/src/mame/includes/fmtowns.h b/src/mame/includes/fmtowns.h index 65f442bb3a1..f610d10a600 100644 --- a/src/mame/includes/fmtowns.h +++ b/src/mame/includes/fmtowns.h @@ -338,6 +338,11 @@ class towns_state : public driver_device required_memory_region m_user; optional_memory_region m_serial; + void towns_base(machine_config &config); + void towns(machine_config &config); + void townsftv(machine_config &config); + void townshr(machine_config &config); + void townssj(machine_config &config); private: static const device_timer_id TIMER_RTC = 0; static const device_timer_id TIMER_FREERUN = 1; @@ -404,6 +409,7 @@ class towns16_state : public towns_state towns16_state(const machine_config &mconfig, device_type type, const char *tag) : towns_state(mconfig, type, tag) { } + void townsux(machine_config &config); }; class marty_state : public towns_state @@ -414,6 +420,7 @@ class marty_state : public towns_state { } virtual void driver_start() override; + void marty(machine_config &config); }; #endif // MAME_INCLUDES_FMTOWNS_H diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h index 8507ce5d069..f0f8f5e8972 100644 --- a/src/mame/includes/foodf.h +++ b/src/mame/includes/foodf.h @@ -43,4 +43,5 @@ public: DECLARE_VIDEO_START(foodf); uint32_t screen_update_foodf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(scanline_update_timer); + void foodf(machine_config &config); }; diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index 418e16d5afd..dcb56cb226b 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -70,4 +70,12 @@ public: required_device m_gfxdecode; required_device m_palette; optional_memory_bank m_bank1, m_bank1d; + void base(machine_config &config); + void oigas(machine_config &config); + void pbillrd(machine_config &config); + void gigas(machine_config &config); + void gigasm(machine_config &config); + void pbillrdm(machine_config &config); + void omega(machine_config &config); + void freekick(machine_config &config); }; diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index 6d6b29bee27..75a8dc0b853 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -121,4 +121,7 @@ public: inline void fromancr_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask, int layer ); void fromancr_gfxbank_w( int data ); inline void fromanc4_vram_w( offs_t offset, uint16_t data, uint16_t mem_mask, int layer ); + void fromanc2(machine_config &config); + void fromancr(machine_config &config); + void fromanc4(machine_config &config); }; diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 61aac7f2198..054f915ffb1 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -103,4 +103,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void nekkyoku(machine_config &config); + void fromance(machine_config &config); + void idolmj(machine_config &config); }; diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index c3d3388d47b..4e8dbec448c 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -43,4 +43,5 @@ public: required_device m_watchdog; required_device m_gfxdecode; required_device m_palette; + void funkybee(machine_config &config); }; diff --git a/src/mame/includes/funkyjet.h b/src/mame/includes/funkyjet.h index 002cf05de61..272b75b6d89 100644 --- a/src/mame/includes/funkyjet.h +++ b/src/mame/includes/funkyjet.h @@ -43,4 +43,5 @@ public: DECLARE_READ16_MEMBER( funkyjet_protection_region_0_146_r ); DECLARE_WRITE16_MEMBER( funkyjet_protection_region_0_146_w ); + void funkyjet(machine_config &config); }; diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index 301b1eedeee..69144b23512 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -47,4 +47,18 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void royalcd1(machine_config &config); + void royalcd2(machine_config &config); + void fw1stpal(machine_config &config); + void chinatow(machine_config &config); + void magicrd2(machine_config &config); + void fw_a7_11(machine_config &config); + void lunapark(machine_config &config); + void fw2ndpal(machine_config &config); + void saloon(machine_config &config); + void cuoreuno(machine_config &config); + void funquiz(machine_config &config); + void rcdino4(machine_config &config); + void intrgmes(machine_config &config); + void witchryl(machine_config &config); }; diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h index 09bf23d0cc1..82b6ea475b5 100644 --- a/src/mame/includes/funybubl.h +++ b/src/mame/includes/funybubl.h @@ -39,4 +39,5 @@ public: virtual void video_start() override; uint32_t screen_update_funybubl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void funybubl(machine_config &config); }; diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index 0b26bd13862..92bac10a3c2 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -79,6 +79,7 @@ public: inline void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask, int _N_); void draw_layer( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int i, int flag, int pri ); + void fuuki16(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 7d4654e69ac..72265195bbd 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -88,6 +88,7 @@ public: inline void vram_w(offs_t offset, uint32_t data, uint32_t mem_mask, int _N_); void draw_layer( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int i, int flag, int pri ); + void fuuki32(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index 3093f7a2cc0..70e8c25a45d 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -60,4 +60,8 @@ public: uint32_t screen_update_bigkarnk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_maniacsq(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); + void bigkarnk(machine_config &config); + void thoop(machine_config &config); + void maniacsq(machine_config &config); + void squash(machine_config &config); }; diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index 579da5fdaa7..f94b0face8b 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -53,6 +53,14 @@ public: uint32_t dual_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int index); void gaelco2_ROM16_split_gfx(const char *src_reg, const char *dst_reg, int start, int length, int dest1, int dest2); + void maniacsq_d5002fp(machine_config &config); + void play2000(machine_config &config); + void alighunt(machine_config &config); + void touchgo(machine_config &config); + void alighunt_d5002fp(machine_config &config); + void snowboar(machine_config &config); + void maniacsq(machine_config &config); + void touchgo_d5002fp(machine_config &config); protected: required_device m_maincpu; @@ -100,6 +108,7 @@ public: DECLARE_WRITE16_MEMBER(bang_clr_gun_int_w); TIMER_DEVICE_CALLBACK_MEMBER(bang_irq); DECLARE_DRIVER_INIT(bang); + void bang(machine_config &config); }; @@ -120,4 +129,5 @@ public: DECLARE_WRITE_LINE_MEMBER(wrally2_adc_clk); DECLARE_WRITE_LINE_MEMBER(wrally2_adc_cs); DECLARE_CUSTOM_INPUT_MEMBER(wrally2_analog_bit_r); + void wrally2(machine_config &config); }; diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index 472bff096f3..29db087c8f6 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -150,4 +150,7 @@ public: DECLARE_WRITE32_MEMBER(adsp_tx_callback); DECLARE_WRITE_LINE_MEMBER(fp_analog_clock_w); DECLARE_CUSTOM_INPUT_MEMBER(fp_analog_bit_r); + void footbpow(machine_config &config); + void gaelco3d2(machine_config &config); + void gaelco3d(machine_config &config); }; diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 2a49714bcdc..1dbfad372e2 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -127,4 +127,8 @@ public: void drgnbowl_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void descramble_drgnbowl(int descramble_cpu); void descramble_mastninj_gfx(uint8_t* src); + void raiga(machine_config &config); + void drgnbowl(machine_config &config); + void mastninj(machine_config &config); + void shadoww(machine_config &config); }; diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index 08ab5165c43..94f662c8e41 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -94,6 +94,9 @@ public: }; static struct star m_star_seed_tab[]; + void galaga(machine_config &config); + void gatsbee(machine_config &config); + void galagab(machine_config &config); }; DISCRETE_SOUND_EXTERN( galaga ); diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index d0320986d64..0b04bdb72c0 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -104,6 +104,7 @@ public: void draw_sprites_pre(int x_offs, int y_offs); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, const int *primasks, int priority); + void galastrm(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/galaxia.h b/src/mame/includes/galaxia.h index d5491c35547..ec977234f6b 100644 --- a/src/mame/includes/galaxia.h +++ b/src/mame/includes/galaxia.h @@ -33,4 +33,6 @@ public: uint32_t screen_update_astrowar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(galaxia_interrupt); void init_common(); + void astrowar(machine_config &config); + void galaxia(machine_config &config); }; diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index 4d40fc75a04..9f498f4fc05 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -330,5 +330,49 @@ public: void decode_victoryc(); void mshuttle_decode(const uint8_t convtable[8][16]); void common_init(galaxian_draw_bullet_func draw_bullet,galaxian_draw_background_func draw_background, - galaxian_extend_tile_info_func extend_tile_info,galaxian_extend_sprite_info_func extend_sprite_info); + galaxian_extend_tile_info_func extend_tile_info,galaxian_extend_sprite_info_func extend_sprite_info); + void galaxian_base(machine_config &config); + void konami_base(machine_config &config); + void konami_sound_1x_ay8910(machine_config &config); + void konami_sound_2x_ay8910(machine_config &config); + void scramble_base(machine_config &config); + void timefgtr(machine_config &config); + void moonqsr(machine_config &config); + void frogger(machine_config &config); + void anteatergg(machine_config &config); + void theend(machine_config &config); + void turtles(machine_config &config); + void fantastc(machine_config &config); + void jumpbug(machine_config &config); + void checkmaj(machine_config &config); + void pacmanbl(machine_config &config); + void quaak(machine_config &config); + void galaxian(machine_config &config); + void gmgalax(machine_config &config); + void tenspot(machine_config &config); + void froggers(machine_config &config); + void mshuttle(machine_config &config); + void anteateruk(machine_config &config); + void monsterz(machine_config &config); + void kingball(machine_config &config); + void anteaterg(machine_config &config); + void anteater(machine_config &config); + void moonwar(machine_config &config); + void turpins(machine_config &config); + void explorer(machine_config &config); + void scramble(machine_config &config); + void scobra(machine_config &config); + void froggermc(machine_config &config); + void froggeram(machine_config &config); + void spactrai(machine_config &config); + void takeoff(machine_config &config); + void sfx(machine_config &config); + void mooncrst(machine_config &config); + void scorpion(machine_config &config); + void frogf(machine_config &config); + void amigo2(machine_config &config); + void zigzag(machine_config &config); + void checkman(machine_config &config); + void galaxian_audio(machine_config &config); + void mooncrst_audio(machine_config &config); }; diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 7e9eee4ac5d..b2bdddfe0fb 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -267,6 +267,33 @@ public: void bagmanmc_modify_charcode(uint16_t *code, uint8_t x); void bagmanmc_modify_spritecode(uint8_t *spriteram, int *code, int *flipx, int *flipy, int offs); void machine_reset_common(int line); + void galaxian(machine_config &config); + void galaxold_base(machine_config &config); + void ckongg(machine_config &config); + void _4in1(machine_config &config); + void bongo(machine_config &config); + void racknrol(machine_config &config); + void hunchbkg(machine_config &config); + void videotron(machine_config &config); + void hexpoola(machine_config &config); + void dkongjrm(machine_config &config); + void tazzmang(machine_config &config); + void scrambler(machine_config &config); + void spcwarp(machine_config &config); + void dkongjrmc(machine_config &config); + void bagmanmc(machine_config &config); + void bullsdrtg(machine_config &config); + void drivfrcg(machine_config &config); + void rockclim(machine_config &config); + void scramblb(machine_config &config); + void porter(machine_config &config); + void scramb2(machine_config &config); + void ozon1(machine_config &config); + void mooncrst(machine_config &config); + void guttang(machine_config &config); + void ckongmc(machine_config &config); + void galaxian_audio(machine_config &config); + void mooncrst_audio(machine_config &config); }; #define galaxold_coin_counter_0_w galaxold_coin_counter_w diff --git a/src/mame/includes/galaxy.h b/src/mame/includes/galaxy.h index 74da9f9b5d0..7433c744df0 100644 --- a/src/mame/includes/galaxy.h +++ b/src/mame/includes/galaxy.h @@ -47,6 +47,8 @@ public: void galaxy_setup_snapshot (const uint8_t * data, uint32_t size); required_device m_maincpu; DECLARE_SNAPSHOT_LOAD_MEMBER( galaxy ); + void galaxy(machine_config &config); + void galaxyp(machine_config &config); protected: required_device m_cassette; required_device m_ram; diff --git a/src/mame/includes/galeb.h b/src/mame/includes/galeb.h index 5d685e071c7..7341af9e157 100644 --- a/src/mame/includes/galeb.h +++ b/src/mame/includes/galeb.h @@ -40,6 +40,7 @@ public: required_ioport_array<8> m_keyboard; required_device m_dac; + void galeb(machine_config &config); protected: virtual void machine_start() override; diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index 4b50ee2de93..8eb551412b4 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -73,4 +73,7 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_soundlatch; + void galivan(machine_config &config); + void ninjemak(machine_config &config); + void youmab(machine_config &config); }; diff --git a/src/mame/includes/galpani2.h b/src/mame/includes/galpani2.h index e63a40ed02e..a7e123e3229 100644 --- a/src/mame/includes/galpani2.h +++ b/src/mame/includes/galpani2.h @@ -71,4 +71,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(galpani2_interrupt2); void galpani2_mcu_nmi1(); void galpani2_mcu_nmi2(); + void galpani2(machine_config &config); }; diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h index 04e10692fe9..2f7169b3817 100644 --- a/src/mame/includes/galpanic.h +++ b/src/mame/includes/galpanic.h @@ -41,4 +41,6 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank); TIMER_DEVICE_CALLBACK_MEMBER(scanline); void draw_fgbitmap(bitmap_ind16 &bitmap, const rectangle &cliprect); + void galpanica(machine_config &config); + void galpanic(machine_config &config); }; diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index 37cb1e77b91..6a796b7752c 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -57,4 +57,5 @@ public: void mix_sprite_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri); + void galspnbl(machine_config &config); }; diff --git a/src/mame/includes/gamecom.h b/src/mame/includes/gamecom.h index f3156b83132..580093405a3 100644 --- a/src/mame/includes/gamecom.h +++ b/src/mame/includes/gamecom.h @@ -250,6 +250,7 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER( gamecom_cart1 ); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( gamecom_cart2 ); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void gamecom(machine_config &config); private: uint8_t *m_p_ram; uint8_t *m_cart_ptr; diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index 18e1a353e36..372c1b8b479 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -107,12 +107,12 @@ public: DECLARE_WRITE_LINE_MEMBER(trvquest_coin_w); DECLARE_WRITE_LINE_MEMBER(trvquest_misc_w); + void gameplan(machine_config &config); + void gameplan_video(machine_config &config); + void leprechn(machine_config &config); + void leprechn_video(machine_config &config); + void trvquest(machine_config &config); + void trvquest_video(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; - -/*----------- defined in video/gameplan.c -----------*/ - -MACHINE_CONFIG_EXTERN( gameplan_video ); -MACHINE_CONFIG_EXTERN( leprechn_video ); -MACHINE_CONFIG_EXTERN( trvquest_video ); diff --git a/src/mame/includes/gamepock.h b/src/mame/includes/gamepock.h index 067116f4f7d..a9d4e7e6388 100644 --- a/src/mame/includes/gamepock.h +++ b/src/mame/includes/gamepock.h @@ -45,6 +45,7 @@ public: required_device m_speaker; required_device m_cart; DECLARE_WRITE_LINE_MEMBER(gamepock_to_w); + void gamepock(machine_config &config); }; #endif // MAME_INCLUDES_GAMEPOCK_H diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index 75e00946876..6f58c22f6c1 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -106,6 +106,9 @@ public: void starfield_render(bitmap_ind16 &bitmap); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void gapluso(machine_config &config); + void gaplusd(machine_config &config); + void gaplus(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h index 8faac6be6ac..c20823a7459 100644 --- a/src/mame/includes/gatron.h +++ b/src/mame/includes/gatron.h @@ -20,4 +20,5 @@ public: uint32_t screen_update_gat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void gat(machine_config &config); }; diff --git a/src/mame/includes/gauntlet.h b/src/mame/includes/gauntlet.h index 7e19e6e39e6..f9e9de8c446 100644 --- a/src/mame/includes/gauntlet.h +++ b/src/mame/includes/gauntlet.h @@ -65,4 +65,9 @@ public: DECLARE_WRITE16_MEMBER( gauntlet_yscroll_w ); static const atari_motion_objects_config s_mob_config; + void gauntlet_base(machine_config &config); + void vindctr2(machine_config &config); + void gauntlet(machine_config &config); + void gaunt2p(machine_config &config); + void gauntlet2(machine_config &config); }; diff --git a/src/mame/includes/gb.h b/src/mame/includes/gb.h index 5a1e8666f72..16acb90cb8c 100644 --- a/src/mame/includes/gb.h +++ b/src/mame/includes/gb.h @@ -89,6 +89,11 @@ public: DECLARE_WRITE8_MEMBER(gb_echo_w); optional_device m_cartslot; + void supergb(machine_config &config); + void supergb2(machine_config &config); + void gbcolor(machine_config &config); + void gbpocket(machine_config &config); + void gameboy(machine_config &config); protected: enum { SIO_ENABLED = 0x80, @@ -142,6 +147,7 @@ public: DECLARE_WRITE8_MEMBER(bank1_w); DECLARE_WRITE8_MEMBER(bank2_w); optional_device m_cartslot; + void megaduck(machine_config &config); }; diff --git a/src/mame/includes/gba.h b/src/mame/includes/gba.h index 49ec873e697..a45cf3907f3 100644 --- a/src/mame/includes/gba.h +++ b/src/mame/includes/gba.h @@ -78,6 +78,7 @@ public: TIMER_CALLBACK_MEMBER(timer_expire); TIMER_CALLBACK_MEMBER(handle_irq); + void gbadv(machine_config &config); protected: required_region_ptr m_region_maincpu; required_ioport m_io_inputs; diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index f820ee5a0f3..dc0c1ac462b 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -69,4 +69,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void gberetb(machine_config &config); + void mrgoemon(machine_config &config); + void gberet(machine_config &config); }; diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index 84b9a1b96cf..a8566c243cc 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -90,6 +90,7 @@ public: DECLARE_WRITE_LINE_MEMBER(gcp_adpcm_int); required_device m_sprgen; + void gcpinbal(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/gijoe.h b/src/mame/includes/gijoe.h index 239f8812235..d31a1bc16ef 100644 --- a/src/mame/includes/gijoe.h +++ b/src/mame/includes/gijoe.h @@ -67,4 +67,5 @@ public: void gijoe_objdma(); K056832_CB_MEMBER(tile_callback); K053246_CB_MEMBER(sprite_callback); + void gijoe(machine_config &config); }; diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index ebc3e7a180c..4ec337b2fe7 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -60,4 +60,5 @@ public: virtual void video_start() override; uint32_t screen_update_ginganin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); + void ginganin(machine_config &config); }; diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 5eddec0821d..b8228e8471a 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -139,6 +139,7 @@ public: uint32_t screen_update_gladiatr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void swap_block(uint8_t *src1,uint8_t *src2,int len); + void gladiatr(machine_config &config); private: required_ioport m_dsw1, m_dsw2; required_ioport m_in0, m_in1, m_in2; @@ -183,6 +184,7 @@ public: uint32_t screen_update_ppking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void ppking(machine_config &config); private: required_shared_ptr m_nvram; required_device m_soundlatch2; diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index 7167e0ff21d..35df5e9df34 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -71,4 +71,6 @@ public: INTERRUPT_GEN_MEMBER(interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void ROM16_split_gfx( const char *src_reg, const char *dst_reg, int start, int length, int dest1, int dest2 ); + void glass(machine_config &config); + void glass_ds5002fp(machine_config &config); }; diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index 9d7f4c53d1a..82ef523366a 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -54,4 +54,6 @@ public: required_device_array m_ym; required_device m_gfxdecode; required_device m_palette; + void gng(machine_config &config); + void diamond(machine_config &config); }; diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index f5826358cca..aebce586532 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -72,4 +72,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(goal92_adpcm_int); + void goal92(machine_config &config); }; diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index 0dcb070b6e3..8e0be3628f5 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -57,4 +57,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void goindol(machine_config &config); }; diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index 4e5c45eee2f..b1464d97e6b 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -52,6 +52,16 @@ public: uint32_t screen_update_goldstar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_cmast91(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void ladylinr(machine_config &config); + void wcherry(machine_config &config); + void pkrmast(machine_config &config); + void moonlght(machine_config &config); + void kkotnoli(machine_config &config); + void cmast91(machine_config &config); + void super9(machine_config &config); + void goldfrui(machine_config &config); + void goldstar(machine_config &config); + void goldstbl(machine_config &config); protected: TILE_GET_INFO_MEMBER(get_goldstar_fg_tile_info); TILE_GET_INFO_MEMBER(get_cherrym_fg_tile_info); @@ -126,6 +136,12 @@ public: uint32_t screen_update_amcoe1a(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void cm(machine_config &config); + void cmasterc(machine_config &config); + void amcoe1a(machine_config &config); + void nfm(machine_config &config); + void amcoe2(machine_config &config); + void amcoe1(machine_config &config); protected: // installed by various driver init handlers to get stuff to work READ8_MEMBER(fixedval09_r) { return 0x09; } @@ -180,6 +196,15 @@ public: INTERRUPT_GEN_MEMBER(masked_irq); + void bingowng(machine_config &config); + void flaming7(machine_config &config); + void lucky8(machine_config &config); + void wcat3(machine_config &config); + void magodds(machine_config &config); + void flam7_w4(machine_config &config); + void bingownga(machine_config &config); + void mbstar(machine_config &config); + void flam7_tw(machine_config &config); protected: TILE_GET_INFO_MEMBER(get_magical_fg_tile_info); @@ -207,6 +232,12 @@ public: DECLARE_DRIVER_INIT(chrygld); DECLARE_DRIVER_INIT(chry10); + void cherrys(machine_config &config); + void chrygld(machine_config &config); + void cb3c(machine_config &config); + void cb3e(machine_config &config); + void ncb3(machine_config &config); + void cm97(machine_config &config); protected: void do_blockswaps(uint8_t* ROM); void dump_to_file(uint8_t* ROM); @@ -241,6 +272,7 @@ public: DECLARE_VIDEO_START(sangho); uint32_t screen_update_sangho(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void star100(machine_config &config); protected: TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); @@ -286,6 +318,9 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); + void megaline(machine_config &config); + void unkch(machine_config &config); + void bonusch(machine_config &config); protected: TILE_GET_INFO_MEMBER(get_reel1_tile_info); TILE_GET_INFO_MEMBER(get_reel2_tile_info); diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index f4b24b2fdd8..80663da3d93 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -39,6 +39,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_screen; + void gomoku(machine_config &config); }; #endif // MAME_INCLUDES_GOMOKU_H diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index dcaa00ae914..baab48d3c18 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -55,4 +55,5 @@ public: required_device m_maincpu; required_device m_oki; required_device m_gfxdecode; + void gotcha(machine_config &config); }; diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index a122feb3f84..dbde4029cde 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -141,6 +141,17 @@ public: void audio_handle_zero_crossing(const attotime &zerotime, bool logit); void laserdisc_audio_process(laserdisc_device &device, int samplerate, int samples, const int16_t *ch0, const int16_t *ch1); + void gottlieb_core(machine_config &config); + void cobram3(machine_config &config); + void screwloo(machine_config &config); + void gottlieb2(machine_config &config); + void reactor(machine_config &config); + void tylz(machine_config &config); + void g2laser(machine_config &config); + void qbert(machine_config &config); + void qbert_knocker(machine_config &config); + void gottlieb1(machine_config &config); + void gottlieb1_votrax(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index 92c18b540af..292a4ca24dc 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -50,4 +50,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void gotya(machine_config &config); }; diff --git a/src/mame/includes/gp32.h b/src/mame/includes/gp32.h index cfe14d5bd4d..9cb60706937 100644 --- a/src/mame/includes/gp32.h +++ b/src/mame/includes/gp32.h @@ -184,6 +184,7 @@ public: TIMER_CALLBACK_MEMBER(s3c240x_dma_timer_exp); TIMER_CALLBACK_MEMBER(s3c240x_iic_timer_exp); TIMER_CALLBACK_MEMBER(s3c240x_iis_timer_exp); + void gp32(machine_config &config); protected: required_device m_maincpu; required_device m_smartmedia; diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h index 69bf1ef960e..55301be9292 100644 --- a/src/mame/includes/gradius3.h +++ b/src/mame/includes/gradius3.h @@ -66,4 +66,5 @@ public: DECLARE_WRITE8_MEMBER(volume_callback); K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); + void gradius3(machine_config &config); }; diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index c721b302e6d..d6e5d87837a 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -112,6 +112,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void draw_objects(int y, uint8_t *objdata); + void grchamp(machine_config &config); }; /* Discrete Sound Input Nodes */ diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h index bfcca91d7fb..b26c94606be 100644 --- a/src/mame/includes/gridlee.h +++ b/src/mame/includes/gridlee.h @@ -72,6 +72,7 @@ public: TIMER_CALLBACK_MEMBER(firq_timer_tick); void expand_pixels(); void poly17_init(); + void gridlee(machine_config &config); }; diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h index 9568b075d71..71826f9468c 100644 --- a/src/mame/includes/groundfx.h +++ b/src/mame/includes/groundfx.h @@ -62,6 +62,7 @@ public: void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect,int do_hack,int x_offs,int y_offs); + void groundfx(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index 459e95313ba..d5807478e9a 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -83,6 +83,9 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank); void mcu_init(); + void twc94(machine_config &config); + void gstriker(machine_config &config); + void vgoal(machine_config &config); }; #endif diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h index db4fc678526..4b93a0684d7 100644 --- a/src/mame/includes/gsword.h +++ b/src/mame/includes/gsword.h @@ -96,6 +96,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void gsword(machine_config &config); private: required_device m_soundlatch; required_device m_msm; @@ -134,6 +135,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; + void josvolly(machine_config &config); private: bool m_cpu2_nmi_enable; u8 m_mcu1_p1; diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index f09488d11ed..c2f7886f8a7 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -31,4 +31,7 @@ public: uint32_t screen_update_gumbo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void mspuzzle(machine_config &config); + void dblpoint(machine_config &config); + void gumbo(machine_config &config); }; diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h index bed158c095a..4acca6eb043 100644 --- a/src/mame/includes/gunbustr.h +++ b/src/mame/includes/gunbustr.h @@ -59,6 +59,7 @@ public: INTERRUPT_GEN_MEMBER(gunbustr_interrupt); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect,const int *primasks,int x_offs,int y_offs); + void gunbustr(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index ecde6a130d8..120c9b23ac3 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -54,4 +54,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void gundealr(machine_config &config); + void gundealrbl(machine_config &config); + void yamyam(machine_config &config); }; diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index d072ae0f825..f877eefb716 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -50,4 +50,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void gunsmoke(machine_config &config); }; diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index 82181c76e5e..fda86f9b2c6 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -69,4 +69,5 @@ public: INTERRUPT_GEN_MEMBER(slave_vblank_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void filter_w(address_space &space, int chip, int data ); + void gyruss(machine_config &config); }; diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index e57ea6caede..f4798e005ca 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -42,4 +42,5 @@ public: DECLARE_WRITE8_MEMBER(hanaawas_portB_w); required_device m_maincpu; required_device m_gfxdecode; + void hanaawas(machine_config &config); }; diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h index b7d436690d0..1ade185e0b5 100644 --- a/src/mame/includes/harddriv.h +++ b/src/mame/includes/harddriv.h @@ -254,6 +254,16 @@ public: DECLARE_WRITE32_MEMBER(hdds3xdsp_serial_tx_callback); DECLARE_READ32_MEMBER(hdds3xdsp_serial_rx_callback); + + void driver_msp(machine_config &config); + void driver_nomsp(machine_config &config); + void multisync_msp(machine_config &config); + void multisync_nomsp(machine_config &config); + void dsk(machine_config &config); + void dsk2(machine_config &config); + void ds3(machine_config &config); + void multisync2(machine_config &config); + void adsp(machine_config &config); protected: harddriv_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index 8764b45c24f..56cbf5c3883 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -71,4 +71,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void hcastle(machine_config &config); }; diff --git a/src/mame/includes/hec2hrp.h b/src/mame/includes/hec2hrp.h index b12e900253f..70f745565a0 100644 --- a/src/mame/includes/hec2hrp.h +++ b/src/mame/includes/hec2hrp.h @@ -198,8 +198,13 @@ public: DECLARE_WRITE8_MEMBER( hector_disc2_io50_port_w); void hector_disc2_reset(); + void hec2mx80(machine_config &config); + void hec2hrp(machine_config &config); + void hec2hrx(machine_config &config); + void hec2mx40(machine_config &config); + void hec2mdhrx(machine_config &config); + void hec2hr(machine_config &config); + void hector_audio(machine_config &config); }; -MACHINE_CONFIG_EXTERN( hector_audio ); - #endif // MAME_INCLUDES_HEC2HRP_H diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h index e537dd77e1e..73d97a9ff6c 100644 --- a/src/mame/includes/hexion.h +++ b/src/mame/includes/hexion.h @@ -47,4 +47,6 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); inline void get_tile_info(tile_data &tileinfo,int tile_index,uint8_t *ram); + void hexion(machine_config &config); + void hexionb(machine_config &config); }; diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index 367cb693463..5585f81be3f 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -39,4 +39,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void higemaru(machine_config &config); }; diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index bca67b92f9f..210f07d806c 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -53,4 +53,5 @@ public: virtual void video_start() override; uint32_t screen_update_himesiki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void himesiki_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void himesiki(machine_config &config); }; diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index b8dbe02a33b..f9f4fd89bb8 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -54,6 +54,8 @@ public: required_device m_discrete; required_device m_gfxdecode; required_device m_screen; + void hitme(machine_config &config); + void barricad(machine_config &config); }; diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h index ab2be332925..aa43729100d 100644 --- a/src/mame/includes/hnayayoi.h +++ b/src/mame/includes/hnayayoi.h @@ -50,4 +50,7 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device m_maincpu; required_device m_msm; + void untoucha(machine_config &config); + void hnayayoi(machine_config &config); + void hnfubuki(machine_config &config); }; diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index 9ddcce56a43..3b0cc35bc16 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -393,4 +393,7 @@ public: DECLARE_WRITE16_MEMBER(sound_comms_w); uint16_t main_latch[2]; uint16_t sound_latch[2]; + void hng64(machine_config &config); + void hng64_audio(machine_config &config); + void hng64_network(machine_config &config); }; diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index 6eb76c73588..520f834ef5e 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -56,4 +56,6 @@ public: uint32_t screen_update_crzrally(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void holeland_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void crzrally_draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); + void crzrally(machine_config &config); + void holeland(machine_config &config); }; diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 67213889c77..e7b3d32d0f9 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -152,4 +152,10 @@ public: inline void lemnangl_info( tile_data &tileinfo, int tile_index, int page, int layer, int gfxset, int gfxbank ); inline void mirderby_info0( tile_data &tileinfo, int tile_index, int page, int gfxbank ); inline void mirderby_info1( tile_data &tileinfo, int tile_index, int page, int gfxbank ); + void reikaids(machine_config &config); + void mrokumei(machine_config &config); + void mirderby(machine_config &config); + void pteacher(machine_config &config); + void lemnangl(machine_config &config); + void mjkinjas(machine_config &config); }; diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index 6d5492b7089..d99fb353816 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -64,4 +64,7 @@ public: uint32_t screen_update_homerun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(homerun_banking_w); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void ganjaja(machine_config &config); + void dynashot(machine_config &config); + void homerun(machine_config &config); }; diff --git a/src/mame/includes/hp48.h b/src/mame/includes/hp48.h index bcc88e6f029..e68458f3338 100644 --- a/src/mame/includes/hp48.h +++ b/src/mame/includes/hp48.h @@ -137,6 +137,13 @@ public: /* keyboard interrupt system */ DECLARE_WRITE_LINE_MEMBER( hp48_rsi ); + void hp48_common(machine_config &config); + void hp48s(machine_config &config); + void hp48gp(machine_config &config); + void hp48sx(machine_config &config); + void hp48g(machine_config &config); + void hp48gx(machine_config &config); + void hp49g(machine_config &config); }; diff --git a/src/mame/includes/hp9845.h b/src/mame/includes/hp9845.h index 60f09aa5e7d..17e8c7ecec1 100644 --- a/src/mame/includes/hp9845.h +++ b/src/mame/includes/hp9845.h @@ -58,6 +58,8 @@ public: DECLARE_WRITE_LINE_MEMBER(t15_sts_w); DECLARE_INPUT_CHANGED_MEMBER(togglekey_changed); + + void hp9845_base(machine_config &config); protected: required_device m_lpu; required_device m_ppu; diff --git a/src/mame/includes/huebler.h b/src/mame/includes/huebler.h index 63aa6da9818..8028d4f78da 100644 --- a/src/mame/includes/huebler.h +++ b/src/mame/includes/huebler.h @@ -67,6 +67,7 @@ public: DECLARE_WRITE_LINE_MEMBER(ctc_z0_w); DECLARE_WRITE_LINE_MEMBER(ctc_z2_w); DECLARE_WRITE_LINE_MEMBER(cassette_w); + void amu880(machine_config &config); }; #endif diff --git a/src/mame/includes/hx20.h b/src/mame/includes/hx20.h index 9ad20045088..c742b11dd59 100644 --- a/src/mame/includes/hx20.h +++ b/src/mame/includes/hx20.h @@ -143,6 +143,8 @@ public: // sio state int m_sio_rx; int m_sio_pin; + void cm6000(machine_config &config); + void hx20(machine_config &config); }; #endif // MAME_INCLUDES_HX20_H diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h index ed6d926365b..6092e040a02 100644 --- a/src/mame/includes/hyhoo.h +++ b/src/mame/includes/hyhoo.h @@ -47,6 +47,8 @@ public: uint32_t screen_update_hyhoo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void hyhoo_gfxdraw(); + void hyhoo(machine_config &config); + void hyhoo2(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index de8cdbc69a8..ff8912bb884 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -57,4 +57,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void hyperspt(machine_config &config); + void roadf(machine_config &config); + void hypersptb(machine_config &config); }; diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index 0503888a071..a58dffa985b 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -67,6 +67,8 @@ public: TIMER_CALLBACK_MEMBER(blit_done); TIMER_DEVICE_CALLBACK_MEMBER(interrupt); + void magerror(machine_config &config); + void hyprduel(machine_config &config); protected: virtual void machine_reset() override; diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index 18194f3e669..70db6fb6adf 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -50,4 +50,5 @@ public: uint32_t screen_update_ikki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(ikki_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void ikki(machine_config &config); }; diff --git a/src/mame/includes/imds2.h b/src/mame/includes/imds2.h index 059e87bb9b0..de3ea9ebbb1 100644 --- a/src/mame/includes/imds2.h +++ b/src/mame/includes/imds2.h @@ -72,6 +72,7 @@ class imds2_state : public driver_device virtual void video_start() override; virtual void machine_reset() override; + void imds2(machine_config &config); private: required_device m_ipccpu; required_device m_ipcsyspic; diff --git a/src/mame/includes/interpro.h b/src/mame/includes/interpro.h index e40969ad172..8fa9bf710c4 100644 --- a/src/mame/includes/interpro.h +++ b/src/mame/includes/interpro.h @@ -161,6 +161,11 @@ public: DECLARE_FLOPPY_FORMATS(floppy_formats); + void ioga(machine_config &config); + void interpro_serial1(machine_config &config); + void interpro_serial2(machine_config &config); + void interpro(machine_config &config); + static void interpro_scsi_adapter(device_t *device); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -190,6 +195,8 @@ public: required_device m_d_cammu; required_device m_i_cammu; + void turquoise(machine_config &config); + void ip2000(machine_config &config); }; class sapphire_state : public interpro_state @@ -211,6 +218,11 @@ public: required_device m_flash_lo; required_device m_flash_hi; + void sapphire(machine_config &config); + void ip2500(machine_config &config); + void ip2400(machine_config &config); + void ip2800(machine_config &config); + void ip2700(machine_config &config); }; #endif // MAME_INCLUDES_INTERPRO_H diff --git a/src/mame/includes/intv.h b/src/mame/includes/intv.h index f2fbc853b9f..5fd588e1851 100644 --- a/src/mame/includes/intv.h +++ b/src/mame/includes/intv.h @@ -117,6 +117,11 @@ public: TIMER_CALLBACK_MEMBER(intv_interrupt_complete); TIMER_CALLBACK_MEMBER(intv_btb_fill); + void intvkbd(machine_config &config); + void intv2(machine_config &config); + void intvoice(machine_config &config); + void intvecs(machine_config &config); + void intv(machine_config &config); protected: int m_is_keybd; diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index ecc593ab46a..579f0c50586 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -66,6 +66,8 @@ public: virtual void video_start() override; uint32_t screen_update_inufuku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_inufuku); + void inufuku(machine_config &config); + void _3on3dunk(machine_config &config); }; #endif // MAME_INCLUDES_INUFUKU_H diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h index 616ceaacefa..8cd6fc4fd77 100644 --- a/src/mame/includes/iqblock.h +++ b/src/mame/includes/iqblock.h @@ -44,4 +44,5 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void iqblock(machine_config &config); }; diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index 61e1bddae81..5877c3ca3d2 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -104,4 +104,5 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void irobot(machine_config &config); }; diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index 036eb257cd1..c3838c36818 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -46,6 +46,8 @@ public: DECLARE_PALETTE_INIT(ironhors); DECLARE_VIDEO_START(farwest); + void farwest(machine_config &config); + void ironhors(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index 0e86083fc20..7f9d4030616 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -202,4 +202,9 @@ public: void handle_video_command(); inline int determine_irq_state(int vint, int xint, int qint); void itech32_update_interrupts(int vint, int xint, int qint); + void tourny(machine_config &config); + void sftm(machine_config &config); + void drivedge(machine_config &config); + void bloodstm(machine_config &config); + void timekill(machine_config &config); }; diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index 124c4ac150b..9c60bbd45d3 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -184,6 +184,25 @@ public: DECLARE_WRITE16_MEMBER(grom_bank16_w); DECLARE_WRITE16_MEMBER(display_page16_w); + void itech8_sound_ym2203(machine_config &config); + void itech8_sound_ym2608b(machine_config &config); + void itech8_sound_ym3812(machine_config &config); + void itech8_sound_ym3812_external(machine_config &config); + void itech8_core_lo(machine_config &config); + void itech8_core_hi(machine_config &config); + void grmatch(machine_config &config); + void rimrockn(machine_config &config); + void gtg2(machine_config &config); + void slikshot_lo(machine_config &config); + void slikshot_lo_noz80(machine_config &config); + void ninclown(machine_config &config); + void sstrike(machine_config &config); + void stratab_hi(machine_config &config); + void hstennis_lo(machine_config &config); + void wfortune(machine_config &config); + void stratab_lo(machine_config &config); + void slikshot_hi(machine_config &config); + void hstennis_hi(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index 4d8df83f07e..a0fb8b3857d 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -87,4 +87,9 @@ public: void jack_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void joinem_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void treahunt_decode( ); + void joinem(machine_config &config); + void treahunt(machine_config &config); + void unclepoo(machine_config &config); + void striv(machine_config &config); + void jack(machine_config &config); }; diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 028c80c62fe..38825563609 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -58,4 +58,5 @@ public: void draw_background( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_sprites_region( bitmap_ind16 &bitmap, const rectangle &cliprect, const uint8_t *sram, int length, int bank ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void jackal(machine_config &config); }; diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h index e6e3de94b0e..660f8f5661f 100644 --- a/src/mame/includes/jaguar.h +++ b/src/mame/includes/jaguar.h @@ -249,6 +249,11 @@ public: IRQ_CALLBACK_MEMBER(jaguar_irq_callback); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( jaguar_cart ); DECLARE_QUICKLOAD_LOAD_MEMBER( jaguar ); + void cojagr3k_rom(machine_config &config); + void jaguarcd(machine_config &config); + void jaguar(machine_config &config); + void cojag68k(machine_config &config); + void cojagr3k(machine_config &config); protected: // timer IDs enum diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 692a05d403e..d71ed321855 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -60,4 +60,5 @@ public: INTERRUPT_GEN_MEMBER(interrupt); INTERRUPT_GEN_MEMBER(interrupt_nmi); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void jailbrek(machine_config &config); }; diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h index 40d50931207..a3dda068fa4 100644 --- a/src/mame/includes/jedi.h +++ b/src/mame/includes/jedi.h @@ -97,10 +97,7 @@ public: required_device m_maincpu; required_device m_audiocpu; required_device m_screen; + void jedi(machine_config &config); + void jedi_audio(machine_config &config); + void jedi_video(machine_config &config); }; - -/*----------- defined in audio/jedi.c -----------*/ -MACHINE_CONFIG_EXTERN( jedi_audio ); - -/*----------- defined in video/jedi.c -----------*/ -MACHINE_CONFIG_EXTERN( jedi_video ); diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h index ede297aec83..99aac6e84a5 100644 --- a/src/mame/includes/jpmimpct.h +++ b/src/mame/includes/jpmimpct.h @@ -149,4 +149,6 @@ public: optional_device m_reel4; optional_device m_reel5; required_device m_meters; + void impctawp(machine_config &config); + void jpmimpct(machine_config &config); }; diff --git a/src/mame/includes/jpmsys5.h b/src/mame/includes/jpmsys5.h index 78c323c5d29..8b79524f02d 100644 --- a/src/mame/includes/jpmsys5.h +++ b/src/mame/includes/jpmsys5.h @@ -91,4 +91,7 @@ public: DECLARE_MACHINE_RESET(jpmsys5); uint32_t screen_update_jpmsys5v(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(touch_cb); + void jpmsys5(machine_config &config); + void jpmsys5_ym(machine_config &config); + void jpmsys5v(machine_config &config); }; diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h index 1c8a1cbd69a..65490f7a16d 100644 --- a/src/mame/includes/kaneko16.h +++ b/src/mame/includes/kaneko16.h @@ -90,6 +90,10 @@ public: void kaneko16_fill_bitmap(_BitmapClass &bitmap, const rectangle &cliprect); void kaneko16_unscramble_tiles(const char *region); + void bakubrkr(machine_config &config); + void wingforc(machine_config &config); + void blazeon(machine_config &config); + void mgcrystl(machine_config &config); }; class kaneko16_gtmr_state : public kaneko16_state @@ -113,6 +117,11 @@ public: DECLARE_READ16_MEMBER(gtmr2_IN1_r); DECLARE_DRIVER_INIT(gtmr); + void bonkadv(machine_config &config); + void gtmr(machine_config &config); + void gtmr2(machine_config &config); + void gtmre(machine_config &config); + void bloodwar(machine_config &config); private: void kaneko16_expand_sample_banks(const char *region); @@ -164,6 +173,7 @@ public: void kaneko16_render_15bpp_bitmap(bitmap_rgb32 &bitmap, const rectangle &cliprect); void patch_protection(uint32_t bra_offset,uint16_t bra_value,uint16_t checksum); + void berlwall(machine_config &config); }; class kaneko16_shogwarr_state : public kaneko16_state @@ -183,6 +193,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(shogwarr_interrupt); + void shogwarr(machine_config &config); + void brapboys(machine_config &config); private: void kaneko16_common_oki_bank_w(const char *bankname, const char *tag, int bank, size_t fixedsize, size_t bankedsize); diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h index 78492e23848..4b2f1acd762 100644 --- a/src/mame/includes/kangaroo.h +++ b/src/mame/includes/kangaroo.h @@ -39,4 +39,6 @@ public: void blitter_execute( ); required_device m_maincpu; required_device m_palette; + void nomcu(machine_config &config); + void mcu(machine_config &config); }; diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 84b41b76824..5b5e1a16b21 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -79,6 +79,10 @@ public: void karnov_i8751_w( int data ); void wndrplnt_i8751_w( int data ); void chelnov_i8751_w( int data ); + void chelnovjbl(machine_config &config); + void karnov(machine_config &config); + void wndrplnt(machine_config &config); + void karnovjbl(machine_config &config); }; enum { diff --git a/src/mame/includes/kaypro.h b/src/mame/includes/kaypro.h index 2654546ffa0..f7110fe11ce 100644 --- a/src/mame/includes/kaypro.h +++ b/src/mame/includes/kaypro.h @@ -64,6 +64,13 @@ public: MC6845_UPDATE_ROW(kaypro484_update_row); DECLARE_QUICKLOAD_LOAD_MEMBER(kaypro); + void omni2(machine_config &config); + void kayproiv(machine_config &config); + void kayproii(machine_config &config); + void kaypronew2(machine_config &config); + void kaypro484(machine_config &config); + void kaypro10(machine_config &config); + void kaypro284(machine_config &config); private: uint8_t m_mc6845_cursor[16]; uint8_t m_mc6845_reg[32]; diff --git a/src/mame/includes/kc.h b/src/mame/includes/kc.h index 11de65a5068..c04b756b9f1 100644 --- a/src/mame/includes/kc.h +++ b/src/mame/includes/kc.h @@ -153,6 +153,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(kc_scanline); DECLARE_QUICKLOAD_LOAD_MEMBER( kc ); + void kc85_3(machine_config &config); }; @@ -184,6 +185,8 @@ public: uint8_t m_port_84_data; uint8_t m_port_86_data; uint8_t * m_display_video_ram; + void kc85_4(machine_config &config); + void kc85_5(machine_config &config); }; #endif // MAME_INCLUDES_KC_H diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index 875fbef0fef..68068cf3edf 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -81,4 +81,6 @@ public: void kchampvs_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void decrypt_code(); DECLARE_WRITE_LINE_MEMBER(msmint); + void kchamp(machine_config &config); + void kchampvs(machine_config &config); }; diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index 2c40802b3fa..3dd329c9f03 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -85,4 +85,6 @@ public: required_device m_oki; required_device m_gfxdecode; required_device m_palette; + void kickgoal(machine_config &config); + void actionhw(machine_config &config); }; diff --git a/src/mame/includes/kim1.h b/src/mame/includes/kim1.h index 8a95faac612..45c86416443 100644 --- a/src/mame/includes/kim1.h +++ b/src/mame/includes/kim1.h @@ -57,6 +57,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(kim1_cassette_input); TIMER_DEVICE_CALLBACK_MEMBER(kim1_update_leds); + void kim1(machine_config &config); protected: required_ioport m_row0; required_ioport m_row1; diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index a2d74b40d84..2a943886212 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -79,4 +79,6 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_soundlatch; + void kingofb(machine_config &config); + void ringking(machine_config &config); }; diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h index 4e3f122dca7..21099992074 100644 --- a/src/mame/includes/klax.h +++ b/src/mame/includes/klax.h @@ -35,6 +35,8 @@ public: static const atari_motion_objects_config s_mob_config; + void klax(machine_config &config); + void klax2bl(machine_config &config); private: required_device m_playfield_tilemap; required_device m_mob; diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index c626d23fdbe..75ca5931a02 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -68,4 +68,5 @@ public: uint32_t screen_update_kncljoe(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(sound_nmi); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void kncljoe(machine_config &config); }; diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index f5209b98cba..36f41e041b8 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -262,6 +262,22 @@ public: DECLARE_DRIVER_INIT(posthack); int m_use_68020_post_clock_hack; + void konamigx_6bpp(machine_config &config); + void gxtype4(machine_config &config); + void gxtype4_vsn(machine_config &config); + void racinfrc(machine_config &config); + void gxtype4sd2(machine_config &config); + void konamigx_bios(machine_config &config); + void gxtype3(machine_config &config); + void opengolf(machine_config &config); + void winspike(machine_config &config); + void le2(machine_config &config); + void konamigx(machine_config &config); + void dragoonj(machine_config &config); + void salmndr2(machine_config &config); + void tbyahhoo(machine_config &config); + void gokuparo(machine_config &config); + void sexyparo(machine_config &config); }; // Sprite Callbacks diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h index 5078ce6d8fd..1847c0a4808 100644 --- a/src/mame/includes/kopunch.h +++ b/src/mame/includes/kopunch.h @@ -52,4 +52,5 @@ public: virtual void machine_start() override; virtual void video_start() override; + void kopunch(machine_config &config); }; diff --git a/src/mame/includes/kramermc.h b/src/mame/includes/kramermc.h index 02e177cd0d1..241acfe89e7 100644 --- a/src/mame/includes/kramermc.h +++ b/src/mame/includes/kramermc.h @@ -31,6 +31,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void kramermc(machine_config &config); }; /*----------- defined in video/kramermc.c -----------*/ diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index 252a9e26a23..85302eaf03b 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -55,4 +55,5 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_soundlatch; + void ksayakyu(machine_config &config); }; diff --git a/src/mame/includes/kyocera.h b/src/mame/includes/kyocera.h index d5a89dccff6..ef2d1e2f6ea 100644 --- a/src/mame/includes/kyocera.h +++ b/src/mame/includes/kyocera.h @@ -142,6 +142,8 @@ public: DECLARE_PALETTE_INIT(kc85); DECLARE_WRITE_LINE_MEMBER(kc85_sod_w); DECLARE_READ_LINE_MEMBER(kc85_sid_r); + void kc85(machine_config &config); + void kc85_video(machine_config &config); }; class trsm100_state : public kc85_state @@ -151,6 +153,8 @@ public: : kc85_state(mconfig, type, tag) { } virtual void machine_start() override; + void trsm100(machine_config &config); + void tandy102(machine_config &config); }; class pc8201_state : public kc85_state @@ -181,6 +185,8 @@ public: /* peripheral state */ int m_iosel; /* serial interface select */ + void pc8300(machine_config &config); + void pc8201(machine_config &config); }; class tandy200_state : public driver_device @@ -252,11 +258,8 @@ public: int m_centronics_busy; int m_centronics_select; + void tandy200(machine_config &config); + void tandy200_video(machine_config &config); }; -/* ---------- defined in video/kyocera.c ---------- */ - -MACHINE_CONFIG_EXTERN( kc85_video ); -MACHINE_CONFIG_EXTERN( tandy200_video ); - #endif // MAME_INCLUDES_KYOCERA_H diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h index b5ccabe8848..b5f86b740e8 100644 --- a/src/mame/includes/kyugo.h +++ b/src/mame/includes/kyugo.h @@ -38,6 +38,12 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); + void kyugo_base(machine_config &config); + void repulse(machine_config &config); + void flashgala(machine_config &config); + void srdmissn(machine_config &config); + void legend(machine_config &config); + void gyrodine(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index 4ec9047a93c..2b194c1022a 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -56,4 +56,5 @@ public: uint32_t screen_update_labyrunr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(labyrunr_vblank_interrupt); INTERRUPT_GEN_MEMBER(labyrunr_timer_interrupt); + void labyrunr(machine_config &config); }; diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index 387cf6b54b3..5241de07460 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -72,4 +72,6 @@ public: void palette_init_common( palette_device &palette, const uint8_t *color_prom, int r_bit0, int r_bit1, int g_bit0, int g_bit1, int b_bit0, int b_bit1 ); + void dorodon(machine_config &config); + void ladybug(machine_config &config); }; diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index 5e4138de430..59280c313ff 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -77,4 +77,6 @@ public: uint32_t screen_update_ladyfrog(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(nmi_callback); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void toucheme(machine_config &config); + void ladyfrog(machine_config &config); }; diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index 84e1774c3f2..ae7ed1e2eb1 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -84,6 +84,7 @@ public: virtual void video_start() override; uint32_t screen_update_laserbat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void laserbat_base(machine_config &config); protected: enum { TIMER_SCANLINE }; @@ -165,6 +166,7 @@ public: // sound control ports virtual DECLARE_WRITE8_MEMBER(csound2_w) override; + void laserbat(machine_config &config); protected: // initialisation/startup @@ -196,6 +198,7 @@ public: virtual DECLARE_WRITE8_MEMBER(csound1_w) override; virtual DECLARE_WRITE8_MEMBER(csound2_w) override; + void catnmous(machine_config &config); protected: required_device m_audiopcb; }; diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index 1e5c72d03e7..a1b91a948f9 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -84,4 +84,9 @@ public: void wwjgtin_set_last_four_colors(); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int reverse ); void draw_lasso( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void base(machine_config &config); + void wwjgtin(machine_config &config); + void lasso(machine_config &config); + void chameleo(machine_config &config); + void pinbo(machine_config &config); }; diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index ff900b05ca2..a9a821e1f13 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -74,4 +74,6 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(lastduel_timer_cb); TIMER_DEVICE_CALLBACK_MEMBER(madgear_timer_cb); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); + void lastduel(machine_config &config); + void madgear(machine_config &config); }; diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h index c21c541089d..a067acaf6b7 100644 --- a/src/mame/includes/lazercmd.h +++ b/src/mame/includes/lazercmd.h @@ -77,4 +77,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(bbonk_timer); int vert_scale(int data); void plot_pattern( bitmap_ind16 &bitmap, int x, int y ); + void bbonk(machine_config &config); + void medlanes(machine_config &config); + void lazercmd(machine_config &config); }; diff --git a/src/mame/includes/lc80.h b/src/mame/includes/lc80.h index 33f03bed358..5f94501cfb5 100644 --- a/src/mame/includes/lc80.h +++ b/src/mame/includes/lc80.h @@ -63,6 +63,8 @@ public: // display state uint8_t m_digit; uint8_t m_segment; + void lc80_2(machine_config &config); + void lc80(machine_config &config); }; #endif // MAME_INCLUDES_LC80_H diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h index fa81d16eba4..8a85940df7c 100644 --- a/src/mame/includes/legionna.h +++ b/src/mame/includes/legionna.h @@ -97,4 +97,11 @@ public: required_device m_gfxdecode; required_device m_palette; optional_device m_raiden2cop; + void cupsocs(machine_config &config); + void heatbrl(machine_config &config); + void cupsoc(machine_config &config); + void grainbow(machine_config &config); + void legionna(machine_config &config); + void godzilla(machine_config &config); + void denjinmk(machine_config &config); }; diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h index e6c6168fa6a..1291875cdb4 100644 --- a/src/mame/includes/leland.h +++ b/src/mame/includes/leland.h @@ -208,6 +208,14 @@ public: void keycard_w(int data); void leland_rotate_memory(const char *cpuname); void init_master_ports(uint8_t mvram_base, uint8_t io_base); + void ataxx(machine_config &config); + void redline(machine_config &config); + void lelandi(machine_config &config); + void leland(machine_config &config); + void quarterb(machine_config &config); + void wsf(machine_config &config); + void leland_video(machine_config &config); + void ataxx_video(machine_config &config); }; @@ -217,10 +225,4 @@ public: #define SERIAL_TYPE_ENCRYPT 3 #define SERIAL_TYPE_ENCRYPT_XOR 4 - -/*----------- defined in video/leland.c -----------*/ - -MACHINE_CONFIG_EXTERN( leland_video ); -MACHINE_CONFIG_EXTERN( ataxx_video ); - #endif // MAME_INCLUDES_LELAND_H diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index 4b8f87ec9ff..9b20e9ef779 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -65,4 +65,5 @@ public: DECLARE_READ16_MEMBER( lem_protection_region_0_146_r ); DECLARE_WRITE16_MEMBER( lem_protection_region_0_146_w ); + void lemmings(machine_config &config); }; diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h index 092f2e16813..4e3fb71f2e9 100644 --- a/src/mame/includes/lethal.h +++ b/src/mame/includes/lethal.h @@ -58,4 +58,6 @@ public: INTERRUPT_GEN_MEMBER(lethalen_interrupt); K05324X_CB_MEMBER(sprite_callback); K056832_CB_MEMBER(tile_callback); + void lethalej(machine_config &config); + void lethalen(machine_config &config); }; diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h index df87de7d8aa..3bef08c5011 100644 --- a/src/mame/includes/lethalj.h +++ b/src/mame/includes/lethalj.h @@ -67,6 +67,8 @@ public: inline void get_crosshair_xy(int player, int *x, int *y); TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_update); + void lethalj(machine_config &config); + void gameroom(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index 3d01d41e0b6..bacb47bcf0d 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -86,4 +86,10 @@ public: void prosport_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void boomrang_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); void prosoccr_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void liberate_base(machine_config &config); + void liberate(machine_config &config); + void liberatb(machine_config &config); + void boomrang(machine_config &config); + void prosoccr(machine_config &config); + void prosport(machine_config &config); }; diff --git a/src/mame/includes/liberatr.h b/src/mame/includes/liberatr.h index 71592a2340b..83cc312c0a5 100644 --- a/src/mame/includes/liberatr.h +++ b/src/mame/includes/liberatr.h @@ -52,6 +52,8 @@ public: DECLARE_WRITE8_MEMBER( earom_w ); DECLARE_WRITE8_MEMBER( earom_control_w ); + void liberat2(machine_config &config); + void liberatr(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/lisa.h b/src/mame/includes/lisa.h index d44aa22771f..690f0ec582e 100644 --- a/src/mame/includes/lisa.h +++ b/src/mame/includes/lisa.h @@ -238,6 +238,9 @@ public: void scan_keyboard(); void unplug_keyboard(); void plug_keyboard(); + void lisa(machine_config &config); + void lisa210(machine_config &config); + void macxl(machine_config &config); }; #endif // MAME_INCLUDES_LISA_H diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h index c0291989da9..dee1a2f454d 100644 --- a/src/mame/includes/lkage.h +++ b/src/mame/includes/lkage.h @@ -70,4 +70,6 @@ public: virtual void video_start() override; uint32_t screen_update_lkage(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); + void lkageb(machine_config &config); + void lkage(machine_config &config); }; diff --git a/src/mame/includes/llc.h b/src/mame/includes/llc.h index 24f5cd6461d..3c89ee27ef8 100644 --- a/src/mame/includes/llc.h +++ b/src/mame/includes/llc.h @@ -51,6 +51,8 @@ public: uint32_t screen_update_llc1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_llc2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void llc1(machine_config &config); + void llc2(machine_config &config); private: bool m_rv; uint8_t m_term_status; diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index 9ced782d8f9..913c50029a0 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -138,4 +138,5 @@ public: void rotate_draw( bitmap_ind16 &bitmap, const rectangle &cliprect ); void hud_draw( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(ym2203_irq); + void lockon(machine_config &config); }; diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index 10c4f748b3a..b2138b02c9b 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -106,6 +106,8 @@ public: void lorddgun_calc_gun_scr(int i); void lordgun_update_gun(int i); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void aliencha(machine_config &config); + void lordgun(machine_config &config); }; /*----------- defined in video/lordgun.c -----------*/ diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index 5b4e4d3b98d..0f28adaccc4 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -57,4 +57,7 @@ public: int draw_layer_daikaiju( bitmap_ind16 &bitmap, const rectangle &cliprect, int offs, int * previd, int type ); void drawbg( bitmap_ind16 &bitmap, const rectangle &cliprect, int type ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t priority ); + void lsasquad(machine_config &config); + void daikaiju(machine_config &config); + void storming(machine_config &config); }; diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h index daa22f46bba..b210f445c2a 100644 --- a/src/mame/includes/lucky74.h +++ b/src/mame/includes/lucky74.h @@ -54,4 +54,5 @@ public: required_device m_maincpu; required_device m_msm; required_device m_gfxdecode; + void lucky74(machine_config &config); }; diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h index 42dc7f74d02..c8e1127974d 100644 --- a/src/mame/includes/lvcards.h +++ b/src/mame/includes/lvcards.h @@ -29,4 +29,7 @@ public: uint32_t screen_update_lvcards(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void lvpoker(machine_config &config); + void lvcards(machine_config &config); + void ponttehk(machine_config &config); }; diff --git a/src/mame/includes/lviv.h b/src/mame/includes/lviv.h index 5f0a314d9d7..7e487422c6c 100644 --- a/src/mame/includes/lviv.h +++ b/src/mame/includes/lviv.h @@ -60,6 +60,7 @@ public: image_verify_result lviv_verify_snapshot(uint8_t * data, uint32_t size); DECLARE_SNAPSHOT_LOAD_MEMBER( lviv ); DECLARE_INPUT_CHANGED_MEMBER(lviv_reset); + void lviv(machine_config &config); }; /*----------- defined in video/lviv.c -----------*/ diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index e416eef4ad5..35d36b91b37 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -86,4 +86,9 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_soundlatch; + void lwings(machine_config &config); + void trojan(machine_config &config); + void fball(machine_config &config); + void avengers(machine_config &config); + void avengersb(machine_config &config); }; diff --git a/src/mame/includes/lynx.h b/src/mame/includes/lynx.h index e03c0cf0f35..30b8753c625 100644 --- a/src/mame/includes/lynx.h +++ b/src/mame/includes/lynx.h @@ -184,6 +184,7 @@ public: image_verify_result lynx_verify_cart(char *header, int kind); DECLARE_QUICKLOAD_LOAD_MEMBER( lynx ); + void lynx(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index 401af2150be..d8c6b851a10 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -115,6 +115,10 @@ public: DECLARE_WRITE_LINE_MEMBER(ic8j2_output_changed); inline void plot_pixel_m10( bitmap_ind16 &bm, int x, int y, int col ); + void m15(machine_config &config); + void headoni(machine_config &config); + void m10(machine_config &config); + void m11(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index f10ffbddfda..48875f7b6c6 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -79,4 +79,8 @@ public: void update_scroll_positions(); void tilemap_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int laynum, int category,int opaque); void screenrefresh(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void airass(machine_config &config); + void wpksoc(machine_config &config); + void firebarr(machine_config &config); + void dsoccr94(machine_config &config); }; diff --git a/src/mame/includes/m5.h b/src/mame/includes/m5.h index d23f3e109a1..361a385fdbb 100644 --- a/src/mame/includes/m5.h +++ b/src/mame/includes/m5.h @@ -80,6 +80,9 @@ public: DECLARE_WRITE8_MEMBER( mem64KBF_w ); DECLARE_WRITE8_MEMBER( mem64KRX_w ); + void m5(machine_config &config); + void pal(machine_config &config); + void ntsc(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -150,6 +153,7 @@ public: DECLARE_SNAPSHOT_LOAD_MEMBER( brno ); // DECLARE_DEVICE_IMAGE_LOAD_MEMBER(m5_cart); +void brno(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index 2e3dea662a7..0faac9d7893 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -48,4 +48,6 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void m52(machine_config &config); + void alpha1v(machine_config &config); }; diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h index c240ca158d1..ff59eb9d50e 100644 --- a/src/mame/includes/m57.h +++ b/src/mame/includes/m57.h @@ -31,4 +31,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void m57(machine_config &config); }; diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h index 0c33a1bdaf4..0af85807b9a 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -56,4 +56,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_panel( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void yard(machine_config &config); }; diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index b3cd1ce3340..90a6d635c54 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -142,4 +142,16 @@ public: required_device m_spr_palette; required_device m_chr_palette; required_device m_audio; + void ldrun2(machine_config &config); + void lotlot(machine_config &config); + void ldrun3(machine_config &config); + void battroad(machine_config &config); + void horizon(machine_config &config); + void ldrun4(machine_config &config); + void spelunk2(machine_config &config); + void youjyudn(machine_config &config); + void kungfum(machine_config &config); + void spelunkr(machine_config &config); + void ldrun(machine_config &config); + void kidniki(machine_config &config); }; diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 1bb70ba37d5..cbc13a275d1 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -196,4 +196,20 @@ public: void majtitle_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); void copy_le(uint16_t *dest, const uint8_t *src, uint8_t bytes); void install_protection_handler(const uint8_t *code,const uint8_t *crc); + void m72_base(machine_config &config); + void m72_audio_chips(machine_config &config); + void m72_xmultipl(machine_config &config); + void m72_dbreed(machine_config &config); + void cosmccop(machine_config &config); + void poundfor(machine_config &config); + void m72(machine_config &config); + void m81_hharry(machine_config &config); + void m81_xmultipl(machine_config &config); + void kengo(machine_config &config); + void m81_dbreed(machine_config &config); + void m72_8751(machine_config &config); + void hharryu(machine_config &config); + void rtype2(machine_config &config); + void m82(machine_config &config); + void rtype(machine_config &config); }; diff --git a/src/mame/includes/m79amb.h b/src/mame/includes/m79amb.h index 7b179fb1514..e902b15d389 100644 --- a/src/mame/includes/m79amb.h +++ b/src/mame/includes/m79amb.h @@ -31,6 +31,7 @@ public: DECLARE_WRITE8_MEMBER(m79amb_8000_w); DECLARE_WRITE8_MEMBER(m79amb_8003_w); required_device m_maincpu; + void m79amb(machine_config &config); }; /*----------- defined in audio/m79amb.c -----------*/ diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h index 3e60a5a56b1..81bf42ea1ea 100644 --- a/src/mame/includes/m90.h +++ b/src/mame/includes/m90.h @@ -70,4 +70,14 @@ public: void bomblord_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect); void dynablsb_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect); void markdirty(tilemap_t *tmap,int page,offs_t offset); + void m90(machine_config &config); + void bbmanw(machine_config &config); + void hasamu(machine_config &config); + void bombrman(machine_config &config); + void riskchal(machine_config &config); + void bomblord(machine_config &config); + void bbmanwj(machine_config &config); + void dynablsb(machine_config &config); + void matchit2(machine_config &config); + void quizf1(machine_config &config); }; diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index e5ef53a24b2..40ebf0508a1 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -106,6 +106,22 @@ public: void m92_update_scroll_positions(); void m92_draw_tiles(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect); + void m92(machine_config &config); + void inthunt(machine_config &config); + void lethalth(machine_config &config); + void ppan(machine_config &config); + void hook(machine_config &config); + void psoldier(machine_config &config); + void rtypeleo(machine_config &config); + void gunforc2(machine_config &config); + void nbbatman2bl(machine_config &config); + void bmaster(machine_config &config); + void nbbatman(machine_config &config); + void uccops(machine_config &config); + void dsoccr94j(machine_config &config); + void gunforce(machine_config &config); + void majtitl2(machine_config &config); + void mysticri(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h index 9a8baeb4380..8b848cf6dd3 100644 --- a/src/mame/includes/mac.h +++ b/src/mame/includes/mac.h @@ -387,6 +387,36 @@ public: DECLARE_WRITE_LINE_MEMBER(mac_scsi_irq); DECLARE_WRITE_LINE_MEMBER(mac_asc_irq); + void mac512ke(machine_config &config); + void macplus(machine_config &config); + void maclc(machine_config &config); + void macpb170(machine_config &config); + void macclasc(machine_config &config); + void maciisi(machine_config &config); + void maclc2(machine_config &config); + void macse(machine_config &config); + void maclc3(machine_config &config); + void macpd210(machine_config &config); + void maciici(machine_config &config); + void macprtb(machine_config &config); + void maciix(machine_config &config); + void maclc520(machine_config &config); + void pwrmac(machine_config &config); + void maciivx(machine_config &config); + void maccclas(machine_config &config); + void maciivi(machine_config &config); + void macpb160(machine_config &config); + void maciicx(machine_config &config); + void macqd700(machine_config &config); + void macse30(machine_config &config); + void macpb180(machine_config &config); + void macpb145(machine_config &config); + void macpb180c(machine_config &config); + void maciifx(machine_config &config); + void macpb140(machine_config &config); + void macclas2(machine_config &config); + void macii(machine_config &config); + void maciihmu(machine_config &config); private: int has_adb(); void adb_reset(); diff --git a/src/mame/includes/macpci.h b/src/mame/includes/macpci.h index 08c93a93c7e..156285f5ebd 100644 --- a/src/mame/includes/macpci.h +++ b/src/mame/includes/macpci.h @@ -139,6 +139,7 @@ public: DECLARE_READ64_MEMBER ( unk2_r ); DECLARE_DRIVER_INIT(pippin); + void pippin(machine_config &config); private: // wait states for accessing the VIA int m_via_cycles; diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index 130c3c01449..dd68f517820 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -101,4 +101,6 @@ public: void draw_sprites(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void draw_layer(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int layer, int linem, int pri); DECLARE_WRITE_LINE_MEMBER(irqhandler); + void quizmoon(machine_config &config); + void macrossp(machine_config &config); }; diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h index 8c1f4f74efd..29ea08483e8 100644 --- a/src/mame/includes/madalien.h +++ b/src/mame/includes/madalien.h @@ -83,10 +83,9 @@ public: required_device m_palette; required_device m_soundlatch; required_device m_soundlatch2; + void madalien(machine_config &config); + void madalien_video(machine_config &config); }; -/*----------- defined in video/madalien.c -----------*/ - -MACHINE_CONFIG_EXTERN( madalien_video ); /*----------- defined in audio/madalien.c -----------*/ diff --git a/src/mame/includes/madmotor.h b/src/mame/includes/madmotor.h index 35d39eed85e..81c3f28d8dd 100644 --- a/src/mame/includes/madmotor.h +++ b/src/mame/includes/madmotor.h @@ -45,4 +45,5 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_madmotor(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void madmotor(machine_config &config); }; diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h index 27f75b3bec9..1636b84aae9 100644 --- a/src/mame/includes/magmax.h +++ b/src/mame/includes/magmax.h @@ -51,4 +51,5 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void magmax(machine_config &config); }; diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h index 7d14bd88333..d7656bdb986 100644 --- a/src/mame/includes/mainevt.h +++ b/src/mame/includes/mainevt.h @@ -63,4 +63,6 @@ public: K052109_CB_MEMBER(dv_tile_callback); K051960_CB_MEMBER(mainevt_sprite_callback); K051960_CB_MEMBER(dv_sprite_callback); + void devstors(machine_config &config); + void mainevt(machine_config &config); }; diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h index 68217553926..2774d1034d2 100644 --- a/src/mame/includes/mainsnk.h +++ b/src/mame/includes/mainsnk.h @@ -46,4 +46,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int scrollx, int scrolly ); + void mainsnk(machine_config &config); }; diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index a5493ef4472..198e3ec4e29 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -55,4 +55,6 @@ public: virtual void machine_reset() override; DECLARE_PALETTE_INIT(malzak); uint32_t screen_update_malzak(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void malzak(machine_config &config); + void malzak2(machine_config &config); }; diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index 1c5193f4a64..a6adb536bb6 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -82,6 +82,16 @@ public: void mappy_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t *spriteram_base); void phozon_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t *spriteram_base); + void mappy_common(machine_config &config); + void mappy(machine_config &config); + void phozon(machine_config &config); + void motos(machine_config &config); + void grobda(machine_config &config); + void digdug2(machine_config &config); + void pacnpal(machine_config &config); + void superpac_common(machine_config &config); + void superpac(machine_config &config); + void todruaga(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h index bc6c08d941a..5a64f9c7618 100644 --- a/src/mame/includes/marineb.h +++ b/src/mame/includes/marineb.h @@ -53,4 +53,11 @@ public: INTERRUPT_GEN_MEMBER(marineb_vblank_irq); INTERRUPT_GEN_MEMBER(wanted_vblank_irq); void set_tilemap_scrolly( int cols ); + void springer(machine_config &config); + void wanted(machine_config &config); + void hopprobo(machine_config &config); + void marineb(machine_config &config); + void bcruzm12(machine_config &config); + void hoccer(machine_config &config); + void changes(machine_config &config); }; diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index 3bfc327a97d..36d6730059d 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -138,11 +138,11 @@ public: DECLARE_WRITE8_MEMBER(memory_write_byte); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void set_ea(int ea); + void mario_base(machine_config &config); + void masao(machine_config &config); + void masao_audio(machine_config &config); + void mario(machine_config &config); + void mario_audio(machine_config &config); }; -/*----------- defined in audio/mario.c -----------*/ - -MACHINE_CONFIG_EXTERN( mario_audio ); -MACHINE_CONFIG_EXTERN( masao_audio ); - #endif /*MARIO_H_*/ diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h index fafe43d1f84..e8a24ecac9e 100644 --- a/src/mame/includes/markham.h +++ b/src/mame/includes/markham.h @@ -36,4 +36,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void markham(machine_config &config); }; diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index 20d51f0a958..094f7091be4 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -63,4 +63,6 @@ public: DECLARE_PALETTE_INIT(matmania); uint32_t screen_update_matmania(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_maniach(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void matmania(machine_config &config); + void maniach(machine_config &config); }; diff --git a/src/mame/includes/maygay1b.h b/src/mame/includes/maygay1b.h index 4dd2ae4f0fc..d8536adebe4 100644 --- a/src/mame/includes/maygay1b.h +++ b/src/mame/includes/maygay1b.h @@ -147,9 +147,8 @@ public: virtual void machine_reset() override; void cpu0_firq(int data); void cpu0_nmi(); + void maygay_m1_no_oki(machine_config &config); + void maygay_m1(machine_config &config); + void maygay_m1_nec(machine_config &config); + void maygay_m1_empire(machine_config &config); }; - -MACHINE_CONFIG_EXTERN( maygay_m1 ); -MACHINE_CONFIG_EXTERN( maygay_m1_nec ); -MACHINE_CONFIG_EXTERN( maygay_m1_no_oki ); -MACHINE_CONFIG_EXTERN( maygay_m1_empire ); diff --git a/src/mame/includes/mbc55x.h b/src/mame/includes/mbc55x.h index e463e5688f0..98412c6d6d6 100644 --- a/src/mame/includes/mbc55x.h +++ b/src/mame/includes/mbc55x.h @@ -159,6 +159,7 @@ public: uint32_t m_debug_machine; + void mbc55x(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h index 771606aa25f..d2cf1c3f952 100644 --- a/src/mame/includes/mbee.h +++ b/src/mame/includes/mbee.h @@ -122,6 +122,15 @@ public: MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr); required_device m_palette; + void mbee56(machine_config &config); + void mbeeppc(machine_config &config); + void mbee128(machine_config &config); + void mbee256(machine_config &config); + void mbee(machine_config &config); + void mbeett(machine_config &config); + void mbeeic(machine_config &config); + void mbeepc(machine_config &config); + void mbee128p(machine_config &config); private: uint8_t *m_p_videoram; uint8_t *m_p_gfxram; diff --git a/src/mame/includes/mc1502.h b/src/mame/includes/mc1502.h index 98dfc576d78..9feb90e2fe6 100644 --- a/src/mame/includes/mc1502.h +++ b/src/mame/includes/mc1502.h @@ -81,6 +81,7 @@ public: DECLARE_WRITE8_MEMBER(mc1502_kppi_portb_w); DECLARE_WRITE8_MEMBER(mc1502_kppi_portc_w); + void mc1502(machine_config &config); private: int m_pit_out2; }; diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h index 6b40d3f54c4..d56031531aa 100644 --- a/src/mame/includes/mcatadv.h +++ b/src/mame/includes/mcatadv.h @@ -59,4 +59,6 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank_mcatadv); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); void mcatadv_draw_tilemap_part( screen_device &screen, uint16_t* current_scroll, uint16_t* current_videoram1, int i, tilemap_t* current_tilemap, bitmap_ind16 &bitmap, const rectangle &cliprect ); + void nost(machine_config &config); + void mcatadv(machine_config &config); }; diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h index 2ac0ea3a748..0a800da08f6 100644 --- a/src/mame/includes/mcr.h +++ b/src/mame/includes/mcr.h @@ -77,6 +77,13 @@ public: uint32_t screen_update_mcr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(mcr_interrupt); + void mcr_91490_tcs(machine_config &config); + void mcr_91490_snt(machine_config &config); + void mcr_91490(machine_config &config); + void mcr_90009(machine_config &config); + void mcr_90010_tt(machine_config &config); + void mcr_91475(machine_config &config); + void mcr_90010(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -141,6 +148,7 @@ public: DECLARE_DRIVER_INIT(dpoker); + void mcr_90009_dp(machine_config &config); private: uint8_t m_coin_status; uint8_t m_output; @@ -173,6 +181,7 @@ public: DECLARE_DRIVER_INIT(nflfoot); + void mcr_91490_ipu(machine_config &config); protected: virtual void machine_start() override; diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h index 66f0a330947..6fc1d3f1aa2 100644 --- a/src/mame/includes/mcr3.h +++ b/src/mame/includes/mcr3.h @@ -64,6 +64,12 @@ public: uint32_t screen_update_mcr3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_spyhunt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void mcrmono(machine_config &config); + void maxrpm(machine_config &config); + void mcrsc_csd(machine_config &config); + void mono_tcs(machine_config &config); + void mcrscroll(machine_config &config); + void mono_sg(machine_config &config); protected: virtual void video_start() override; diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index 8dbdf8044d8..c30639e5a0d 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -84,6 +84,13 @@ public: std::unique_ptr m_srcdata0; std::unique_ptr m_srcdata2; + void mcr68(machine_config &config); + void intlaser(machine_config &config); + void xenophob(machine_config &config); + void spyhunt2(machine_config &config); + void trisport(machine_config &config); + void pigskin(machine_config &config); + void archrivl(machine_config &config); private: required_device m_ptm; }; diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index 4d4347de7c1..8a421ab94b9 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -71,4 +71,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip); void meadows_sh_update(); SAMPLES_START_CB_MEMBER(meadows_sh_start); + void bowl3d(machine_config &config); + void meadows(machine_config &config); + void minferno(machine_config &config); }; diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index 72f3efaec82..e189ed69d13 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -28,12 +28,6 @@ INPUT_PORTS_EXTERN( megadri6 ); INPUT_PORTS_EXTERN( ssf2mdb ); INPUT_PORTS_EXTERN( mk3mdb ); -MACHINE_CONFIG_EXTERN( megadriv_timers ); -MACHINE_CONFIG_EXTERN( md_ntsc ); -MACHINE_CONFIG_EXTERN( md_pal ); -MACHINE_CONFIG_EXTERN( md_bootleg ); // for topshoot.c & hshavoc.c -MACHINE_CONFIG_EXTERN( dcat16_megadriv_base ); - struct genesis_z80_vars { int z80_is_reset; @@ -136,6 +130,12 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank_megadriv); DECLARE_WRITE8_MEMBER(megadriv_tas_callback); + + void megadriv_timers(machine_config &config); + void md_ntsc(machine_config &config); + void md_pal(machine_config &config); + void md_bootleg(machine_config &config); + void dcat16_megadriv_base(machine_config &config); }; class md_cons_state : public md_base_state @@ -183,4 +183,18 @@ public: void install_tmss(); DECLARE_READ16_MEMBER(tmss_r); DECLARE_WRITE16_MEMBER(tmss_swap_w); + void genesis_32x_scd(machine_config &config); + void mdj_32x_scd(machine_config &config); + void ms_megadpal(machine_config &config); + void dcat16_megadriv_base(machine_config &config); + void dcat16_megadriv(machine_config &config); + void md_32x_scd(machine_config &config); + void mdj_32x(machine_config &config); + void ms_megadriv(machine_config &config); + void mdj_scd(machine_config &config); + void md_32x(machine_config &config); + void genesis_32x(machine_config &config); + void md_scd(machine_config &config); + void genesis_scd(machine_config &config); + void genesis_tmss(machine_config &config); }; diff --git a/src/mame/includes/megadrvb.h b/src/mame/includes/megadrvb.h index 8b1f6b1c11a..97f288f03ae 100644 --- a/src/mame/includes/megadrvb.h +++ b/src/mame/includes/megadrvb.h @@ -32,4 +32,10 @@ public: DECLARE_MACHINE_START(md_bootleg) { MACHINE_START_CALL_MEMBER(megadriv); m_vdp->stop_timers(); } DECLARE_MACHINE_START(md_6button); + void megadrvb(machine_config &config); + void megadrvb_6b(machine_config &config); + void md_bootleg(machine_config &config); + void puckpkmn(machine_config &config); + void jzth(machine_config &config); + void puckpkmna(machine_config &config); }; diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index 993ac96b0aa..670c0aafd77 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -172,4 +172,16 @@ public: void rodland_gfx_unmangle(const char *region); void jitsupro_gfx_unmangle(const char *region); void stdragona_gfx_unmangle(const char *region); + void system_A_soldam(machine_config &config); + void system_B_monkelf(machine_config &config); + void system_A_iganinju(machine_config &config); + void system_A_hachoo(machine_config &config); + void kickoffb(machine_config &config); + void system_D(machine_config &config); + void system_C(machine_config &config); + void system_Bbl(machine_config &config); + void system_A(machine_config &config); + void system_B(machine_config &config); + void system_B_hayaosi1(machine_config &config); + void system_Z(machine_config &config); }; diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h index 4d868e682b7..65c4334ab73 100644 --- a/src/mame/includes/megazone.h +++ b/src/mame/includes/megazone.h @@ -62,4 +62,5 @@ public: DECLARE_PALETTE_INIT(megazone); uint32_t screen_update_megazone(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); + void megazone(machine_config &config); }; diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index 62b78871823..2b5fe569d79 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -102,4 +102,6 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); uint8_t collision_check( rectangle& rect ); DECLARE_WRITE_LINE_MEMBER(rougien_adpcm_int); + void rougien(machine_config &config); + void mermaid(machine_config &config); }; diff --git a/src/mame/includes/metalmx.h b/src/mame/includes/metalmx.h index 10588d7f703..8ceb16e8d51 100644 --- a/src/mame/includes/metalmx.h +++ b/src/mame/includes/metalmx.h @@ -56,4 +56,5 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_metalmx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void metalmx(machine_config &config); }; diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h index 7acb8cf34c7..26f31944ab9 100644 --- a/src/mame/includes/metlclsh.h +++ b/src/mame/includes/metlclsh.h @@ -58,4 +58,5 @@ public: virtual void video_start() override; uint32_t screen_update_metlclsh(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void metlclsh(machine_config &config); }; diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index 01cd5f82d81..d3fcd89173a 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -109,6 +109,41 @@ public: IRQ_CALLBACK_MEMBER(metro_irq_callback); DECLARE_READ_LINE_MEMBER(metro_rxd_r); + void i4100_config(machine_config &config); + void i4100_config_360x224(machine_config &config); + void i4220_config(machine_config &config); + void i4220_config_320x240(machine_config &config); + void i4220_config_304x224(machine_config &config); + void i4300_config(machine_config &config); + void i4300_config_384x224(machine_config &config); + void i4300_config_320x240(machine_config &config); + void metro_upd7810_sound(machine_config &config); + void daitorid_upd7810_sound(machine_config &config); + void poitto(machine_config &config); + void blzntrnd(machine_config &config); + void _3kokushi(machine_config &config); + void mouja(machine_config &config); + void toride2g(machine_config &config); + void karatour(machine_config &config); + void skyalert(machine_config &config); + void gakusai(machine_config &config); + void batlbubl(machine_config &config); + void pururun(machine_config &config); + void vmetal(machine_config &config); + void daitorid(machine_config &config); + void pangpoms(machine_config &config); + void dokyusp(machine_config &config); + void dokyusei(machine_config &config); + void daitoa(machine_config &config); + void lastfort(machine_config &config); + void puzzlet(machine_config &config); + void gakusai2(machine_config &config); + void balcube(machine_config &config); + void msgogo(machine_config &config); + void gstrik2(machine_config &config); + void lastforg(machine_config &config); + void bangball(machine_config &config); + void dharma(machine_config &config); protected: virtual void machine_start() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h index 5ac2e49ac33..1f63b9146b0 100644 --- a/src/mame/includes/mexico86.h +++ b/src/mame/includes/mexico86.h @@ -71,4 +71,7 @@ public: INTERRUPT_GEN_MEMBER(mexico86_m68705_interrupt); void mcu_simulate( ); bool mcu_coin_counter_w(bool condition); + void knightb(machine_config &config); + void mexico86(machine_config &config); + void kikikai(machine_config &config); }; diff --git a/src/mame/includes/mhavoc.h b/src/mame/includes/mhavoc.h index b0bfadbafb5..559e35db7f0 100644 --- a/src/mame/includes/mhavoc.h +++ b/src/mame/includes/mhavoc.h @@ -74,4 +74,7 @@ public: virtual void machine_reset() override; TIMER_CALLBACK_MEMBER(delayed_gamma_w); TIMER_DEVICE_CALLBACK_MEMBER(mhavoc_cpu_irq_clock); + void alphaone(machine_config &config); + void mhavoc(machine_config &config); + void mhavocrv(machine_config &config); }; diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index 528e4b91218..ddf654410d7 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -183,6 +183,8 @@ public: void draw_triangles(uint32_t attr); + void micro3d(machine_config &config); + void botss11(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; diff --git a/src/mame/includes/micronic.h b/src/mame/includes/micronic.h index 0b1ef8cda22..18750a463e2 100644 --- a/src/mame/includes/micronic.h +++ b/src/mame/includes/micronic.h @@ -82,6 +82,7 @@ public: uint8_t m_status_flag; DECLARE_PALETTE_INIT(micronic); + void micronic(machine_config &config); protected: required_memory_bank m_bank1; required_ioport m_bit0; diff --git a/src/mame/includes/microtan.h b/src/mame/includes/microtan.h index 37e957803d8..6bc91590135 100644 --- a/src/mame/includes/microtan.h +++ b/src/mame/includes/microtan.h @@ -96,6 +96,7 @@ public: DECLARE_SNAPSHOT_LOAD_MEMBER( microtan ); DECLARE_QUICKLOAD_LOAD_MEMBER( microtan ); + void microtan(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h index 3e6ad93e2c9..87e2c037780 100644 --- a/src/mame/includes/midtunit.h +++ b/src/mame/includes/midtunit.h @@ -115,6 +115,9 @@ public: uint8_t m_gfx_rom_large; + void tunit_core(machine_config &config); + void tunit_adpcm(machine_config &config); + void tunit_dcs(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h index d5afdf11a97..1746528a372 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -167,6 +167,11 @@ public: required_shared_ptr m_generic_paletteram_32; void postload(); + void midvcommon(machine_config &config); + void crusnwld(machine_config &config); + void midvplus(machine_config &config); + void offroadc(machine_config &config); + void midvunit(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/midwunit.h b/src/mame/includes/midwunit.h index 618ef624f2c..98e32488df6 100644 --- a/src/mame/includes/midwunit.h +++ b/src/mame/includes/midwunit.h @@ -62,4 +62,7 @@ public: void register_state_saving(); void init_wunit_generic(); void init_mk3_common(); + void wunit(machine_config &config); + void wunit_picemu(machine_config &config); + void wunit_picsim(machine_config &config); }; diff --git a/src/mame/includes/midxunit.h b/src/mame/includes/midxunit.h index 07e3142c2a6..f4caf60bbc6 100644 --- a/src/mame/includes/midxunit.h +++ b/src/mame/includes/midxunit.h @@ -37,6 +37,7 @@ public: void register_state_saving(); TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_update); + void midxunit(machine_config &config); private: required_shared_ptr m_nvram; required_device m_midway_serial_pic; diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h index ce4620cbcea..c2f012b6401 100644 --- a/src/mame/includes/midyunit.h +++ b/src/mame/includes/midyunit.h @@ -149,6 +149,15 @@ public: TIMER_CALLBACK_MEMBER(dma_callback); TIMER_CALLBACK_MEMBER(autoerase_line); + void term2(machine_config &config); + void yunit_cvsd_4bit_fast(machine_config &config); + void yunit_adpcm_6bit_fast(machine_config &config); + void yunit_cvsd_6bit_slow(machine_config &config); + void yunit_cvsd_4bit_slow(machine_config &config); + void mkyawdim(machine_config &config); + void yunit_core(machine_config &config); + void zunit(machine_config &config); + void yunit_adpcm_6bit_faster(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; void dma_draw(uint16_t command); diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h index 340286ff7c8..2f17721b2cd 100644 --- a/src/mame/includes/midzeus.h +++ b/src/mame/includes/midzeus.h @@ -75,6 +75,10 @@ public: INTERRUPT_GEN_MEMBER(display_irq); TIMER_CALLBACK_MEMBER(display_irq_off); TIMER_CALLBACK_MEMBER(invasn_gun_callback); + void midzeus(machine_config &config); + void midzeus2(machine_config &config); + void invasn(machine_config &config); + void mk4(machine_config &config); private: void exit_handler(); void zeus_pointer_w(uint32_t which, uint32_t data, bool logit); diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h index 87f934888d8..0e511f311f3 100644 --- a/src/mame/includes/mikie.h +++ b/src/mame/includes/mikie.h @@ -52,4 +52,5 @@ public: uint32_t screen_update_mikie(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void mikie(machine_config &config); }; diff --git a/src/mame/includes/mikro80.h b/src/mame/includes/mikro80.h index a69afdf4482..64688b9d8a9 100644 --- a/src/mame/includes/mikro80.h +++ b/src/mame/includes/mikro80.h @@ -61,6 +61,9 @@ public: virtual void video_start() override; uint32_t screen_update_mikro80(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void kristall(machine_config &config); + void radio99(machine_config &config); + void mikro80(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; required_device m_ppi8255; diff --git a/src/mame/includes/mikromik.h b/src/mame/includes/mikromik.h index ed7791840ea..2024fefd5ad 100644 --- a/src/mame/includes/mikromik.h +++ b/src/mame/includes/mikromik.h @@ -126,12 +126,10 @@ public: I8275_DRAW_CHARACTER_MEMBER( crtc_display_pixels ); UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); DECLARE_PALETTE_INIT( mm1 ); + void mm1(machine_config &config); + void mm1m6(machine_config &config); + void mm1m6_video(machine_config &config); + void mm1m7(machine_config &config); }; - -//----------- defined in video/mikromik.c ----------- - -MACHINE_CONFIG_EXTERN( mm1m6_video ); - - #endif diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index f244ab7df1e..904112808a5 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -133,4 +133,12 @@ public: void configure_banks(void (*decode)(uint8_t *src, uint8_t *dst, int size)); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_WRITE_LINE_MEMBER(spangbl_adpcm_int); + void pkladiesbl(machine_config &config); + void mstworld(machine_config &config); + void mgakuen(machine_config &config); + void marukin(machine_config &config); + void pang(machine_config &config); + void pangba(machine_config &config); + void pangnv(machine_config &config); + void spangbl(machine_config &config); }; diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index 7ec385f675e..2165b582f90 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -49,4 +49,5 @@ public: uint32_t screen_update_mjkjidai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); + void mjkjidai(machine_config &config); }; diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index 909437f0572..d53e7dcc184 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -182,6 +182,10 @@ public: lightparam_t lightparams[32]; }; + void model1(machine_config &config); + void swa(machine_config &config); + void netmerc(machine_config &config); + void model1_vr(machine_config &config); private: // Machine void irq_raise(int level); diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index 7909a99dd5c..0b016debe87 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -248,6 +248,25 @@ public: void copro_fifoout_push(device_t *device, uint32_t data,uint32_t offset,uint32_t mem_mask); void model2_3d_frame_end( bitmap_rgb32 &bitmap, const rectangle &cliprect ); + + void daytona(machine_config &config); + void indy500(machine_config &config); + void manxtt(machine_config &config); + void manxttdx(machine_config &config); + void model2a(machine_config &config); + void model2a_0229(machine_config &config); + void model2a_5881(machine_config &config); + void model2b(machine_config &config); + void model2b_0229(machine_config &config); + void model2b_5881(machine_config &config); + void model2c(machine_config &config); + void model2c_5881(machine_config &config); + void model2o(machine_config &config); + void overrev2c(machine_config &config); + void rchase2(machine_config &config); + void sj25_0207_01(machine_config &config); + void srallyc(machine_config &config); + void stcc(machine_config &config); }; diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index 37cc79d900b..9b4dec36ec7 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -340,4 +340,11 @@ public: int first_read; uint16_t crypt_read_callback(uint32_t addr); + void model3_21_5881(machine_config &config); + void model3_20_5881(machine_config &config); + void model3_15(machine_config &config); + void model3_10(machine_config &config); + void model3_20(machine_config &config); + void model3_21(machine_config &config); + void scud(machine_config &config); }; diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h index 45dc70621a6..4ba77d4de0b 100644 --- a/src/mame/includes/momoko.h +++ b/src/mame/includes/momoko.h @@ -54,4 +54,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void momoko(machine_config &config); }; diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h index aa7bd468cbf..e1769868bd4 100644 --- a/src/mame/includes/moo.h +++ b/src/mame/includes/moo.h @@ -84,4 +84,7 @@ public: void moo_objdma(); K056832_CB_MEMBER(tile_callback); K053246_CB_MEMBER(sprite_callback); + void bucky(machine_config &config); + void moo(machine_config &config); + void moobl(machine_config &config); }; diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h index c5e90219aff..62ee23377fd 100644 --- a/src/mame/includes/mosaic.h +++ b/src/mame/includes/mosaic.h @@ -46,4 +46,6 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void mosaic(machine_config &config); + void gfire2(machine_config &config); }; diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h index d27d97b145c..c252ab45a0e 100644 --- a/src/mame/includes/mouser.h +++ b/src/mame/includes/mouser.h @@ -49,4 +49,5 @@ public: uint32_t screen_update_mouser(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(mouser_nmi_interrupt); INTERRUPT_GEN_MEMBER(mouser_sound_nmi_assert); + void mouser(machine_config &config); }; diff --git a/src/mame/includes/mpf1.h b/src/mame/includes/mpf1.h index ec2807365cb..732bae5ba47 100644 --- a/src/mame/includes/mpf1.h +++ b/src/mame/includes/mpf1.h @@ -75,6 +75,9 @@ public: DECLARE_DRIVER_INIT(mpf1); TIMER_CALLBACK_MEMBER(led_refresh); TIMER_DEVICE_CALLBACK_MEMBER(check_halt_callback); + void mpf1p(machine_config &config); + void mpf1b(machine_config &config); + void mpf1(machine_config &config); }; #endif // MAME_INCLUDES_MPF1_H diff --git a/src/mame/includes/mpu4.h b/src/mame/includes/mpu4.h index ec7a0396b78..4d3dae267f5 100644 --- a/src/mame/includes/mpu4.h +++ b/src/mame/includes/mpu4.h @@ -259,6 +259,43 @@ public: DECLARE_WRITE_LINE_MEMBER(reel5_optic_cb) { if (state) m_optic_pattern |= 0x20; else m_optic_pattern &= ~0x20; } DECLARE_WRITE_LINE_MEMBER(reel6_optic_cb) { if (state) m_optic_pattern |= 0x40; else m_optic_pattern &= ~0x40; } DECLARE_WRITE_LINE_MEMBER(reel7_optic_cb) { if (state) m_optic_pattern |= 0x80; else m_optic_pattern &= ~0x80; } + void bwboki(machine_config &config); + void mod2(machine_config &config); + void mod2_alt(machine_config &config); + void mod4oki(machine_config &config); + void mod4oki_5r(machine_config &config); + void mod4oki_alt(machine_config &config); + void mod4yam(machine_config &config); + void mpu4_common(machine_config &config); + void mpu4_common2(machine_config &config); + void mpu4crys(machine_config &config); + void mpu4_std_3reel(machine_config &config); + void mpu4_type2_3reel(machine_config &config); + void mpu4_type3_3reel(machine_config &config); + void mpu4_type4_3reel(machine_config &config); + void mpu4_bwb_3reel(machine_config &config); + void mpu4_std_4reel(machine_config &config); + void mpu4_type2_4reel(machine_config &config); + void mpu4_type3_4reel(machine_config &config); + void mpu4_type4_4reel(machine_config &config); + void mpu4_bwb_4reel(machine_config &config); + void mpu4_std_5reel(machine_config &config); + void mpu4_type2_5reel(machine_config &config); + void mpu4_type3_5reel(machine_config &config); + void mpu4_type4_5reel(machine_config &config); + void mpu4_bwb_5reel(machine_config &config); + void mpu4_std_6reel(machine_config &config); + void mpu4_type2_6reel(machine_config &config); + void mpu4_type3_6reel(machine_config &config); + void mpu4_type4_6reel(machine_config &config); + void mpu4_bwb_6reel(machine_config &config); + void mpu4_std_7reel(machine_config &config); + void mpu4_type2_7reel(machine_config &config); + void mpu4_type3_7reel(machine_config &config); + void mpu4_type4_7reel(machine_config &config); + void mpu4_bwb_7reel(machine_config &config); + void mpu4base(machine_config &config); + protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -369,12 +406,4 @@ protected: const bwb_chr_table* m_bwb_chr_table1; }; -MACHINE_CONFIG_EXTERN( mpu4_common ); -MACHINE_CONFIG_EXTERN( mpu4_common2 ); - -MACHINE_CONFIG_EXTERN( mod2 ); -MACHINE_CONFIG_EXTERN( mod4oki_alt ); -MACHINE_CONFIG_EXTERN( mod4oki_5r ); -MACHINE_CONFIG_EXTERN( mod2_alt ); - INPUT_PORTS_EXTERN( mpu4 ); diff --git a/src/mame/includes/mpz80.h b/src/mame/includes/mpz80.h index ef4c3d290a0..3e14b77513b 100644 --- a/src/mame/includes/mpz80.h +++ b/src/mame/includes/mpz80.h @@ -92,6 +92,7 @@ public: int m_trap_stop; int m_trap_aux; DECLARE_DRIVER_INIT(mpz80); + void mpz80(machine_config &config); }; #endif // MAME_INCLUDES_MPZ80_H diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index 4c8e502f3ec..137262b52d1 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -42,4 +42,6 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void mrlo(machine_config &config); + void mrdo(machine_config &config); }; diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index f801b6a57e3..176553f259a 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -49,4 +49,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(mrflea_slave_interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_background( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void mrflea(machine_config &config); }; diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h index 8d6e0b2474d..3297fd8e791 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -35,4 +35,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void mrjong(machine_config &config); }; diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index a70eac6589e..5238a24e7bf 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -123,5 +123,7 @@ public: required_device m_gfxdecode; optional_device m_screen; required_device m_palette; + void ms32(machine_config &config); + void f1superb(machine_config &config); optional_device m_soundlatch; //not for bnstars.cpp }; diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h index aedb1621046..603ab2ed92c 100644 --- a/src/mame/includes/msisaac.h +++ b/src/mame/includes/msisaac.h @@ -94,4 +94,5 @@ public: uint32_t screen_update_msisaac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(nmi_callback); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void msisaac(machine_config &config); }; diff --git a/src/mame/includes/msx.h b/src/mame/includes/msx.h index a0fa175eef5..d14f716d71e 100644 --- a/src/mame/includes/msx.h +++ b/src/mame/includes/msx.h @@ -45,70 +45,70 @@ #define MCFG_MSX_LAYOUT_ROM(_tag, _prim, _sec, _page, _numpages, _region, _offset) \ MCFG_MSX_SLOT_ROM_ADD(_tag, _page, _numpages, _region, _offset) \ - msx_state::install_slot_pages(*owner, _prim, _sec, _page, _numpages, device); + msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device); #define MCFG_MSX_LAYOUT_RAM(_tag, _prim, _sec, _page, _numpages) \ MCFG_MSX_SLOT_RAM_ADD(_tag, _page, _numpages) \ - msx_state::install_slot_pages(*owner, _prim, _sec, _page, _numpages, device); + msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device); #define MCFG_MSX_LAYOUT_CARTRIDGE(_tag, _prim, _sec) \ MCFG_MSX_SLOT_CARTRIDGE_ADD(_tag, WRITELINE(msx_state, msx_irq_source1)) \ - msx_state::install_slot_pages(*owner, _prim, _sec, 0, 4, device); + msx_state::install_slot_pages(*this, _prim, _sec, 0, 4, device); #define MCFG_MSX_LAYOUT_YAMAHA_EXPANSION(_tag, _prim, _sec, _default) \ MCFG_MSX_SLOT_YAMAHA_EXPANSION_ADD(_tag, WRITELINE(msx_state, msx_irq_source2), _default) \ - msx_state::install_slot_pages(*owner, _prim, _sec, 0, 4, device); + msx_state::install_slot_pages(*this, _prim, _sec, 0, 4, device); #define MCFG_MSX_LAYOUT_RAM_MM(_tag, _prim, _sec, _total_size) \ MCFG_MSX_SLOT_RAM_MM_ADD(_tag, _total_size) \ - msx_state::install_slot_pages(*owner, _prim, _sec, 0, 4, device); + msx_state::install_slot_pages(*this, _prim, _sec, 0, 4, device); #define MCFG_MSX_RAMIO_SET_BITS(_ramio_set_bits) \ MCFG_MSX_SLOT_RAMM_SET_RAMIO_BITS(_ramio_set_bits) #define MCFG_MSX_LAYOUT_DISK1(_tag, _prim, _sec, _page, _numpages, _region, _offset) \ MCFG_MSX_SLOT_DISK1_ADD(_tag, _page, _numpages, _region, _offset, "fdc", "fdc:0", "fdc:1") \ - msx_state::install_slot_pages(*owner, _prim, _sec, _page, _numpages + 1, device); /* Memory mapped FDC registers are also accessible through page 2 */ + msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages + 1, device); /* Memory mapped FDC registers are also accessible through page 2 */ #define MCFG_MSX_LAYOUT_DISK2(_tag, _prim, _sec, _page, _numpages, _region, _offset) \ MCFG_MSX_SLOT_DISK2_ADD(_tag, _page, _numpages, _region, _offset, "fdc", "fdc:0", "fdc:1") \ - msx_state::install_slot_pages(*owner, _prim, _sec, _page, _numpages + 1, device); /* Memory mapped FDC registers are also accessible through page 2 */ + msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages + 1, device); /* Memory mapped FDC registers are also accessible through page 2 */ #define MCFG_MSX_LAYOUT_DISK3(_tag, _prim, _sec, _page, _numpages, _region, _offset) \ MCFG_MSX_SLOT_DISK3_ADD(_tag, _page, _numpages, _region, _offset, "fdc", "fdc:0", "fdc:1") \ - msx_state::install_slot_pages(*owner, _prim, _sec, _page, _numpages, device); + msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device); #define MCFG_MSX_LAYOUT_DISK4(_tag, _prim, _sec, _page, _numpages, _region, _offset) \ MCFG_MSX_SLOT_DISK4_ADD(_tag, _page, _numpages, _region, _offset, "fdc", "fdc:0", "fdc:1") \ - msx_state::install_slot_pages(*owner, _prim, _sec, _page, _numpages, device); + msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device); #define MCFG_MSX_LAYOUT_DISK5(_tag, _prim, _sec, _page, _numpages, _region, _offset) \ MCFG_MSX_SLOT_DISK5_ADD(_tag, _page, _numpages, _region, _offset, "fdc", "fdc:0", "fdc:1", "fdc:2", "fdc:3") \ - msx_state::install_slot_pages(*owner, _prim, _sec, _page, _numpages, device); + msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device); #define MCFG_MSX_LAYOUT_DISK6(_tag, _prim, _sec, _page, _numpages, _region, _offset) \ MCFG_MSX_SLOT_DISK6_ADD(_tag, _page, _numpages, _region, _offset, "fdc", "fdc:0", "fdc:1") \ - msx_state::install_slot_pages(*owner, _prim, _sec, _page, _numpages, device); + msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device); #define MCFG_MSX_LAYOUT_MUSIC(_tag, _prim, _sec, _page, _numpages, _region, _offset) \ MCFG_MSX_SLOT_MUSIC_ADD(_tag, _page, _numpages, _region, _offset, "ym2413" ) \ - msx_state::install_slot_pages(*owner, _prim, _sec, _page, _numpages, device); + msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device); #define MCFG_MSX_LAYOUT_BUNSETSU(_tag, _prim, _sec, _page, _numpages, _region, _offset, _bunsetsu_tag) \ MCFG_MSX_SLOT_BUNSETSU_ADD(_tag, _page, _numpages, _region, _offset, _bunsetsu_tag) \ - msx_state::install_slot_pages(*owner, _prim, _sec, _page, _numpages, device); + msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device); #define MCFG_MSX_LAYOUT_FS4600(_tag, _prim, _sec, _page, _numpages, _region, _offset) \ MCFG_MSX_SLOT_FS4600_ADD(_tag, _page, _numpages, _region, _offset) \ - msx_state::install_slot_pages(*owner, _prim, _sec, _page, _numpages, device); + msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device); #define MCFG_MSX_LAYOUT_PANASONIC08(_tag, _prim, _sec, _page, _numpages, _region, _offset) \ MCFG_MSX_SLOT_PANASONIC08_ADD(_tag, _page, _numpages, _region, _offset) \ - msx_state::install_slot_pages(*owner, _prim, _sec, _page, _numpages, device); + msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device); #define MCFG_MSX_LAYOUT_SONY08(_tag, _prim, _sec, _page, _numpages, _region, _offset) \ MCFG_MSX_SLOT_SONY08_ADD(_tag, _page, _numpages, _region, _offset) \ - msx_state::install_slot_pages(*owner, _prim, _sec, _page, _numpages, device); + msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device); class msx_state : public driver_device @@ -203,6 +203,280 @@ public: std::vector m_switched; + void mpc25fd(machine_config &config); + void hc6(machine_config &config); + void nms8220(machine_config &config); + void hb75d(machine_config &config); + void y805128r2e(machine_config &config); + void fs4600(machine_config &config); + void dpc100(machine_config &config); + void nms8245f(machine_config &config); + void hbf1xd(machine_config &config); + void expert3t(machine_config &config); + void hb55p(machine_config &config); + void hotbi13p(machine_config &config); + void fspc800(machine_config &config); + void fsa1(machine_config &config); + void mpc200(machine_config &config); + void hb201p(machine_config &config); + void hx22i(machine_config &config); + void y503iiire(machine_config &config); + void svi738dk(machine_config &config); + void gfc1080a(machine_config &config); + void svi738pl(machine_config &config); + void hx10dp(machine_config &config); + void perfect1(machine_config &config); + void mlf110(machine_config &config); + void fsa1gt(machine_config &config); + void phc23(machine_config &config); + void hbg900p(machine_config &config); + void hbf12(machine_config &config); + void fs5000(machine_config &config); + void hbf1(machine_config &config); + void phc70fd2(machine_config &config); + void phc70fd(machine_config &config); + void cf1200(machine_config &config); + void hx20(machine_config &config); + void yis604(machine_config &config); + void cf3000(machine_config &config); + void mpc100(machine_config &config); + void tps312(machine_config &config); + void phc55fd2(machine_config &config); + void vg8020f(machine_config &config); + void hx10f(machine_config &config); + void hbf1xv(machine_config &config); + void expertac(machine_config &config); + void fsa1wsx(machine_config &config); + void cf2000(machine_config &config); + void expertpl(machine_config &config); + void fsa1wxa(machine_config &config); + void hx23i(machine_config &config); + void fsa1wx(machine_config &config); + void fsa1fx(machine_config &config); + void cpc61(machine_config &config); + void hbf1xdj(machine_config &config); + void expert3i(machine_config &config); + void y805256(machine_config &config); + void fs4000a(machine_config &config); + void y805128r2(machine_config &config); + void expertdx(machine_config &config); + void hbf700d(machine_config &config); + void mpc10(machine_config &config); + void yis60464(machine_config &config); + void cpc300(machine_config &config); + void pv16(machine_config &config); + void tpc310(machine_config &config); + void jvchc7gb(machine_config &config); + void nms8255(machine_config &config); + void cx7m128(machine_config &config); + void phc28(machine_config &config); + void hx10sa(machine_config &config); + void cx7m(machine_config &config); + void cx5m128(machine_config &config); + void expert10(machine_config &config); + void mlg3(machine_config &config); + void mbh50(machine_config &config); + void victhc90(machine_config &config); + void hc7(machine_config &config); + void fstm1(machine_config &config); + void victhc95a(machine_config &config); + void hx34(machine_config &config); + void gfc1080(machine_config &config); + void ax350(machine_config &config); + void cpc51(machine_config &config); + void victhc95(machine_config &config); + void ax150(machine_config &config); + void hx23f(machine_config &config); + void phc28s(machine_config &config); + void mlfx1(machine_config &config); + void tadpc200(machine_config &config); + void gsfc200(machine_config &config); + void hbf9pr(machine_config &config); + void hx10d(machine_config &config); + void hx23(machine_config &config); + void tpp311(machine_config &config); + void hbf900(machine_config &config); + void y503iiir(machine_config &config); + void expertdp(machine_config &config); + void yis303(machine_config &config); + void nms8255f(machine_config &config); + void hbf9sp(machine_config &config); + void hbf700f(machine_config &config); + void hbg900ap(machine_config &config); + void canonv25(machine_config &config); + void svi738sp(machine_config &config); + void hbf900a(machine_config &config); + void fmx(machine_config &config); + void phc2(machine_config &config); + void pv7(machine_config &config); + void hx10(machine_config &config); + void mlf48(machine_config &config); + void cpc50b(machine_config &config); + void hb10p(machine_config &config); + void hx20i(machine_config &config); + void mx10(machine_config &config); + void mx15(machine_config &config); + void hbf700s(machine_config &config); + void expert13(machine_config &config); + void hotbit20(machine_config &config); + void vg8235(machine_config &config); + void bruc100(machine_config &config); + void hbf500p(machine_config &config); + void hx21(machine_config &config); + void nms8250(machine_config &config); + void cf3300(machine_config &config); + void cx5f1(machine_config &config); + void hbf500(machine_config &config); + void fsa1f(machine_config &config); + void hx10e(machine_config &config); + void dpc200(machine_config &config); + void fsa1a(machine_config &config); + void hbf5(machine_config &config); + void hbf1xdm2(machine_config &config); + void cpc300e(machine_config &config); + void phc77(machine_config &config); + void svi738(machine_config &config); + void dpc200e(machine_config &config); + void mpc27(machine_config &config); + void mpc2500f(machine_config &config); + void canonv10(machine_config &config); + void mpc2300(machine_config &config); + void nms8280g(machine_config &config); + void yis503(machine_config &config); + void vg8230(machine_config &config); + void vg8235f(machine_config &config); + void mpc200sp(machine_config &config); + void svi738sw(machine_config &config); + void nms8280(machine_config &config); + void nms8260(machine_config &config); + void vg8010f(machine_config &config); + void nms8250j(machine_config &config); + void nms8245(machine_config &config); + void fs5500f2(machine_config &config); + void dpc180(machine_config &config); + void fs5500f1(machine_config &config); + void hbf500f(machine_config &config); + void vg8240(machine_config &config); + void mlf120(machine_config &config); + void hb201(machine_config &config); + void piopxv60(machine_config &config); + void hb10(machine_config &config); + void kmc5000(machine_config &config); + void fsa1fm(machine_config &config); + void fsa1mk2(machine_config &config); + void hbf9p(machine_config &config); + void hb501p(machine_config &config); + void cx5m(machine_config &config); + void phc35j(machine_config &config); + void fs4700(machine_config &config); + void mx101(machine_config &config); + void mx64(machine_config &config); + void hb55d(machine_config &config); + void nms8280f(machine_config &config); + void nms8250f(machine_config &config); + void nms801(machine_config &config); + void ax370(machine_config &config); + void svi728(machine_config &config); + void expert20(machine_config &config); + void hotbi13b(machine_config &config); + void mlg10(machine_config &config); + void cpc400s(machine_config &config); + void hotbit12(machine_config &config); + void nms8220a(machine_config &config); + void mbh70(machine_config &config); + void mlg30(machine_config &config); + void fpc900(machine_config &config); + void hotbit11(machine_config &config); + void y805128(machine_config &config); + void cpc400(machine_config &config); + void vg8010(machine_config &config); + void hx34i(machine_config &config); + void canonv30f(machine_config &config); + void cf2700(machine_config &config); + void hx21i(machine_config &config); + void mbh2(machine_config &config); + void cx5f(machine_config &config); + void mpc64(machine_config &config); + void yc64(machine_config &config); + void yis503m(machine_config &config); + void gsfc80u(machine_config &config); + void cf2700g(machine_config &config); + void ax170(machine_config &config); + void y503iir(machine_config &config); + void svi738ar(machine_config &config); + void yis503ii(machine_config &config); + void yis503f(machine_config &config); + void cx5m2(machine_config &config); + void spc800(machine_config &config); + void cpc330k(machine_config &config); + void canonv20(machine_config &config); + void hb20p(machine_config &config); + void mbh25(machine_config &config); + void fs4000(machine_config &config); + void hx10s(machine_config &config); + void piopx7uk(machine_config &config); + void hc5(machine_config &config); + void fdpc200(machine_config &config); + void hx22(machine_config &config); + void fs1300(machine_config &config); + void phc28l(machine_config &config); + void hb101p(machine_config &config); + void expert11(machine_config &config); + void hbf9s(machine_config &config); + void vg802020(machine_config &config); + void fsa1st(machine_config &config); + void hx33(machine_config &config); + void tadpc20a(machine_config &config); + void hb75p(machine_config &config); + void piopx7(machine_config &config); + void fs4500(machine_config &config); + void canonv8(machine_config &config); + void cpc88(machine_config &config); + void vg802000(machine_config &config); + void mlf80(machine_config &config); + void cpc50a(machine_config &config); + void hb701fd(machine_config &config); + void canonv30(machine_config &config); + void vg8000(machine_config &config); + void hb55(machine_config &config); + void vg8230j(machine_config &config); + void mlg1(machine_config &config); + void cpg120(machine_config &config); + void y503iir2(machine_config &config); + void fpc500(machine_config &config); + void hbf700p(machine_config &config); + + void msx(machine_config &config); + void msx_ntsc(machine_config &config); + void msx_tms9118(machine_config &config); + void msx_tms9128(machine_config &config); + void msx_tms9918(machine_config &config); + void msx_tms9918a(machine_config &config); + void msx_tms9928(machine_config &config); + void msx_pal(machine_config &config); + void msx_tms9129(machine_config &config); + void msx_tms9929(machine_config &config); + void msx2(machine_config &config); + void msx2p(machine_config &config); + void msx2_pal(machine_config &config); + + void msx1_cartlist(machine_config &config); + void msx1_floplist(machine_config &config); + void msx2_cartlist(machine_config &config); + void msx2_floplist(machine_config &config); + void msx2p_floplist(machine_config &config); + void msxr_floplist(machine_config &config); + void msx_fd1793(machine_config &config); + void msx_wd2793_force_ready(machine_config &config); + void msx_wd2793(machine_config &config); + void msx_mb8877a(machine_config &config); + void msx_tc8566af(machine_config &config); + void msx_microsol(machine_config &config); + void msx_1_35_ssdd_drive(machine_config &config); + void msx_1_35_dd_drive(machine_config &config); + void msx_2_35_dd_drive(machine_config &config); + void msx_ym2413(machine_config &config); + void msx2_64kb_vram(machine_config &config); private: required_device m_maincpu; optional_device m_v9938; diff --git a/src/mame/includes/mtx.h b/src/mame/includes/mtx.h index 73e0c3e5481..bc6e6e17125 100644 --- a/src/mame/includes/mtx.h +++ b/src/mame/includes/mtx.h @@ -105,6 +105,9 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(extrom_load); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(rompak_load); DECLARE_SNAPSHOT_LOAD_MEMBER(mtx); + void rs128(machine_config &config); + void mtx500(machine_config &config); + void mtx512(machine_config &config); }; #endif /* __MTX_H__ */ diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h index ea2991d7c9f..5446b2182dc 100644 --- a/src/mame/includes/mugsmash.h +++ b/src/mame/includes/mugsmash.h @@ -44,4 +44,5 @@ public: virtual void video_start() override; uint32_t screen_update_mugsmash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void mugsmash(machine_config &config); }; diff --git a/src/mame/includes/multfish.h b/src/mame/includes/multfish.h index ff4eb9c702b..2b6bfecacdd 100644 --- a/src/mame/includes/multfish.h +++ b/src/mame/includes/multfish.h @@ -91,9 +91,9 @@ public: required_device m_screen; required_device m_palette; required_device m_hopper; + void rollfr(machine_config &config); + void igrosoft_gamble(machine_config &config); }; -MACHINE_CONFIG_EXTERN( igrosoft_gamble ); -MACHINE_CONFIG_EXTERN( rollfr ); INPUT_PORTS_EXTERN( igrosoft_gamble ); diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h index e9a66cf6cf0..de031e234b3 100644 --- a/src/mame/includes/munchmo.h +++ b/src/mame/includes/munchmo.h @@ -65,4 +65,5 @@ public: void draw_status( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_background( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void mnchmobl(machine_config &config); }; diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index 752f3a4b48d..f9aa5cdf368 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -44,4 +44,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); TIMER_DEVICE_CALLBACK_MEMBER(scanline); + void mustache(machine_config &config); }; diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h index 304262d0b0b..6738f13882b 100644 --- a/src/mame/includes/mw8080bw.h +++ b/src/mame/includes/mw8080bw.h @@ -208,6 +208,50 @@ public: void mw8080bw_start_interrupt_timer( ); uint8_t tornbase_get_cabinet_type(); int invaders_is_cabinet_cocktail(); + void blueshrk(machine_config &config); + void blueshrk_audio(machine_config &config); + void boothill(machine_config &config); + void boothill_audio(machine_config &config); + void bowler(machine_config &config); + void bowler_audio(machine_config &config); + void checkmat(machine_config &config); + void checkmat_audio(machine_config &config); + void clowns(machine_config &config); + void clowns_audio(machine_config &config); + void desertgu(machine_config &config); + void desertgu_audio(machine_config &config); + void dogpatch(machine_config &config); + void dogpatch_audio(machine_config &config); + void dplay(machine_config &config); + void dplay_audio(machine_config &config); + void gmissile(machine_config &config); + void gmissile_audio(machine_config &config); + void gunfight(machine_config &config); + void gunfight_audio(machine_config &config); + void invad2ct(machine_config &config); + void invad2ct_audio(machine_config &config); + void invaders(machine_config &config); + void invaders_audio(machine_config &config); + void invaders_samples_audio(machine_config &config); + void m4(machine_config &config); + void m4_audio(machine_config &config); + void maze(machine_config &config); + void maze_audio(machine_config &config); + void mw8080bw_root(machine_config &config); + void phantom2(machine_config &config); + void phantom2_audio(machine_config &config); + void seawolf(machine_config &config); + void seawolf_audio(machine_config &config); + void shuffle(machine_config &config); + void shuffle_audio(machine_config &config); + void spacwalk(machine_config &config); + void spacwalk_audio(machine_config &config); + void spcenctr(machine_config &config); + void spcenctr_audio(machine_config &config); + void tornbase(machine_config &config); + void tornbase_audio(machine_config &config); + void zzzap(machine_config &config); + void zzzap_audio(machine_config &config); }; @@ -251,52 +295,5 @@ public: /*----------- defined in drivers/mw8080bw.c -----------*/ -MACHINE_CONFIG_EXTERN( mw8080bw_root ); -MACHINE_CONFIG_EXTERN( invaders ); extern const internal_layout layout_invaders; -/*----------- defined in audio/mw8080bw.c -----------*/ - - -MACHINE_CONFIG_EXTERN( seawolf_audio ); - -MACHINE_CONFIG_EXTERN( gunfight_audio ); - -MACHINE_CONFIG_EXTERN( tornbase_audio ); - -MACHINE_CONFIG_EXTERN( zzzap_audio ); - -MACHINE_CONFIG_EXTERN( maze_audio ); - -MACHINE_CONFIG_EXTERN( boothill_audio ); - -MACHINE_CONFIG_EXTERN( checkmat_audio ); - -MACHINE_CONFIG_EXTERN( desertgu_audio ); - -MACHINE_CONFIG_EXTERN( dplay_audio ); - -MACHINE_CONFIG_EXTERN( gmissile_audio ); - -MACHINE_CONFIG_EXTERN( m4_audio ); - -MACHINE_CONFIG_EXTERN( clowns_audio ); - -MACHINE_CONFIG_EXTERN( spacwalk_audio ); - -MACHINE_CONFIG_EXTERN( shuffle_audio ); - -MACHINE_CONFIG_EXTERN( dogpatch_audio ); - -MACHINE_CONFIG_EXTERN( spcenctr_audio ); - -MACHINE_CONFIG_EXTERN( phantom2_audio ); - -MACHINE_CONFIG_EXTERN( bowler_audio ); - -MACHINE_CONFIG_EXTERN( invaders_samples_audio ); -MACHINE_CONFIG_EXTERN( invaders_audio ); - -MACHINE_CONFIG_EXTERN( blueshrk_audio ); - -MACHINE_CONFIG_EXTERN( invad2ct_audio ); diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index 50fc4be234c..953a20efc2b 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -63,8 +63,6 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void mystston(machine_config &config); + void mystston_video(machine_config &config); }; - -/*----------- defined in video/mystston.c -----------*/ - -MACHINE_CONFIG_EXTERN( mystston_video ); diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h index f49ceb2ec00..b66f539b161 100644 --- a/src/mame/includes/mystwarr.h +++ b/src/mame/includes/mystwarr.h @@ -105,4 +105,10 @@ public: K055673_CB_MEMBER(gaiapols_sprite_callback); K055673_CB_MEMBER(martchmp_sprite_callback); void decode_tiles(); + void martchmp(machine_config &config); + void mystwarr(machine_config &config); + void dadandrn(machine_config &config); + void viostorm(machine_config &config); + void gaiapols(machine_config &config); + void metamrph(machine_config &config); }; diff --git a/src/mame/includes/mz700.h b/src/mame/includes/mz700.h index 2c080e18f9b..1b1d62cef75 100644 --- a/src/mame/includes/mz700.h +++ b/src/mame/includes/mz700.h @@ -80,6 +80,8 @@ public: DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); + void mz800(machine_config &config); + void mz700(machine_config &config); private: int m_mz700; /* 1 if running on an mz700 */ diff --git a/src/mame/includes/mz80.h b/src/mame/includes/mz80.h index 42011f4f7a2..447fe35c2ca 100644 --- a/src/mame/includes/mz80.h +++ b/src/mame/includes/mz80.h @@ -46,6 +46,9 @@ public: uint32_t screen_update_mz80a(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(ne555_tempo_callback); + void mz80kj(machine_config &config); + void mz80k(machine_config &config); + void mz80a(machine_config &config); private: bool m_mz80k_vertical; bool m_mz80k_tempo_strobe; diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index ef85ee0dea4..e772610e729 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -121,10 +121,11 @@ public: TIMER_CALLBACK_MEMBER( delayed_sound_1_callback ); void delayed_sound_2( int data ); TIMER_CALLBACK_MEMBER( delayed_sound_2_callback ); + void sheriff(machine_config &config); + void sheriff_sound(machine_config &config); + void westgun2(machine_config &config); + void helifire(machine_config &config); + void helifire_sound(machine_config &config); + void spacefev(machine_config &config); + void spacefev_sound(machine_config &config); }; - -/*----------- defined in audio/n8080.c -----------*/ - -MACHINE_CONFIG_EXTERN( spacefev_sound ); -MACHINE_CONFIG_EXTERN( sheriff_sound ); -MACHINE_CONFIG_EXTERN( helifire_sound ); diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h index 6553351440e..3bd1221efe0 100644 --- a/src/mame/includes/namcofl.h +++ b/src/mame/includes/namcofl.h @@ -88,4 +88,5 @@ public: void common_init(); int FLobjcode2tile(int code); void TilemapCB(uint16_t code, int *tile, int *mask); + void namcofl(machine_config &config); }; diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index d8558fe3fcd..0c4c3fc477d 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -80,6 +80,10 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(interrupt); + void namcona2(machine_config &config); + void namcona1w(machine_config &config); + void namcona2w(machine_config &config); + void namcona1(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h index 9aac87fd502..d24f69d293a 100644 --- a/src/mame/includes/namconb1.h +++ b/src/mame/includes/namconb1.h @@ -122,4 +122,6 @@ public: int NB2objcode2tile(int code); void NB1TilemapCB(uint16_t code, int *tile, int *mask); void NB2TilemapCB(uint16_t code, int *tile, int *mask); + void namconb1(machine_config &config); + void namconb2(machine_config &config); }; diff --git a/src/mame/includes/namcond1.h b/src/mame/includes/namcond1.h index dcba4d53f13..9493d550d64 100644 --- a/src/mame/includes/namcond1.h +++ b/src/mame/includes/namcond1.h @@ -46,4 +46,6 @@ public: DECLARE_WRITE_LINE_MEMBER( vblank_irq_w ); DECLARE_WRITE_LINE_MEMBER( raster_irq_w ); INTERRUPT_GEN_MEMBER(mcu_interrupt); + void abcheck(machine_config &config); + void namcond1(machine_config &config); }; diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index 74ae97679a5..7fde1de7881 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -136,6 +136,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank); + void ns1(machine_config &config); private: inline void get_tile_info(tile_data &tileinfo,int tile_index,uint8_t *info_vram); }; diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index 7702a19e0fd..14f660ef4b9 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -388,6 +388,17 @@ public: void GollyGhostUpdateDiorama_c0( int data ); void TilemapCB(uint16_t code, int *tile, int *mask); + void configure_c148_standard(machine_config &config); + void metlhawk(machine_config &config); + void gollygho(machine_config &config); + void assaultp(machine_config &config); + void sgunner2(machine_config &config); + void base2(machine_config &config); + void finallap(machine_config &config); + void luckywld(machine_config &config); + void base3(machine_config &config); + void sgunner(machine_config &config); + void base(machine_config &config); }; /*----------- defined in video/namcos2.c -----------*/ diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h index 8f7dfea5655..2b29df40efa 100644 --- a/src/mame/includes/namcos21.h +++ b/src/mame/includes/namcos21.h @@ -192,4 +192,8 @@ public: void render_slave_output(uint16_t data); void winrun_flush_poly(); void init(int game_type); + void configure_c148_standard(machine_config &config); + void driveyes(machine_config &config); + void winrun(machine_config &config); + void namcos21(machine_config &config); }; diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index 8e07c0199ac..2d8fd4d3aac 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -502,4 +502,16 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(dsp_master_serial_irq); TIMER_DEVICE_CALLBACK_MEMBER(dsp_slave_serial_irq); TIMER_DEVICE_CALLBACK_MEMBER(mcu_irq); + void namcos22s(machine_config &config); + void propcycl(machine_config &config); + void dirtdash(machine_config &config); + void airco22b(machine_config &config); + void cybrcycc(machine_config &config); + void tokyowar(machine_config &config); + void cybrcomm(machine_config &config); + void alpine(machine_config &config); + void alpinesa(machine_config &config); + void adillor(machine_config &config); + void timecris(machine_config &config); + void namcos22(machine_config &config); }; diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h index 483a127ed18..b6be5bb23a0 100644 --- a/src/mame/includes/namcos86.h +++ b/src/mame/includes/namcos86.h @@ -80,6 +80,11 @@ public: void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void scroll_w(address_space &space, int offset, int data, int layer); + void genpeitd(machine_config &config); + void wndrmomo(machine_config &config); + void roishtar(machine_config &config); + void rthunder(machine_config &config); + void hopmappy(machine_config &config); private: inline void get_tile_info(tile_data &tileinfo,int tile_index,int layer,uint8_t *vram); void set_scroll(int layer); diff --git a/src/mame/includes/naomi.h b/src/mame/includes/naomi.h index ed60ded7202..736f6ae088b 100644 --- a/src/mame/includes/naomi.h +++ b/src/mame/includes/naomi.h @@ -79,6 +79,12 @@ class naomi_state : public dc_state DECLARE_READ64_MEMBER( naomigd_ggxxrl_idle_skip_r ); DECLARE_READ64_MEMBER( naomigd_sfz3ugd_idle_skip_r ); DECLARE_READ64_MEMBER( hotd2_idle_skip_r ); + void naomi_base(machine_config &config); + void naomim2(machine_config &config); + void naomi(machine_config &config); + void naomim1(machine_config &config); + void naomigd(machine_config &config); + void naomim4(machine_config &config); }; class naomi2_state : public naomi_state @@ -98,6 +104,10 @@ public: DECLARE_DRIVER_INIT(naomi2); DECLARE_WRITE32_MEMBER(both_pvr2_ta_w); + void naomi2_base(machine_config &config); + void naomi2m2(machine_config &config); + void naomi2gd(machine_config &config); + void naomi2m1(machine_config &config); }; class atomiswave_state : public dc_state @@ -121,11 +131,13 @@ public: DECLARE_DRIVER_INIT(xtrmhnt2); DECLARE_READ64_MEMBER( xtrmhnt2_hack_r ); - + + void aw_base(machine_config &config); + void aw1c(machine_config &config); + void aw2c(machine_config &config); protected: uint8_t aw_ctrl_type; inline int decode_reg32_64(uint32_t offset, uint64_t mem_mask, uint64_t *shift); }; -MACHINE_CONFIG_EXTERN( naomi_aw_base ); INPUT_PORTS_EXTERN( naomi_debug ); diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index 93fa39a63a5..9f69920911b 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -55,4 +55,6 @@ public: DECLARE_PALETTE_INIT(naughtyb); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void popflame(machine_config &config); + void naughtyb(machine_config &config); }; diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h index 659eb7db745..e6c0b833f5e 100644 --- a/src/mame/includes/nbmj8688.h +++ b/src/mame/includes/nbmj8688.h @@ -93,6 +93,49 @@ public: void common_video_start(); void postload(); + void NBMJDRV_4096(machine_config &config); + void NBMJDRV_256(machine_config &config); + void NBMJDRV_65536(machine_config &config); + void mbmj_h12bit(machine_config &config); + void mbmj_p12bit(machine_config &config); + void mbmj_p16bit(machine_config &config); + void mbmj_p16bit_LCD(machine_config &config); + void swinggal(machine_config &config); + void korinai(machine_config &config); + void livegal(machine_config &config); + void apparel(machine_config &config); + void kyuhito(machine_config &config); + void bijokkoy(machine_config &config); + void barline(machine_config &config); + void bijokkog(machine_config &config); + void korinaim(machine_config &config); + void ryuuha(machine_config &config); + void seiham(machine_config &config); + void orangeci(machine_config &config); + void citylove(machine_config &config); + void otonano(machine_config &config); + void ojousanm(machine_config &config); + void mcitylov(machine_config &config); + void iemotom(machine_config &config); + void crystalg(machine_config &config); + void crystal2(machine_config &config); + void secolove(machine_config &config); + void orangec(machine_config &config); + void mjsikaku(machine_config &config); + void housemn2(machine_config &config); + void kanatuen(machine_config &config); + void nightlov(machine_config &config); + void kaguya2(machine_config &config); + void mjgaiden(machine_config &config); + void mjcamera(machine_config &config); + void mmsikaku(machine_config &config); + void housemnq(machine_config &config); + void idhimitu(machine_config &config); + void iemoto(machine_config &config); + void kaguya(machine_config &config); + void vipclub(machine_config &config); + void ojousan(machine_config &config); + void seiha(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h index 3ad15b28478..6d7e21a4efe 100644 --- a/src/mame/includes/nbmj8891.h +++ b/src/mame/includes/nbmj8891.h @@ -99,6 +99,34 @@ public: void common_save_state(); void postload(); + void mjfocusm(machine_config &config); + void mjfocus(machine_config &config); + void bananadr(machine_config &config); + void scandal(machine_config &config); + void hanamomo(machine_config &config); + void telmahjn(machine_config &config); + void pairsten(machine_config &config); + void club90s(machine_config &config); + void mgion(machine_config &config); + void chinmoku(machine_config &config); + void msjiken(machine_config &config); + void hnageman(machine_config &config); + void mjcamerb(machine_config &config); + void mjnanpas(machine_config &config); + void mmcamera(machine_config &config); + void pairsnb(machine_config &config); + void taiwanmb(machine_config &config); + void hanaoji(machine_config &config); + void lovehous(machine_config &config); + void hnxmasev(machine_config &config); + void mmaiko(machine_config &config); + void maiko(machine_config &config); + void mladyhtr(machine_config &config); + void omotesnd(machine_config &config); + void abunai(machine_config &config); + void gionbana(machine_config &config); + void mgmen89(machine_config &config); + void scandalm(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h index 1a8861524d5..aac77cb3449 100644 --- a/src/mame/includes/nbmj8900.h +++ b/src/mame/includes/nbmj8900.h @@ -70,6 +70,8 @@ public: void gfxdraw(); void postload(); + void ohpaipee(machine_config &config); + void togenkyo(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index 3a610d0776c..bf6b41f99ff 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -76,6 +76,27 @@ public: void postload(); + void nbmjdrv1(machine_config &config); + void nbmjdrv2(machine_config &config); + void nbmjdrv3(machine_config &config); + void tokyogal(machine_config &config); + void finalbny(machine_config &config); + void mjlstory(machine_config &config); + void galkaika(machine_config &config); + void pstadium(machine_config &config); + void galkoku(machine_config &config); + void av2mj2rg(machine_config &config); + void av2mj1bb(machine_config &config); + void vanilla(machine_config &config); + void mcontest(machine_config &config); + void triplew1(machine_config &config); + void ntopstar(machine_config &config); + void tokimbsj(machine_config &config); + void triplew2(machine_config &config); + void uchuuai(machine_config &config); + void hyouban(machine_config &config); + void qmhayaku(machine_config &config); + void mjgottub(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index cdbbe0f07a2..ab2306b1b60 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -115,6 +115,39 @@ public: int dipsw_r(); void postload(); + void NBMJDRV1_base(machine_config &config); + void NBMJDRV1(machine_config &config); + void NBMJDRV2(machine_config &config); + void NBMJDRV3(machine_config &config); + void patimono(machine_config &config); + void mjuraden(machine_config &config); + void psailor1(machine_config &config); + void ngpgal(machine_config &config); + void shabdama(machine_config &config); + void mjgottsu(machine_config &config); + void mkeibaou(machine_config &config); + void gal10ren(machine_config &config); + void mscoutm(machine_config &config); + void imekura(machine_config &config); + void mkoiuraa(machine_config &config); + void mjkoiura(machine_config &config); + void janbari(machine_config &config); + void mjlaman(machine_config &config); + void yosimotm(machine_config &config); + void cmehyou(machine_config &config); + void sailorwr(machine_config &config); + void koinomp(machine_config &config); + void sailorws(machine_config &config); + void mjegolf(machine_config &config); + void renaiclb(machine_config &config); + void psailor2(machine_config &config); + void yosimoto(machine_config &config); + void pachiten(machine_config &config); + void jituroku(machine_config &config); + void mmehyou(machine_config &config); + void bakuhatu(machine_config &config); + void ultramhm(machine_config &config); + void otatidai(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/nc.h b/src/mame/includes/nc.h index e678383ebac..4bb15789107 100644 --- a/src/mame/includes/nc.h +++ b/src/mame/includes/nc.h @@ -94,6 +94,8 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER( nc_pcmcia_card ); DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( nc_pcmcia_card ); + void nc200(machine_config &config); + void nc100(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/nds.h b/src/mame/includes/nds.h index c7b3037ed3e..89a91b2cfd5 100644 --- a/src/mame/includes/nds.h +++ b/src/mame/includes/nds.h @@ -40,6 +40,7 @@ public: DECLARE_READ32_MEMBER(wram_arm7mirror_r); DECLARE_WRITE32_MEMBER(wram_arm7mirror_w); + void nds(machine_config &config); protected: required_device m_arm7; required_device m_arm9; diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index e8a7708c002..55ef9d70980 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -128,4 +128,14 @@ public: void nemesis_postload(); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE8_MEMBER(volume_callback); + void nyanpani(machine_config &config); + void konamigt(machine_config &config); + void rf2_gx400(machine_config &config); + void gx400(machine_config &config); + void bubsys(machine_config &config); + void hcrash(machine_config &config); + void salamand(machine_config &config); + void citybomb(machine_config &config); + void nemesis(machine_config &config); + void blkpnthr(machine_config &config); }; diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index affd2ebb6d9..2ff80aba52a 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -112,6 +112,74 @@ public: DECLARE_DRIVER_INIT(neogeo); + void neogeo_base(machine_config &config); + void neogeo_arcade(machine_config &config); + void mslug3b6(machine_config &config); + void s1945p(machine_config &config); + void rotd(machine_config &config); + void mslug4(machine_config &config); + void kof2003(machine_config &config); + void lans2004(machine_config &config); + void ms5plus(machine_config &config); + void kof2k4se(machine_config &config); + void kof2002(machine_config &config); + void kof2001(machine_config &config); + void svcplus(machine_config &config); + void kf2k5uni(machine_config &config); + void garou(machine_config &config); + void sbp(machine_config &config); + void cthd2k3(machine_config &config); + void ct2k3sp(machine_config &config); + void kof2000n(machine_config &config); + void mslug3(machine_config &config); + void kog(machine_config &config); + void fatfur2(machine_config &config); + void garouh(machine_config &config); + void ganryu(machine_config &config); + void zupapa(machine_config &config); + void neobase(machine_config &config); + void kof10th(machine_config &config); + void mslug5(machine_config &config); + void garoubl(machine_config &config); + void ct2k3sa(machine_config &config); + void nitd(machine_config &config); + void samsh5sp(machine_config &config); + void kof98(machine_config &config); + void kf2k3pl(machine_config &config); + void mvs(machine_config &config); + void ms4plus(machine_config &config); + void samsho5b(machine_config &config); + void popbounc(machine_config &config); + void svcplusa(machine_config &config); + void kof2002b(machine_config &config); + void svcboot(machine_config &config); + void kof2000(machine_config &config); + void samsho5(machine_config &config); + void kf2k2mp2(machine_config &config); + void pnyaa(machine_config &config); + void mslug3h(machine_config &config); + void vliner(machine_config &config); + void jockeygp(machine_config &config); + void matrim(machine_config &config); + void matrimbl(machine_config &config); + void kof97oro(machine_config &config); + void kizuna4p(machine_config &config); + void mslugx(machine_config &config); + void kf2k2pls(machine_config &config); + void kf10thep(machine_config &config); + void sengoku3(machine_config &config); + void neogeo_mj(machine_config &config); + void kf2k3upl(machine_config &config); + void preisle2(machine_config &config); + void svcsplus(machine_config &config); + void kf2k3bl(machine_config &config); + void kof99(machine_config &config); + void svc(machine_config &config); + void kof2003h(machine_config &config); + void kof99k(machine_config &config); + void irrmaze(machine_config &config); + void kf2k2mp(machine_config &config); + void bangbead(machine_config &config); protected: void common_machine_start(); @@ -255,6 +323,7 @@ class aes_state : public neogeo_state DECLARE_INPUT_CHANGED_MEMBER(aes_jp1); DECLARE_MACHINE_START(aes); + void aes(machine_config &config); protected: required_ioport m_io_in2; }; @@ -299,12 +368,11 @@ class neopcb_state : public neogeo_state required_device m_cmc_prot; required_device m_pcm2_prot; required_device m_pvc_prot; + void neopcb(machine_config &config); }; /*----------- defined in drivers/neogeo.c -----------*/ -MACHINE_CONFIG_EXTERN( neogeo_base ); -MACHINE_CONFIG_EXTERN( neogeo_arcade ); INPUT_PORTS_EXTERN(neogeo); INPUT_PORTS_EXTERN(aes); diff --git a/src/mame/includes/nes.h b/src/mame/includes/nes.h index 073f24c7395..0ccd6b793a2 100644 --- a/src/mame/includes/nes.h +++ b/src/mame/includes/nes.h @@ -104,6 +104,14 @@ public: DECLARE_MACHINE_RESET(famitwin); void setup_disk(nes_disksys_device *slot); + void suborkbd(machine_config &config); + void famipalc(machine_config &config); + void famicom(machine_config &config); + void famitwin(machine_config &config); + void nespal(machine_config &config); + void nespalc(machine_config &config); + void nes(machine_config &config); + void fds(machine_config &config); private: memory_bank *m_prg_bank_mem[5]; diff --git a/src/mame/includes/newbrain.h b/src/mame/includes/newbrain.h index 41f6e4958a6..7e307687050 100644 --- a/src/mame/includes/newbrain.h +++ b/src/mame/includes/newbrain.h @@ -69,6 +69,11 @@ public: DECLARE_READ_LINE_MEMBER( tdi_r ); DECLARE_WRITE_LINE_MEMBER( k1_w ); + void newbrain(machine_config &config); + void newbrain_a(machine_config &config); + void newbrain_ad(machine_config &config); + void newbrain_md(machine_config &config); + void newbrain_video(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void machine_start() override; @@ -135,9 +140,4 @@ protected: emu_timer *m_clkint_timer; }; - -// ---------- defined in video/newbrain.c ---------- - -MACHINE_CONFIG_EXTERN( newbrain_video ); - #endif diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h index 235d3574331..b529d56cf28 100644 --- a/src/mame/includes/news.h +++ b/src/mame/includes/news.h @@ -30,4 +30,5 @@ public: uint32_t screen_update_news(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void news(machine_config &config); }; diff --git a/src/mame/includes/next.h b/src/mame/includes/next.h index 014261e17c2..bd2133b7639 100644 --- a/src/mame/includes/next.h +++ b/src/mame/includes/next.h @@ -115,6 +115,17 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); DECLARE_WRITE_LINE_MEMBER(vblank_w); + static void ncr5390(device_t *device); + void next_base(machine_config &config); + void next_fdc_base(machine_config &config); + void nextst(machine_config &config); + void nextsc(machine_config &config); + void nextct(machine_config &config); + void nexts2(machine_config &config); + void nextctc(machine_config &config); + void next(machine_config &config); + void nextstc(machine_config &config); + void nexts(machine_config &config); protected: struct dma_slot { uint32_t start, limit, chain_start, chain_limit, current; diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index 1edc6390616..0c4454043a8 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -124,4 +124,11 @@ public: void update_sprites(); void lineswap_gfx_roms(const char *region, const int bit); void gfx_unscramble(); + void omegaf(machine_config &config); + void ninjakd2b(machine_config &config); + void robokid(machine_config &config); + void arkarea(machine_config &config); + void mnight(machine_config &config); + void ninjakd2(machine_config &config); + void ninjakd2_core(machine_config &config); }; diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h index ed1f166ffe1..cca4f1c761e 100644 --- a/src/mame/includes/ninjaw.h +++ b/src/mame/includes/ninjaw.h @@ -77,4 +77,6 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int primask, int x_offs, int y_offs ); void parse_control( ); uint32_t update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffs, tc0100scn_device *tc0100scn); + void darius2(machine_config &config); + void ninjaw(machine_config &config); }; diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h index b3d98e4c3df..99504559a07 100644 --- a/src/mame/includes/nitedrvr.h +++ b/src/mame/includes/nitedrvr.h @@ -70,6 +70,7 @@ public: void draw_box(bitmap_ind16 &bitmap, const rectangle &cliprect, int bx, int by, int ex, int ey); void draw_roadway(bitmap_ind16 &bitmap, const rectangle &cliprect); int nitedrvr_steering(); + void nitedrvr(machine_config &config); }; /*----------- defined in audio/nitedrvr.c -----------*/ diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index 2357694894b..20fb9e0de6c 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -97,6 +97,10 @@ public: INTERRUPT_GEN_MEMBER(interrupt); + void musobana(machine_config &config); + void zokumahj(machine_config &config); + void mhhonban(machine_config &config); + void niyanpai(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index 857e64f4041..888f7ed19f6 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -201,4 +201,37 @@ public: void decode_gfx(); void decode_tdragonb(); void decode_ssmissin(); + void vandyke(machine_config &config); + void redhawkb(machine_config &config); + void grdnstrm(machine_config &config); + void tdragon_prot(machine_config &config); + void tdragon2(machine_config &config); + void tharrier(machine_config &config); + void raphero(machine_config &config); + void tdragon(machine_config &config); + void tdragonb(machine_config &config); + void twinactn(machine_config &config); + void firehawk(machine_config &config); + void gunnail(machine_config &config); + void hachamf(machine_config &config); + void redhawki(machine_config &config); + void bjtwin(machine_config &config); + void ssmissin(machine_config &config); + void bioship(machine_config &config); + void spec2k(machine_config &config); + void macross2(machine_config &config); + void blkheart(machine_config &config); + void stagger1(machine_config &config); + void manybloc(machine_config &config); + void acrobatm(machine_config &config); + void strahl(machine_config &config); + void tdragon3h(machine_config &config); + void atombjt(machine_config &config); + void hachamf_prot(machine_config &config); + void popspops(machine_config &config); + void grdnstrmk(machine_config &config); + void macross(machine_config &config); + void mustangb(machine_config &config); + void mustang(machine_config &config); + void vandykeb(machine_config &config); }; diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h index 10413195098..46e9d7521e0 100644 --- a/src/mame/includes/norautp.h +++ b/src/mame/includes/norautp.h @@ -41,6 +41,20 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void noraut_base(machine_config &config); + void kimble(machine_config &config); + void kimbldhl(machine_config &config); + void norautp(machine_config &config); + void norautx4(machine_config &config); + void norautpl(machine_config &config); + void newhilop(machine_config &config); + void dphltest(machine_config &config); + void nortest1(machine_config &config); + void ssjkrpkr(machine_config &config); + void dphl(machine_config &config); + void dphla(machine_config &config); + void drhl(machine_config &config); + void norautxp(machine_config &config); }; /*----------- defined in audio/norautp.c -----------*/ diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h index 7a994cd41a7..fd2e0ebb024 100644 --- a/src/mame/includes/nova2001.h +++ b/src/mame/includes/nova2001.h @@ -63,4 +63,8 @@ public: void nova2001_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void pkunwar_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void lineswap_gfx_roms(const char *region, const int bit); + void raiders5(machine_config &config); + void ninjakun(machine_config &config); + void nova2001(machine_config &config); + void pkunwar(machine_config &config); }; diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h index 6c2f2eabcb0..14a992295b9 100644 --- a/src/mame/includes/nycaptor.h +++ b/src/mame/includes/nycaptor.h @@ -94,4 +94,7 @@ public: uint32_t screen_update_nycaptor(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); int nycaptor_spot( ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); + void nycaptor(machine_config &config); + void cyclshtg(machine_config &config); + void bronx(machine_config &config); }; diff --git a/src/mame/includes/ob68k1a.h b/src/mame/includes/ob68k1a.h index 12303cc8e2d..c79de69cc63 100644 --- a/src/mame/includes/ob68k1a.h +++ b/src/mame/includes/ob68k1a.h @@ -55,6 +55,7 @@ public: DECLARE_WRITE8_MEMBER( com8116_w ); DECLARE_READ8_MEMBER( pia_r ); DECLARE_WRITE8_MEMBER( pia_w ); + void ob68k1a(machine_config &config); }; #endif diff --git a/src/mame/includes/offtwall.h b/src/mame/includes/offtwall.h index ee7cda3599b..34b367dca29 100644 --- a/src/mame/includes/offtwall.h +++ b/src/mame/includes/offtwall.h @@ -45,4 +45,5 @@ public: uint32_t screen_update_offtwall(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); static const atari_motion_objects_config s_mob_config; + void offtwall(machine_config &config); }; diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h index 0ce18c4c42a..9ab74da6a38 100644 --- a/src/mame/includes/ohmygod.h +++ b/src/mame/includes/ohmygod.h @@ -47,4 +47,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void ohmygod(machine_config &config); }; diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index eeda0d0c3be..12231e13e68 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -106,4 +106,8 @@ public: uint32_t screen_update_ojankoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void ojankoc_flipscreen( address_space &space, int data ); DECLARE_WRITE_LINE_MEMBER(ojankohs_adpcm_int); + void ojankohs(machine_config &config); + void ccasino(machine_config &config); + void ojankoc(machine_config &config); + void ojankoy(machine_config &config); }; diff --git a/src/mame/includes/ondra.h b/src/mame/includes/ondra.h index 1127be0ee96..9b3557ff257 100644 --- a/src/mame/includes/ondra.h +++ b/src/mame/includes/ondra.h @@ -42,6 +42,7 @@ public: INTERRUPT_GEN_MEMBER(ondra_interrupt); TIMER_CALLBACK_MEMBER(nmi_check_callback); + void ondra(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h index 2927aadb924..f815738ad12 100644 --- a/src/mame/includes/oneshot.h +++ b/src/mame/includes/oneshot.h @@ -62,4 +62,6 @@ public: required_device m_oki; required_device m_gfxdecode; required_device m_palette; + void maddonna(machine_config &config); + void oneshot(machine_config &config); }; diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h index bb69ed70a06..7a2beac853e 100644 --- a/src/mame/includes/opwolf.h +++ b/src/mame/includes/opwolf.h @@ -131,6 +131,9 @@ public: DECLARE_WRITE_LINE_MEMBER(opwolf_msm5205_vck_1); DECLARE_WRITE_LINE_MEMBER(opwolf_msm5205_vck_2); + void opwolfb(machine_config &config); + void opwolfp(machine_config &config); + void opwolf(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/orao.h b/src/mame/includes/orao.h index 64dc53d2b47..811f3476180 100644 --- a/src/mame/includes/orao.h +++ b/src/mame/includes/orao.h @@ -34,6 +34,7 @@ public: virtual void video_start() override; uint32_t screen_update_orao(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void orao(machine_config &config); private: required_shared_ptr m_memory; required_shared_ptr m_video_ram; diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index 63a3a90c1a6..552516e5183 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -55,6 +55,7 @@ public: DECLARE_WRITE8_MEMBER(orbit_noise_amp_w); DECLARE_WRITE8_MEMBER(orbit_noise_rst_w); + void orbit(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/orion.h b/src/mame/includes/orion.h index bc2beae935f..5a6d77be716 100644 --- a/src/mame/includes/orion.h +++ b/src/mame/includes/orion.h @@ -84,6 +84,11 @@ public: DECLARE_WRITE8_MEMBER(orion_romdisk_portc_w); DECLARE_FLOPPY_FORMATS( orion_floppy_formats ); + void orionz80(machine_config &config); + void orion128ms(machine_config &config); + void orion128(machine_config &config); + void orionpro(machine_config &config); + void orionz80ms(machine_config &config); protected: uint8_t m_orion128_video_mode; uint8_t m_orion128_video_page; diff --git a/src/mame/includes/osborne1.h b/src/mame/includes/osborne1.h index c3e5906931e..5d2adc73775 100644 --- a/src/mame/includes/osborne1.h +++ b/src/mame/includes/osborne1.h @@ -95,6 +95,7 @@ public: required_device m_floppy0; required_device m_floppy1; + void osborne1(machine_config &config); protected: TIMER_CALLBACK_MEMBER(video_callback); TIMER_CALLBACK_MEMBER(acia_rxc_txc_callback); @@ -164,6 +165,7 @@ public: MC6845_UPDATE_ROW(crtc_update_row); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr_changed); + void osborne1nv(machine_config &config); protected: required_device m_palette; required_region_ptr m_p_nuevo; diff --git a/src/mame/includes/osi.h b/src/mame/includes/osi.h index cc4b7c87d56..533cd1705f4 100644 --- a/src/mame/includes/osi.h +++ b/src/mame/includes/osi.h @@ -56,6 +56,9 @@ public: DECLARE_PALETTE_INIT(osi630); + void osi600(machine_config &config); + void osi600_video(machine_config &config); + void osi630_video(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void machine_start() override; @@ -105,6 +108,7 @@ public: DECLARE_WRITE8_MEMBER( osi630_ctrl_w ); DECLARE_WRITE8_MEMBER( osi630_sound_w ); DECLARE_DRIVER_INIT(c1p); + void c1p(machine_config &config); }; class c1pmf_state : public c1p_state @@ -121,6 +125,7 @@ public: DECLARE_WRITE8_MEMBER( osi470_pia_pb_w ); DECLARE_WRITE_LINE_MEMBER( osi470_pia_cb2_w ); + void c1pmf(machine_config &config); protected: virtual void machine_start() override; @@ -139,12 +144,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER( keyboard_w ); + void uk101(machine_config &config); + void uk101_video(machine_config &config); }; -/* ---------- defined in video/osi.c ---------- */ - -MACHINE_CONFIG_EXTERN( osi600_video ); -MACHINE_CONFIG_EXTERN( uk101_video ); -MACHINE_CONFIG_EXTERN( osi630_video ); - #endif diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index 563c6fc50ae..f8ca222329b 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -53,6 +53,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_interrupt); + void othunder(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h index a573199e8d4..51a0fa7b193 100644 --- a/src/mame/includes/overdriv.h +++ b/src/mame/includes/overdriv.h @@ -70,4 +70,5 @@ public: K051316_CB_MEMBER(zoom_callback_1); K051316_CB_MEMBER(zoom_callback_2); K053246_CB_MEMBER(sprite_callback); + void overdriv(machine_config &config); }; diff --git a/src/mame/includes/p2000t.h b/src/mame/includes/p2000t.h index 5b23fc4bf99..46c2dcdfce4 100644 --- a/src/mame/includes/p2000t.h +++ b/src/mame/includes/p2000t.h @@ -55,6 +55,8 @@ public: DECLARE_PALETTE_INIT(p2000m); uint32_t screen_update_p2000m(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(p2000_interrupt); + void p2000t(machine_config &config); + void p2000m(machine_config &config); }; #endif // MAME_INCLUDES_P2000T_H diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index 4cd4d6302ab..9c5bd77f3bc 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -69,4 +69,5 @@ public: void switch_palette(); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flip, int whichmask); void draw_fg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); + void pacland(machine_config &config); }; diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h index 61316d8a8f2..77c98463891 100644 --- a/src/mame/includes/pacman.h +++ b/src/mame/includes/pacman.h @@ -175,6 +175,33 @@ public: DECLARE_MACHINE_START(acitya); DECLARE_MACHINE_RESET(acitya); + void birdiy(machine_config &config); + void rocktrv2(machine_config &config); + void mspacman(machine_config &config); + void dremshpr(machine_config &config); + void mschamp(machine_config &config); + void acitya(machine_config &config); + void theglobp(machine_config &config); + void nmouse(machine_config &config); + void vanvan(machine_config &config); + void s2650games(machine_config &config); + void woodpek(machine_config &config); + void crushs(machine_config &config); + void eeekk(machine_config &config); + void superabc(machine_config &config); + void numcrash(machine_config &config); + void crush4(machine_config &config); + void bigbucks(machine_config &config); + void porky(machine_config &config); + void pacman(machine_config &config); + void _8bpm(machine_config &config); + void maketrax(machine_config &config); + void korosuke(machine_config &config); + void alibaba(machine_config &config); + void drivfrcp(machine_config &config); + void pengojpm(machine_config &config); + void piranha(machine_config &config); + private: // pacplus.c uint8_t pacplus_decrypt(int addr, uint8_t e); diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index 9d78bb0a55a..8ee56d707e1 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -68,4 +68,5 @@ public: INTERRUPT_GEN_MEMBER(pandoras_master_interrupt); INTERRUPT_GEN_MEMBER(pandoras_slave_interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t* sr ); + void pandoras(machine_config &config); }; diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index 1d57d6e73c1..f725e3334bf 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -87,4 +87,10 @@ public: void update_pix_palbank(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void penkyi(machine_config &config); + void tgtball(machine_config &config); + void paradise(machine_config &config); + void madball(machine_config &config); + void torus(machine_config &config); + void penky(machine_config &config); }; diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h index 040966a723e..d730b696579 100644 --- a/src/mame/includes/parodius.h +++ b/src/mame/includes/parodius.h @@ -58,6 +58,7 @@ public: K052109_CB_MEMBER(tile_callback); DECLARE_WRITE8_MEMBER(banking_callback); + void parodius(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/partner.h b/src/mame/includes/partner.h index 7cf4e69a1ab..b412a40a54a 100644 --- a/src/mame/includes/partner.h +++ b/src/mame/includes/partner.h @@ -38,6 +38,7 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); + void partner(machine_config &config); protected: void partner_window_1(uint8_t bank_num, uint16_t offset,uint8_t *rom); void partner_window_2(uint8_t bank_num, uint16_t offset,uint8_t *rom); diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h index b6bd358935b..9a438b5bfc5 100644 --- a/src/mame/includes/pass.h +++ b/src/mame/includes/pass.h @@ -26,6 +26,7 @@ public: uint32_t screen_update_pass(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void pass(machine_config &config); protected: virtual void video_start() override; diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h index 9151ffb13e4..25475c67a4d 100644 --- a/src/mame/includes/pastelg.h +++ b/src/mame/includes/pastelg.h @@ -62,6 +62,8 @@ public: void pastelg_vramflip(); void pastelg_gfxdraw(); + void threeds(machine_config &config); + void pastelg(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/patinhofeio.h b/src/mame/includes/patinhofeio.h index 74d5fc91fad..1a2f5ed5764 100644 --- a/src/mame/includes/patinhofeio.h +++ b/src/mame/includes/patinhofeio.h @@ -30,6 +30,7 @@ public: void update_panel(uint8_t ACC, uint8_t opcode, uint8_t mem_data, uint16_t mem_addr, uint16_t PC, uint8_t FLAGS, uint16_t RC, uint8_t mode); + void patinho_feio(machine_config &config); protected: virtual void machine_start() override; diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h index 9ebb0ef2f44..d1484230670 100644 --- a/src/mame/includes/pbaction.h +++ b/src/mame/includes/pbaction.h @@ -67,4 +67,6 @@ public: INTERRUPT_GEN_MEMBER(pbaction_interrupt); INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void pbaction(machine_config &config); + void pbactionx(machine_config &config); }; diff --git a/src/mame/includes/pc1251.h b/src/mame/includes/pc1251.h index a6e84e0b16c..7f6d56a5a6b 100644 --- a/src/mame/includes/pc1251.h +++ b/src/mame/includes/pc1251.h @@ -55,6 +55,11 @@ public: required_device m_gfxdecode; required_device m_palette; + void pc1261(machine_config &config); + void pc1260(machine_config &config); + void pc1255(machine_config &config); + void pc1251(machine_config &config); + void pc1250(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/pc1350.h b/src/mame/includes/pc1350.h index 58cc23a1aff..ce56614bce2 100644 --- a/src/mame/includes/pc1350.h +++ b/src/mame/includes/pc1350.h @@ -53,6 +53,7 @@ public: required_device m_maincpu; required_device m_ram; + void pc1350(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/pc1401.h b/src/mame/includes/pc1401.h index 1c76287a808..c9b7ce2d407 100644 --- a/src/mame/includes/pc1401.h +++ b/src/mame/includes/pc1401.h @@ -53,6 +53,8 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void pc1401(machine_config &config); + void pc1402(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/pc1403.h b/src/mame/includes/pc1403.h index 7566ccbee6d..e777847587b 100644 --- a/src/mame/includes/pc1403.h +++ b/src/mame/includes/pc1403.h @@ -58,6 +58,8 @@ public: required_device m_gfxdecode; required_device m_palette; + void pc1403h(machine_config &config); + void pc1403(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/pc1512.h b/src/mame/includes/pc1512.h index f44879733b5..a2060eedba9 100644 --- a/src/mame/includes/pc1512.h +++ b/src/mame/includes/pc1512.h @@ -226,6 +226,10 @@ public: // sound state int m_speaker_drive; + void pc1512_video(machine_config &config); + void pc1512hd(machine_config &config); + void pc1512(machine_config &config); + void pc1512dd(machine_config &config); }; class pc1640_state : public pc1512_state @@ -246,10 +250,11 @@ public: required_ioport m_sw; int m_opt; + void pc1640hd(machine_config &config); + void pc1640(machine_config &config); + void pc1640dd(machine_config &config); }; // ---------- defined in video/pc1512.c ---------- -MACHINE_CONFIG_EXTERN( pc1512_video ); - #endif // MAME_INCLUDES_PC1512_H diff --git a/src/mame/includes/pc4.h b/src/mame/includes/pc4.h index 0050f7f9133..079c6693718 100644 --- a/src/mame/includes/pc4.h +++ b/src/mame/includes/pc4.h @@ -67,6 +67,7 @@ public: uint8_t m_blink; DECLARE_PALETTE_INIT(pc4); + void pc4(machine_config &config); protected: required_memory_region m_region_charset; required_memory_bank m_rombank; diff --git a/src/mame/includes/pc8001.h b/src/mame/includes/pc8001.h index c5c89011ab1..674e1a8e189 100644 --- a/src/mame/includes/pc8001.h +++ b/src/mame/includes/pc8001.h @@ -76,6 +76,7 @@ public: DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); DECLARE_WRITE_LINE_MEMBER(write_centronics_ack); UPD3301_DRAW_CHARACTER_MEMBER( pc8001_display_pixels ); + void pc8001(machine_config &config); }; class pc8001mk2_state : public pc8001_state @@ -89,6 +90,7 @@ public: required_memory_region m_kanji_rom; DECLARE_WRITE8_MEMBER( port31_w ); + void pc8001mk2(machine_config &config); }; #endif diff --git a/src/mame/includes/pc8401a.h b/src/mame/includes/pc8401a.h index 07f3e6bb3e6..51d3e41a23a 100644 --- a/src/mame/includes/pc8401a.h +++ b/src/mame/includes/pc8401a.h @@ -96,6 +96,8 @@ public: uint8_t m_key_latch; TIMER_DEVICE_CALLBACK_MEMBER(pc8401a_keyboard_tick); + void pc8401a(machine_config &config); + void pc8401a_video(machine_config &config); }; class pc8500_state : public pc8401a_state @@ -107,11 +109,8 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void pc8500(machine_config &config); + void pc8500_video(machine_config &config); }; -// ---------- defined in video/pc8401a.c ---------- - -MACHINE_CONFIG_EXTERN( pc8401a_video ); -MACHINE_CONFIG_EXTERN( pc8500_video ); - #endif diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h index 3ffe85d7dc4..3141db039a7 100644 --- a/src/mame/includes/pc9801.h +++ b/src/mame/includes/pc9801.h @@ -290,6 +290,20 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t a20_286(bool state); + void pc9801_keyboard(machine_config &config); + void pc9801_mouse(machine_config &config); + void pc9801_cbus(machine_config &config); + void pc9801_sasi(machine_config &config); + void pc9801_ide(machine_config &config); + void pc9801_common(machine_config &config); + void pc9821v20(machine_config &config); + void pc9801ux(machine_config &config); + void pc9801vm(machine_config &config); + void pc9801(machine_config &config); + void pc9801bx2(machine_config &config); + void pc9821ap2(machine_config &config); + void pc9821(machine_config &config); + void pc9801rs(machine_config &config); protected: virtual void video_start() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; diff --git a/src/mame/includes/pce.h b/src/mame/includes/pce.h index 9c07e62f602..53581993155 100644 --- a/src/mame/includes/pce.h +++ b/src/mame/includes/pce.h @@ -76,6 +76,10 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_MACHINE_START(pce); DECLARE_MACHINE_RESET(mess_pce); + void pce_common(machine_config &config); + void pce(machine_config &config); + void tg16(machine_config &config); + void sgx(machine_config &config); }; #endif /* PCE_H_ */ diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h index 2e7a76d7d38..65307e82f0d 100644 --- a/src/mame/includes/pcktgal.h +++ b/src/mame/includes/pcktgal.h @@ -46,4 +46,7 @@ public: uint32_t screen_update_pcktgal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_pcktgalb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void bootleg(machine_config &config); + void pcktgal(machine_config &config); + void pcktgal2(machine_config &config); }; diff --git a/src/mame/includes/pcw.h b/src/mame/includes/pcw.h index 85073d2a0ce..b242095cdb4 100644 --- a/src/mame/includes/pcw.h +++ b/src/mame/includes/pcw.h @@ -139,6 +139,10 @@ public: void pcw_update_mem(int block, int data); int pcw_get_sys_status(); void pcw_printer_fire_pins(uint16_t pins); + void pcw(machine_config &config); + void pcw8256(machine_config &config); + void pcw8512(machine_config &config); + void pcw9512(machine_config &config); }; #endif /* PCW_H_ */ diff --git a/src/mame/includes/pcw16.h b/src/mame/includes/pcw16.h index ef901a00b0f..9a018f4099e 100644 --- a/src/mame/includes/pcw16.h +++ b/src/mame/includes/pcw16.h @@ -141,6 +141,7 @@ public: void pcw16_vh_decode_mode0(bitmap_ind16 &bitmap, int x, int y, unsigned char byte); void pcw16_vh_decode_mode1(bitmap_ind16 &bitmap, int x, int y, unsigned char byte); void pcw16_vh_decode_mode2(bitmap_ind16 &bitmap, int x, int y, unsigned char byte); + void pcw16(machine_config &config); }; #endif /* PCW16_H_ */ diff --git a/src/mame/includes/pdp1.h b/src/mame/includes/pdp1.h index 72e4aa428a3..adb47696860 100644 --- a/src/mame/includes/pdp1.h +++ b/src/mame/includes/pdp1.h @@ -302,6 +302,7 @@ public: void pdp1_lightpen(); int read_spacewar() { return m_spacewar->read(); } + void pdp1(machine_config &config); private: pdp1_reset_param_t m_reset_param; int m_old_typewriter_keys[4]; diff --git a/src/mame/includes/pecom.h b/src/mame/includes/pecom.h index c97216ac77c..7f6e88678af 100644 --- a/src/mame/includes/pecom.h +++ b/src/mame/includes/pecom.h @@ -59,6 +59,8 @@ public: CDP1869_CHAR_RAM_READ_MEMBER(pecom_char_ram_r); CDP1869_CHAR_RAM_WRITE_MEMBER(pecom_char_ram_w); CDP1869_PCB_READ_MEMBER(pecom_pcb_r); + void pecom64(machine_config &config); + void pecom_video(machine_config &config); protected: required_device m_cassette; required_device m_ram; @@ -70,8 +72,4 @@ protected: ioport_port *m_io_ports[26]; }; -/* ---------- defined in video/pecom.c ---------- */ - -MACHINE_CONFIG_EXTERN( pecom_video ); - #endif // MAME_INCLUDES_PECOM_H diff --git a/src/mame/includes/pes.h b/src/mame/includes/pes.h index de3ba6aa129..762a9d40b8f 100644 --- a/src/mame/includes/pes.h +++ b/src/mame/includes/pes.h @@ -48,6 +48,7 @@ public: void pes_kbd_input(u8 data); DECLARE_READ8_MEMBER(data_to_i8031); DECLARE_WRITE8_MEMBER(data_from_i8031); + void pes(machine_config &config); }; diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index 98e7e8b8562..638c43f40bf 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -115,6 +115,8 @@ public: void draw_sprites( bitmap_ind16& spritebitmap, uint16_t *sprite_source, bitmap_ind8& priority_bitmap ); void expand_colourdata(); void pgm_basic_init( bool set_bank = true); + void pgm(machine_config &config); + void pgmbase(machine_config &config); }; @@ -125,9 +127,6 @@ INPUT_PORTS_EXTERN( pgm ); GFXDECODE_EXTERN( pgm ); -MACHINE_CONFIG_EXTERN( pgm ); -MACHINE_CONFIG_EXTERN( pgmbase ); - ADDRESS_MAP_EXTERN( pgm_z80_mem, 8 ); ADDRESS_MAP_EXTERN( pgm_z80_io, 8 ); diff --git a/src/mame/includes/pgm2.h b/src/mame/includes/pgm2.h index 1bccdc5688a..9486c408b14 100644 --- a/src/mame/includes/pgm2.h +++ b/src/mame/includes/pgm2.h @@ -104,6 +104,10 @@ public: INTERRUPT_GEN_MEMBER(igs_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(igs_interrupt2); + void pgm2_ramrom(machine_config &config); + void pgm2_lores(machine_config &config); + void pgm2(machine_config &config); + void pgm2_hires(machine_config &config); private: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/phc25.h b/src/mame/includes/phc25.h index 5b772545813..8f250e1a5d0 100644 --- a/src/mame/includes/phc25.h +++ b/src/mame/includes/phc25.h @@ -43,6 +43,9 @@ public: MC6847_GET_CHARROM_MEMBER(ntsc_char_rom_r); MC6847_GET_CHARROM_MEMBER(pal_char_rom_r); + void phc25(machine_config &config); + void pal(machine_config &config); + void ntsc(machine_config &config); private: virtual void video_start() override; uint8_t *m_char_rom; diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h index 9bfdb286e8c..e2df7565ac6 100644 --- a/src/mame/includes/phoenix.h +++ b/src/mame/includes/phoenix.h @@ -41,6 +41,10 @@ public: DECLARE_READ8_MEMBER(survival_protection_r); DECLARE_READ_LINE_MEMBER(survival_sid_callback); + void condor(machine_config &config); + void phoenix(machine_config &config); + void survival(machine_config &config); + void pleiads(machine_config &config); protected: required_device m_maincpu; optional_device m_pleiads_custom; diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h index fb43d757c0a..3164d2edc8f 100644 --- a/src/mame/includes/pingpong.h +++ b/src/mame/includes/pingpong.h @@ -39,4 +39,6 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(pingpong_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(merlinmm_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void merlinmm(machine_config &config); + void pingpong(machine_config &config); }; diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h index 2f8f9eb7c15..030ec21c3e2 100644 --- a/src/mame/includes/pirates.h +++ b/src/mame/includes/pirates.h @@ -59,4 +59,5 @@ public: void decrypt_p(); void decrypt_s(); void decrypt_oki(); + void pirates(machine_config &config); }; diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h index d0de3a6e7d3..f9b0e6b0b56 100644 --- a/src/mame/includes/pitnrun.h +++ b/src/mame/includes/pitnrun.h @@ -78,4 +78,6 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void spotlights(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void pitnrun_mcu(machine_config &config); + void pitnrun(machine_config &config); }; diff --git a/src/mame/includes/pk8020.h b/src/mame/includes/pk8020.h index c15a9c3bb60..57fb7ac37da 100644 --- a/src/mame/includes/pk8020.h +++ b/src/mame/includes/pk8020.h @@ -80,6 +80,7 @@ public: DECLARE_WRITE_LINE_MEMBER(pk8020_pit_out0); DECLARE_WRITE_LINE_MEMBER(pk8020_pit_out1); + void pk8020(machine_config &config); protected: required_device m_maincpu; required_device m_ppi8255_1; diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h index 86da38a35f1..b762ba257a1 100644 --- a/src/mame/includes/pktgaldx.h +++ b/src/mame/includes/pktgaldx.h @@ -64,4 +64,6 @@ public: DECLARE_WRITE16_MEMBER( vblank_ack_w ); DECO16IC_BANK_CB_MEMBER(bank_callback); + void pktgaldx(machine_config &config); + void pktgaldb(machine_config &config); }; diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index 1d987914634..99fad14825b 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -140,4 +140,7 @@ public: void gboard_scanline_cb( int scanline, int vblank, int blanked ); void ppu_irq(int *ppu_regs); void mapper9_latch(offs_t offset); + void playch10(machine_config &config); + void playchnv(machine_config &config); + void playch10_hboard(machine_config &config); }; diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index 1ced417116a..40c005a0f09 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -121,4 +121,11 @@ public: required_device m_palette; optional_device m_ticket; optional_device m_token; + void wbeachvl(machine_config &config); + void hrdtimes(machine_config &config); + void luckboomh(machine_config &config); + void bigtwin(machine_config &config); + void hotmind(machine_config &config); + void bigtwinb(machine_config &config); + void excelsr(machine_config &config); }; diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index ddcf4ab811f..179c3ecbe89 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -113,6 +113,7 @@ public: uint32_t screen_update_polygonet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(polygonet_interrupt); DECLARE_WRITE_LINE_MEMBER(k054539_nmi_gen); + void plygonet(machine_config &config); }; #endif // MAME_INCLUDES_PLYGONET_H diff --git a/src/mame/includes/pmd85.h b/src/mame/includes/pmd85.h index a876f1d9281..efde2d9ca79 100644 --- a/src/mame/includes/pmd85.h +++ b/src/mame/includes/pmd85.h @@ -108,6 +108,13 @@ public: DECLARE_WRITE8_MEMBER(pmd85_ppi_3_portc_w); DECLARE_INPUT_CHANGED_MEMBER(pmd85_reset); + void pmd85(machine_config &config); + void pmd851(machine_config &config); + void pmd853(machine_config &config); + void pmd852a(machine_config &config); + void alfa(machine_config &config); + void c2717(machine_config &config); + void mato(machine_config &config); protected: required_device m_maincpu; required_device m_ram; diff --git a/src/mame/includes/pocketc.h b/src/mame/includes/pocketc.h index 5edc361dc70..d86a319a5aa 100644 --- a/src/mame/includes/pocketc.h +++ b/src/mame/includes/pocketc.h @@ -21,6 +21,7 @@ public: static const unsigned short pocketc_colortable[8][2]; void pocketc_draw_special(bitmap_ind16 &bitmap,int x, int y, const POCKETC_FIGURE fig, int color); + void pocketc(machine_config &config); }; #endif /* POCKETC_H_ */ diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h index c871713bd98..30fa3b726ee 100644 --- a/src/mame/includes/pokechmp.h +++ b/src/mame/includes/pokechmp.h @@ -34,4 +34,5 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_soundlatch; + void pokechmp(machine_config &config); }; diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h index bc01039678c..3e03aa6165e 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -138,6 +138,9 @@ public: void draw_road(bitmap_ind16 &bitmap); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void zoom_sprite(bitmap_ind16 &bitmap,int big,uint32_t code,uint32_t color,int flipx,int sx,int sy,int sizex,int sizey); + void polepos2bi(machine_config &config); + void topracern(machine_config &config); + void polepos(machine_config &config); }; diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h index 8b8b6c090ce..e0fd766dae5 100644 --- a/src/mame/includes/policetr.h +++ b/src/mame/includes/policetr.h @@ -68,6 +68,8 @@ public: required_device m_eeprom; required_device m_screen; required_device m_palette; + void sshooter(machine_config &config); + void policetr(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/poly88.h b/src/mame/includes/poly88.h index 24e402dd069..ecf434ec4f9 100644 --- a/src/mame/includes/poly88.h +++ b/src/mame/includes/poly88.h @@ -64,6 +64,8 @@ public: IRQ_CALLBACK_MEMBER(poly88_irq_callback); DECLARE_SNAPSHOT_LOAD_MEMBER( poly88 ); + void poly88(machine_config &config); + void poly8813(machine_config &config); protected: required_device m_maincpu; required_device m_uart; diff --git a/src/mame/includes/poly880.h b/src/mame/includes/poly880.h index ceca63efc3f..a439bb133fb 100644 --- a/src/mame/includes/poly880.h +++ b/src/mame/includes/poly880.h @@ -53,6 +53,7 @@ public: /* display state */ uint8_t m_digit; uint8_t m_segment; + void poly880(machine_config &config); }; #endif diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index 55e54a7ce08..1b17cc61287 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -69,6 +69,8 @@ public: DECLARE_WRITE8_MEMBER(polyplay_characterram_w); DECLARE_PALETTE_INIT(polyplay); uint32_t screen_update_polyplay(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void polyplay_zre(machine_config &config); + void polyplay_zrepp(machine_config &config); }; #endif // MAME_INCLUDES_POLYPLAY_H diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h index 865eeebbdff..95809c468f9 100644 --- a/src/mame/includes/poolshrk.h +++ b/src/mame/includes/poolshrk.h @@ -55,6 +55,7 @@ public: DECLARE_PALETTE_INIT(poolshrk); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void poolshrk(machine_config &config); }; diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h index a9143e8de4c..ce72b08d310 100644 --- a/src/mame/includes/pooyan.h +++ b/src/mame/includes/pooyan.h @@ -47,4 +47,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); INTERRUPT_GEN_MEMBER(interrupt); + void pooyan(machine_config &config); }; diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h index b677b677d25..8f673fc7bdb 100644 --- a/src/mame/includes/popeye.h +++ b/src/mame/includes/popeye.h @@ -65,4 +65,8 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void tpp2(machine_config &config); + void tpp1(machine_config &config); + void tnx1(machine_config &config); + void popeyebl(machine_config &config); }; diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h index 643b2c0847a..7bc9148e6e0 100644 --- a/src/mame/includes/portrait.h +++ b/src/mame/includes/portrait.h @@ -43,4 +43,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); inline void get_tile_info( tile_data &tileinfo, int tile_index, const uint8_t *source ); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void portrait(machine_config &config); }; diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index 55e93b62866..13a4bd12914 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -49,4 +49,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); + void powerinsa(machine_config &config); + void powerinsb(machine_config &config); + void powerins(machine_config &config); }; diff --git a/src/mame/includes/pp01.h b/src/mame/includes/pp01.h index 6b3dd876d36..ce9d2ce9eea 100644 --- a/src/mame/includes/pp01.h +++ b/src/mame/includes/pp01.h @@ -62,6 +62,7 @@ public: DECLARE_READ8_MEMBER(pp01_8255_portc_r); void pp01_video_w(uint8_t block,uint16_t offset,uint8_t data,uint8_t part); void pp01_set_memory(uint8_t block, uint8_t data); + void pp01(machine_config &config); }; #endif // MAME_INCLUDES_PP01_H diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h index e943f7f1697..49c2ad3d26e 100644 --- a/src/mame/includes/prehisle.h +++ b/src/mame/includes/prehisle.h @@ -51,4 +51,5 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_soundlatch; + void prehisle(machine_config &config); }; diff --git a/src/mame/includes/primo.h b/src/mame/includes/primo.h index 86faa87ad60..c7984a7f7fb 100644 --- a/src/mame/includes/primo.h +++ b/src/mame/includes/primo.h @@ -66,6 +66,13 @@ public: void primo_setup_pp (uint8_t* quickload_data, uint32_t quickload_size); DECLARE_SNAPSHOT_LOAD_MEMBER( primo ); DECLARE_QUICKLOAD_LOAD_MEMBER( primo ); + void primob32(machine_config &config); + void primob64(machine_config &config); + void primoa32(machine_config &config); + void primob48(machine_config &config); + void primoa64(machine_config &config); + void primoc64(machine_config &config); + void primoa48(machine_config &config); }; diff --git a/src/mame/includes/prof180x.h b/src/mame/includes/prof180x.h index e8af51790e9..a5083b56acf 100644 --- a/src/mame/includes/prof180x.h +++ b/src/mame/includes/prof180x.h @@ -45,6 +45,7 @@ public: int m_c2; int m_mm0; int m_mm1; + void prof180x(machine_config &config); }; #endif // MAME_INCLUDES_PROF180X_H diff --git a/src/mame/includes/prof80.h b/src/mame/includes/prof80.h index 253ef3311de..fab918f06f9 100644 --- a/src/mame/includes/prof80.h +++ b/src/mame/includes/prof80.h @@ -101,6 +101,7 @@ public: // timers emu_timer *m_floppy_motor_off_timer; + void prof80(machine_config &config); }; #endif diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index d7966c94524..e4f95bc0508 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -107,4 +107,9 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void sngkace(machine_config &config); + void s1945jn(machine_config &config); + void gunbird(machine_config &config); + void s1945(machine_config &config); + void s1945bl(machine_config &config); }; diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 74e3900a36a..df6b69bd023 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -75,4 +75,6 @@ public: uint32_t screen_update_psikyo4_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(psikyosh_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint32_t scr); + void ps4big(machine_config &config); + void ps4small(machine_config &config); }; diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index 8ae929348d0..b303933c71c 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -85,4 +85,7 @@ public: void psikyosh_drawgfxzoom( bitmap_rgb32 &dest_bmp,const rectangle &clip,gfx_element *gfx, uint32_t code,uint32_t color,int flipx,int flipy,int offsx,int offsy, int alpha, int zoomx, int zoomy, int wide, int high, uint32_t z); + void psikyo3v1(machine_config &config); + void psikyo5(machine_config &config); + void psikyo5_240(machine_config &config); }; diff --git a/src/mame/includes/psion.h b/src/mame/includes/psion.h index ac635097caf..724594245f4 100644 --- a/src/mame/includes/psion.h +++ b/src/mame/includes/psion.h @@ -83,6 +83,13 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(nmi_timer); HD44780_PIXEL_UPDATE(lz_pixel_update); + void psion_2lines(machine_config &config); + void psion_4lines(machine_config &config); + void psionlam(machine_config &config); + void psioncm(machine_config &config); + void psionlz(machine_config &config); + void psionla(machine_config &config); + void psionp350(machine_config &config); }; @@ -100,6 +107,7 @@ public: DECLARE_READ8_MEMBER( switchoff_r ); HD44780_PIXEL_UPDATE(psion1_pixel_update); + void psion1(machine_config &config); }; #endif // _PSION_H_ diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h index c4aba904c71..78165e5a7ee 100644 --- a/src/mame/includes/psychic5.h +++ b/src/mame/includes/psychic5.h @@ -91,5 +91,7 @@ public: void change_bg_palette(int color, int lo_offs, int hi_offs); void set_background_palette_intensity(); void draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect); + void psychic5(machine_config &config); + void bombsa(machine_config &config); void draw_background(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); //only used by psychic5 }; diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h index 363c91c08bc..3d19b0641a1 100644 --- a/src/mame/includes/punchout.h +++ b/src/mame/includes/punchout.h @@ -90,4 +90,7 @@ public: void drawbs2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void punchout_copy_top_palette(int bank); void punchout_copy_bot_palette(int bank); + void spnchout(machine_config &config); + void armwrest(machine_config &config); + void punchout(machine_config &config); }; diff --git a/src/mame/includes/px8.h b/src/mame/includes/px8.h index 7daaa05ad69..6fa9366f572 100644 --- a/src/mame/includes/px8.h +++ b/src/mame/includes/px8.h @@ -80,6 +80,7 @@ public: /* keyboard state */ int m_ksc; /* keyboard scan column */ DECLARE_PALETTE_INIT(px8); + void px8(machine_config &config); }; #endif diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h index 400b063f9bc..d266f8ca05e 100644 --- a/src/mame/includes/qdrmfgp.h +++ b/src/mame/includes/qdrmfgp.h @@ -71,4 +71,6 @@ public: DECLARE_WRITE_LINE_MEMBER(k054539_irq1_gen); K056832_CB_MEMBER(qdrmfgp_tile_callback); K056832_CB_MEMBER(qdrmfgp2_tile_callback); + void qdrmfgp(machine_config &config); + void qdrmfgp2(machine_config &config); }; diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h index 92af91ed04b..50a63e8c010 100644 --- a/src/mame/includes/qix.h +++ b/src/mame/includes/qix.h @@ -146,16 +146,16 @@ public: int kram3_decrypt(int address, int value); DECLARE_WRITE_LINE_MEMBER(kram3_lic_maincpu_changed); DECLARE_WRITE_LINE_MEMBER(kram3_lic_videocpu_changed); + void mcu(machine_config &config); + void qix_base(machine_config &config); + void qix(machine_config &config); + void qix_video(machine_config &config); + void qix_audio(machine_config &config); + void zookeep(machine_config &config); + void zookeep_video(machine_config &config); + void kram3(machine_config &config); + void kram3_video(machine_config &config); + void slither(machine_config &config); + void slither_video(machine_config &config); + void slither_audio(machine_config &config); }; - -/*----------- defined in video/qix.c -----------*/ - -MACHINE_CONFIG_EXTERN( qix_video ); -MACHINE_CONFIG_EXTERN( kram3_video ); -MACHINE_CONFIG_EXTERN( zookeep_video ); -MACHINE_CONFIG_EXTERN( slither_video ); - -/*----------- defined in audio/qix.c -----------*/ - -MACHINE_CONFIG_EXTERN( qix_audio ); -MACHINE_CONFIG_EXTERN( slither_audio ); diff --git a/src/mame/includes/quasar.h b/src/mame/includes/quasar.h index 972aa632e1a..df5e0e7372e 100644 --- a/src/mame/includes/quasar.h +++ b/src/mame/includes/quasar.h @@ -32,4 +32,5 @@ public: DECLARE_PALETTE_INIT(quasar); uint32_t screen_update_quasar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(quasar_interrupt); + void quasar(machine_config &config); }; diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h index d5b8d45f988..a0d28da6691 100644 --- a/src/mame/includes/quizdna.h +++ b/src/mame/includes/quizdna.h @@ -46,4 +46,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void gakupara(machine_config &config); + void quizdna(machine_config &config); + void gekiretu(machine_config &config); }; diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h index 7031cadd85d..c21efef2692 100644 --- a/src/mame/includes/quizpani.h +++ b/src/mame/includes/quizpani.h @@ -36,4 +36,5 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void quizpani(machine_config &config); }; diff --git a/src/mame/includes/radio86.h b/src/mame/includes/radio86.h index 21bb9f774fe..2eda68ad751 100644 --- a/src/mame/includes/radio86.h +++ b/src/mame/includes/radio86.h @@ -88,6 +88,14 @@ public: I8275_DRAW_CHARACTER_MEMBER(display_pixels); required_device m_maincpu; + void impuls03(machine_config &config); + void mikron2(machine_config &config); + void rk7007(machine_config &config); + void rk700716(machine_config &config); + void radiorom(machine_config &config); + void radio86(machine_config &config); + void radio16(machine_config &config); + void radioram(machine_config &config); protected: required_device m_cassette; optional_device m_cart; // for ROMDisk - only Radio86K & Orion? diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h index ac165d7c857..c47838d6d9a 100644 --- a/src/mame/includes/raiden.h +++ b/src/mame/includes/raiden.h @@ -72,4 +72,8 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri_mask); void common_decrypt(); + void raidene(machine_config &config); + void raidenb(machine_config &config); + void raiden(machine_config &config); + void raidenu(machine_config &config); }; diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h index 0a977771246..527d7024355 100644 --- a/src/mame/includes/raiden2.h +++ b/src/mame/includes/raiden2.h @@ -153,6 +153,10 @@ public: bitmap_ind16 tile_buffer, sprite_buffer; optional_device m_raiden2cop; + void raidendx(machine_config &config); + void xsedae(machine_config &config); + void zeroteam(machine_config &config); + void raiden2(machine_config &config); protected: virtual void machine_start() override; }; diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h index 762c4f12c21..03213aa1a83 100644 --- a/src/mame/includes/rallyx.h +++ b/src/mame/includes/rallyx.h @@ -96,4 +96,9 @@ public: void rallyx_draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprect, bool transpen ); void jungler_draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprect, bool transpen ); void locomotn_draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprect, bool transpen ); + void commsega(machine_config &config); + void locomotn(machine_config &config); + void tactcian(machine_config &config); + void rallyx(machine_config &config); + void jungler(machine_config &config); }; diff --git a/src/mame/includes/rampart.h b/src/mame/includes/rampart.h index 9ac21bea826..ff2285e67fc 100644 --- a/src/mame/includes/rampart.h +++ b/src/mame/includes/rampart.h @@ -38,4 +38,5 @@ public: void rampart_bitmap_render(bitmap_ind16 &bitmap, const rectangle &cliprect); static const atari_motion_objects_config s_mob_config; + void rampart(machine_config &config); }; diff --git a/src/mame/includes/rastan.h b/src/mame/includes/rastan.h index f66399d8b64..68ff9bbe6f7 100644 --- a/src/mame/includes/rastan.h +++ b/src/mame/includes/rastan.h @@ -49,4 +49,5 @@ public: virtual void machine_reset() override; uint32_t screen_update_rastan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(rastan_msm5205_vck); + void rastan(machine_config &config); }; diff --git a/src/mame/includes/rbisland.h b/src/mame/includes/rbisland.h index cc98c94145f..66f3e4e90c4 100644 --- a/src/mame/includes/rbisland.h +++ b/src/mame/includes/rbisland.h @@ -78,6 +78,9 @@ public: void request_world_data( ); void request_goalin_data( ); void rbisland_cchip_init( int version ); + void jumping(machine_config &config); + void rbisland(machine_config &config); + void jumpingi(machine_config &config); }; diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h index 5349a00dc2f..5382e2f80c2 100644 --- a/src/mame/includes/realbrk.h +++ b/src/mame/includes/realbrk.h @@ -76,4 +76,8 @@ public: void dai2kaku_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, int layer); INTERRUPT_GEN_MEMBER(interrupt); + void pkgnsh(machine_config &config); + void dai2kaku(machine_config &config); + void realbrk(machine_config &config); + void pkgnshdx(machine_config &config); }; diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h index 2e9c8779b93..b26e311ccba 100644 --- a/src/mame/includes/redalert.h +++ b/src/mame/includes/redalert.h @@ -73,16 +73,18 @@ public: DECLARE_WRITE8_MEMBER(demoneye_ay8910_data_w); void get_pens(pen_t *pens); void get_panther_pens(pen_t *pens); + void demoneye(machine_config &config); + void demoneye_video(machine_config &config); + void demoneye_audio(machine_config &config); + void ww3(machine_config &config); + void ww3_video(machine_config &config); + void ww3_audio(machine_config &config); + void panther(machine_config &config); + void panther_video(machine_config &config); + void redalert(machine_config &config); + void redalert_video(machine_config &config); + void redalert_video_common(machine_config &config); + void redalert_audio(machine_config &config); + void redalert_audio_m37b(machine_config &config); + void redalert_audio_voice(machine_config &config); }; -/*----------- defined in audio/redalert.c -----------*/ - -MACHINE_CONFIG_EXTERN( redalert_audio ); -MACHINE_CONFIG_EXTERN( ww3_audio ); -MACHINE_CONFIG_EXTERN( demoneye_audio ); - -/*----------- defined in video/redalert.c -----------*/ - -MACHINE_CONFIG_EXTERN( ww3_video ); -MACHINE_CONFIG_EXTERN( panther_video ); -MACHINE_CONFIG_EXTERN( redalert_video ); -MACHINE_CONFIG_EXTERN( demoneye_video ); diff --git a/src/mame/includes/redclash.h b/src/mame/includes/redclash.h index c50a0faa9a0..0db7f65defb 100644 --- a/src/mame/includes/redclash.h +++ b/src/mame/includes/redclash.h @@ -62,4 +62,7 @@ public: void redclash_draw_stars(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t palette_offset, uint8_t sraider, uint8_t firstx, uint8_t lastx); void redclash_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void redclash_draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void zerohour(machine_config &config); + void sraider(machine_config &config); + void redclash(machine_config &config); }; diff --git a/src/mame/includes/relief.h b/src/mame/includes/relief.h index 3f470ea33b4..cb4243aa49f 100644 --- a/src/mame/includes/relief.h +++ b/src/mame/includes/relief.h @@ -43,4 +43,5 @@ public: uint32_t screen_update_relief(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); static const atari_motion_objects_config s_mob_config; + void relief(machine_config &config); }; diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h index 24a993e5ffc..adc4235fb5e 100644 --- a/src/mame/includes/renegade.h +++ b/src/mame/includes/renegade.h @@ -74,4 +74,6 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void renegade(machine_config &config); + void kuniokunb(machine_config &config); }; diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h index ca5928fbf44..ed90a90f923 100644 --- a/src/mame/includes/retofinv.h +++ b/src/mame/includes/retofinv.h @@ -48,6 +48,10 @@ public: INTERRUPT_GEN_MEMBER(main_vblank_irq); INTERRUPT_GEN_MEMBER(sub_vblank_irq); + void retofinvb1_nomcu(machine_config &config); + void retofinvb_nomcu(machine_config &config); + void retofinv(machine_config &config); + void retofinvb1(machine_config &config); protected: virtual void machine_start() override; virtual void video_start() override; diff --git a/src/mame/includes/rltennis.h b/src/mame/includes/rltennis.h index c2d3b882ab1..b3db9cdbdaa 100644 --- a/src/mame/includes/rltennis.h +++ b/src/mame/includes/rltennis.h @@ -48,4 +48,5 @@ public: INTERRUPT_GEN_MEMBER(interrupt); TIMER_CALLBACK_MEMBER(sample_player); + void rltennis(machine_config &config); }; diff --git a/src/mame/includes/rm380z.h b/src/mame/includes/rm380z.h index b853afa34ce..75cadff113d 100644 --- a/src/mame/includes/rm380z.h +++ b/src/mame/includes/rm380z.h @@ -140,6 +140,8 @@ public: uint32_t screen_update_rm380z(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_rm480z(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(static_vblank_timer); + void rm480z(machine_config &config); + void rm380z(machine_config &config); }; #endif // MAME_INCLUDES_RM380Z_H diff --git a/src/mame/includes/rmnimbus.h b/src/mame/includes/rmnimbus.h index 453051d8713..88ba462dd94 100644 --- a/src/mame/includes/rmnimbus.h +++ b/src/mame/includes/rmnimbus.h @@ -226,6 +226,7 @@ public: emu_timer *m_mouse_timer; } m_nimbus_mouse; + void nimbus(machine_config &config); private: void debug_command(int ref, const std::vector ¶ms); void video_debug(int ref, const std::vector ¶ms); diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index 78da46f78f5..6b185d9e493 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -55,4 +55,5 @@ public: K007342_CALLBACK_MEMBER(rockrage_tile_callback); K007420_CALLBACK_MEMBER(rockrage_sprite_callback); + void rockrage(machine_config &config); }; diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h index f02426b00a3..c49d789e517 100644 --- a/src/mame/includes/rocnrope.h +++ b/src/mame/includes/rocnrope.h @@ -43,4 +43,5 @@ public: uint32_t screen_update_rocnrope(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void rocnrope(machine_config &config); }; diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h index ed3345f4121..5d6399e481c 100644 --- a/src/mame/includes/rohga.h +++ b/src/mame/includes/rohga.h @@ -86,4 +86,9 @@ public: WRITE16_MEMBER( nb_protection_region_0_146_w ); READ16_MEMBER( wf_protection_region_0_104_r ); WRITE16_MEMBER( wf_protection_region_0_104_w ); + void wizdfire(machine_config &config); + void nitrobal(machine_config &config); + void hangzo(machine_config &config); + void schmeisr(machine_config &config); + void rohga(machine_config &config); }; diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h index f1d65e83757..e183bb74a0e 100644 --- a/src/mame/includes/rollerg.h +++ b/src/mame/includes/rollerg.h @@ -50,6 +50,7 @@ public: K051316_CB_MEMBER(zoom_callback); DECLARE_WRITE8_MEMBER(banking_callback); + void rollerg(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h index 88c6ebdbe05..3751ea6459e 100644 --- a/src/mame/includes/rollrace.h +++ b/src/mame/includes/rollrace.h @@ -60,4 +60,6 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(sound_timer_irq); + void rollace2(machine_config &config); + void rollrace(machine_config &config); }; diff --git a/src/mame/includes/route16.h b/src/mame/includes/route16.h index 31eb658ad58..4dde0b78707 100644 --- a/src/mame/includes/route16.h +++ b/src/mame/includes/route16.h @@ -35,6 +35,12 @@ public: uint32_t screen_update_route16(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_ttmahjng(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void routex(machine_config &config); + void ttmahjng(machine_config &config); + void spacecho(machine_config &config); + void speakres(machine_config &config); + void stratvox(machine_config &config); + void route16(machine_config &config); private: required_device m_cpu1; required_device m_cpu2; diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index a67e0f56fc6..e0467f5aed5 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -70,4 +70,7 @@ public: TIMER_CALLBACK_MEMBER(crtc_interrupt_gen); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int start, int stop); void draw_bitmap(bitmap_ind16 &bitmap, const rectangle &cliprect); + void svolley(machine_config &config); + void rpunch(machine_config &config); + void svolleybl(machine_config &config); }; diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index adcbdebab3a..785486aed75 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -39,4 +39,6 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void qwak(machine_config &config); + void runaway(machine_config &config); }; diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index 601f121e17d..a604732d0c3 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -108,4 +108,6 @@ public: void sprite_dma_trigger(void); INTERRUPT_GEN_MEMBER(rng_interrupt); + void rng(machine_config &config); + void rng_dual(machine_config &config); }; diff --git a/src/mame/includes/s11.h b/src/mame/includes/s11.h index 3f5e1bf0a1a..8165cdfbfba 100644 --- a/src/mame/includes/s11.h +++ b/src/mame/includes/s11.h @@ -80,6 +80,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); DECLARE_MACHINE_RESET(s11); DECLARE_DRIVER_INIT(s11); + void s11(machine_config &config); protected: // devices required_device m_maincpu; diff --git a/src/mame/includes/s11a.h b/src/mame/includes/s11a.h index ffe7331bc31..dbc1ccbb692 100644 --- a/src/mame/includes/s11a.h +++ b/src/mame/includes/s11a.h @@ -23,6 +23,7 @@ public: DECLARE_MACHINE_RESET(s11a); DECLARE_DRIVER_INIT(s11a); + void s11a(machine_config &config); protected: private: diff --git a/src/mame/includes/s11b.h b/src/mame/includes/s11b.h index e5eab564f68..a03284792a9 100644 --- a/src/mame/includes/s11b.h +++ b/src/mame/includes/s11b.h @@ -32,6 +32,7 @@ public: DECLARE_DRIVER_INIT(s11b); DECLARE_DRIVER_INIT(s11b_invert); + void s11b(machine_config &config); protected: optional_device m_bg_hc55516; diff --git a/src/mame/includes/s11c.h b/src/mame/includes/s11c.h index c771a1f52d6..a44be5fcece 100644 --- a/src/mame/includes/s11c.h +++ b/src/mame/includes/s11c.h @@ -21,6 +21,7 @@ public: DECLARE_MACHINE_RESET(s11c); DECLARE_DRIVER_INIT(s11c); + void s11c(machine_config &config); protected: private: diff --git a/src/mame/includes/sage2.h b/src/mame/includes/sage2.h index 1e56b07ad12..9b45334c44b 100644 --- a/src/mame/includes/sage2.h +++ b/src/mame/includes/sage2.h @@ -88,4 +88,5 @@ public: DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); DECLARE_WRITE_LINE_MEMBER(write_centronics_select); DECLARE_WRITE_LINE_MEMBER(write_centronics_fault); + void sage2(machine_config &config); }; diff --git a/src/mame/includes/samcoupe.h b/src/mame/includes/samcoupe.h index f1f3967a19c..2990a706c10 100644 --- a/src/mame/includes/samcoupe.h +++ b/src/mame/includes/samcoupe.h @@ -196,6 +196,7 @@ public: int m_lpt1_busy; int m_lpt2_busy; + void samcoupe(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index 54dc91214ec..61464ed77d8 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -71,4 +71,8 @@ public: uint32_t screen_update_sauro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void sauro_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void trckydoc_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void trckydoc(machine_config &config); + void tecfri(machine_config &config); + void sauro(machine_config &config); + void saurob(machine_config &config); }; diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index 8de944e782c..4626c644ca6 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -60,4 +60,6 @@ public: uint32_t screen_update_sbasketb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void sbasketb(machine_config &config); + void sbasketbu(machine_config &config); }; diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h index d9a29404f49..850fe9ae589 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -27,4 +27,5 @@ public: DECLARE_PALETTE_INIT(sbugger); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void sbugger(machine_config &config); }; diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h index 6bf1442832a..0fcb99645fc 100644 --- a/src/mame/includes/scotrsht.h +++ b/src/mame/includes/scotrsht.h @@ -51,4 +51,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void scotrsht(machine_config &config); }; diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h index a4b5ae5a369..47d25bcf4a1 100644 --- a/src/mame/includes/scramble.h +++ b/src/mame/includes/scramble.h @@ -93,6 +93,23 @@ public: DECLARE_WRITE8_MEMBER( mrkougar_sh_irqtrigger_w ); IRQ_CALLBACK_MEMBER( scramble_sh_irq_callback ); + void scramble(machine_config &config); + void hncholms(machine_config &config); + void cavelon(machine_config &config); + void harem(machine_config &config); + void ad2083(machine_config &config); + void ad2083_audio(machine_config &config); + void mrkougar(machine_config &config); + void mars(machine_config &config); + void hunchbks(machine_config &config); + void hotshock(machine_config &config); + void mariner(machine_config &config); + void devilfsh(machine_config &config); + void triplep(machine_config &config); + void newsin7(machine_config &config); + void mimonscr(machine_config &config); + void ckongs(machine_config &config); + void mrkougb(machine_config &config); private: void cavelon_banksw(); inline int bit(int i,int n); @@ -108,7 +125,3 @@ private: std::unique_ptr m_harem_decrypted_data; std::unique_ptr m_harem_decrypted_opcodes; }; - -/*----------- defined in audio/scramble.cpp -----------*/ - -MACHINE_CONFIG_EXTERN( ad2083_audio ); diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index 3d227e2aebd..a68e4072522 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -45,4 +45,10 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void spacewin(machine_config &config); + void sderbya(machine_config &config); + void pmroulet(machine_config &config); + void shinygld(machine_config &config); + void sderby(machine_config &config); + void luckboom(machine_config &config); }; diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index 88aeabef6cd..3814d89eabf 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -165,6 +165,19 @@ public: inline uint8_t demangle(uint8_t d7d6, uint8_t d5d4, uint8_t d3d2, uint8_t d1d0); void monsterb_expand_gfx(const char *region); + void g80r_base(machine_config &config); + void monsterb(machine_config &config); + void sindbadm(machine_config &config); + void astrob(machine_config &config); + void pignewt(machine_config &config); + void monster2(machine_config &config); + void sega005(machine_config &config); + void spaceod(machine_config &config); + void astrob_sound_board(machine_config &config); + void sega005_sound_board(machine_config &config); + void spaceod_sound_board(machine_config &config); + void monsterb_sound_board(machine_config &config); + void sega_speech_board(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; emu_timer *m_vblank_latch_clear_timer; @@ -197,12 +210,6 @@ private: DECLARE_DEVICE_TYPE(SEGA005, sega005_sound_device) - -MACHINE_CONFIG_EXTERN( astrob_sound_board ); -MACHINE_CONFIG_EXTERN( 005_sound_board ); -MACHINE_CONFIG_EXTERN( spaceod_sound_board ); -MACHINE_CONFIG_EXTERN( monsterb_sound_board ); - /*----------- defined in video/segag80r.c -----------*/ #define G80_BACKGROUND_NONE 0 diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h index 9ac55eaf465..969806dfe9f 100644 --- a/src/mame/includes/segag80v.h +++ b/src/mame/includes/segag80v.h @@ -76,4 +76,11 @@ public: void sega_generate_vector_list(); offs_t decrypt_offset(address_space &space, offs_t offset); inline uint8_t demangle(uint8_t d7d6, uint8_t d5d4, uint8_t d3d2, uint8_t d1d0); + void g80v_base(machine_config &config); + void tacscan(machine_config &config); + void elim2(machine_config &config); + void startrek(machine_config &config); + void zektor(machine_config &config); + void spacfury(machine_config &config); + void sega_speech_board(machine_config &config); }; diff --git a/src/mame/includes/segahang.h b/src/mame/includes/segahang.h index 397a6ea635a..89b0454334d 100644 --- a/src/mame/includes/segahang.h +++ b/src/mame/includes/segahang.h @@ -70,6 +70,24 @@ public: // video updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void sound_board_2203(machine_config &config); + void sound_board_2203x2(machine_config &config); + void sound_board_2151(machine_config &config); + void shared_base(machine_config &config); + void hangon_base(machine_config &config); + void sharrier_base(machine_config &config); + void enduror_base(machine_config &config); + void endurord_base(machine_config &config); + void endurob2(machine_config &config); + void shangupb(machine_config &config); + void enduror(machine_config &config); + void shangonro(machine_config &config); + void enduror1d(machine_config &config); + void endurord(machine_config &config); + void sharrier(machine_config &config); + void endurobl(machine_config &config); + void enduror1(machine_config &config); + void hangon(machine_config &config); protected: // internal types typedef delegate i8751_sim_delegate; diff --git a/src/mame/includes/segaorun.h b/src/mame/includes/segaorun.h index 5cdd41ebdcc..77aa8e5a3ce 100644 --- a/src/mame/includes/segaorun.h +++ b/src/mame/includes/segaorun.h @@ -93,6 +93,13 @@ public: CUSTOM_INPUT_MEMBER( bankmotor_pos_r ); TIMER_DEVICE_CALLBACK_MEMBER(bankmotor_update); + void shangon_fd1089b(machine_config &config); + void outrun_fd1094(machine_config &config); + void outrundx(machine_config &config); + void shangon(machine_config &config); + void outrun_fd1089a(machine_config &config); + void outrun(machine_config &config); + void outrun_base(machine_config &config); protected: // timer IDs enum diff --git a/src/mame/includes/segas16a.h b/src/mame/includes/segas16a.h index 60fdca74b97..24259c660de 100644 --- a/src/mame/includes/segas16a.h +++ b/src/mame/includes/segas16a.h @@ -100,6 +100,17 @@ public: // video updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void system16a_no7751(machine_config &config); + void system16a(machine_config &config); + void system16a_fd1089a_no7751(machine_config &config); + void system16a_fd1089b_no7751(machine_config &config); + void system16a_fd1089a(machine_config &config); + void system16a_fd1094(machine_config &config); + void system16a_no7751p(machine_config &config); + void system16a_fd1094_no7751(machine_config &config); + void system16a_i8751(machine_config &config); + void system16a_fd1089b(machine_config &config); + void aceattaca_fd1094(machine_config &config); protected: // internal types typedef delegate i8751_sim_delegate; diff --git a/src/mame/includes/segas16b.h b/src/mame/includes/segas16b.h index 630613167a7..9824e955865 100644 --- a/src/mame/includes/segas16b.h +++ b/src/mame/includes/segas16b.h @@ -139,6 +139,23 @@ public: // bootleg stuff void tilemap_16b_fpointbl_fill_latch(int i, uint16_t* latched_pageselect, uint16_t* latched_yscroll, uint16_t* latched_xscroll, uint16_t* textram); + void rom_5797_fragment(machine_config &config); + void system16b_fd1094_5797(machine_config &config); + void fpointbla(machine_config &config); + void atomicp(machine_config &config); + void aceattacb_fd1094(machine_config &config); + void system16b_i8751(machine_config &config); + void system16c(machine_config &config); + void system16b_mc8123(machine_config &config); + void system16b_i8751_5797(machine_config &config); + void system16b_fd1089a(machine_config &config); + void system16b_5797(machine_config &config); + void system16b_split(machine_config &config); + void system16b_fd1089b(machine_config &config); + void system16b(machine_config &config); + void system16b_fd1094(machine_config &config); + void fpointbl(machine_config &config); + void lockonph(machine_config &config); protected: // internal types typedef delegate i8751_sim_delegate; @@ -330,4 +347,5 @@ public: uint8_t m_rle_control_byte; bool m_rle_latched; uint8_t m_rle_byte; + void isgsm(machine_config &config); }; diff --git a/src/mame/includes/segas18.h b/src/mame/includes/segas18.h index 3eb6b469491..7004aa2a938 100644 --- a/src/mame/includes/segas18.h +++ b/src/mame/includes/segas18.h @@ -100,6 +100,14 @@ public: DECLARE_WRITE_LINE_MEMBER(set_grayscale); DECLARE_WRITE_LINE_MEMBER(set_vdp_enable); + void wwally(machine_config &config); + void system18(machine_config &config); + void lghost_fd1094(machine_config &config); + void wwally_fd1094(machine_config &config); + void system18_fd1094(machine_config &config); + void system18_fd1094_i8751(machine_config &config); + void lghost(machine_config &config); + void system18_i8751(machine_config &config); protected: // timer IDs enum diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h index 2d4410ccb73..b66854c4154 100644 --- a/src/mame/includes/segas24.h +++ b/src/mame/includes/segas24.h @@ -154,4 +154,12 @@ public: optional_ioport m_paddle; optional_ioport_array<4> m_dials; optional_ioport_array<8> m_mj_inputs; + void mahmajn(machine_config &config); + void system24_floppy_fd_upd(machine_config &config); + void system24_floppy(machine_config &config); + void system24_floppy_fd1094(machine_config &config); + void dcclub(machine_config &config); + void system24_floppy_dcclub(machine_config &config); + void system24_floppy_hotrod(machine_config &config); + void system24(machine_config &config); }; diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index c3339caad7f..621c2c10bcb 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -331,6 +331,7 @@ public: DECLARE_WRITE_LINE_MEMBER(scsi_irq_w); DECLARE_WRITE_LINE_MEMBER(scsi_drq_w); + static void cdrom_config(device_t *device); protected: virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; diff --git a/src/mame/includes/segasp.h b/src/mame/includes/segasp.h index fe1ac92bead..f694ac80f1b 100644 --- a/src/mame/includes/segasp.h +++ b/src/mame/includes/segasp.h @@ -27,5 +27,6 @@ public: DECLARE_WRITE64_MEMBER(sp_bank_w); uint16_t m_sp_bank; + void segasp(machine_config &config); protected: }; diff --git a/src/mame/includes/segaybd.h b/src/mame/includes/segaybd.h index 388caf8ac67..02695ddab68 100644 --- a/src/mame/includes/segaybd.h +++ b/src/mame/includes/segaybd.h @@ -85,6 +85,9 @@ public: // video updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void yboard_deluxe(machine_config &config); + void yboard_link(machine_config &config); + void yboard(machine_config &config); protected: // internal types typedef delegate output_delegate; diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index 1e47875ade0..41bf66c34d4 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -164,4 +164,12 @@ public: void rfjet_text_decrypt(uint8_t *rom); void rfjet_bg_decrypt(uint8_t *rom, int size); + void sys386f(machine_config &config); + void sxx2f(machine_config &config); + void rdft2(machine_config &config); + void ejanhs(machine_config &config); + void sys386i(machine_config &config); + void sxx2g(machine_config &config); + void spi(machine_config &config); + void sxx2e(machine_config &config); }; diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index 0cfffd270c3..fad0c209ba9 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -63,4 +63,7 @@ public: void nvram_init(nvram_device &nvram, void *data, size_t size); DECLARE_WRITE8_MEMBER(dac_w); + void no_nvram(machine_config &config); + void friskytb(machine_config &config); + void nvram(machine_config &config); }; diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index ba37e65a45d..ed74b1f2d5a 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -107,6 +107,10 @@ public: void draw_bgbitmap(bitmap_rgb32 &bitmap, const rectangle &cliprect); void draw_radar(bitmap_rgb32 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect,int priority); + void senjyox_e(machine_config &config); + void senjyo(machine_config &config); + void starforb(machine_config &config); + void senjyox_a(machine_config &config); }; /*----------- defined in audio/senjyo.c -----------*/ diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index 41584c850c1..3133b93fa5b 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -250,6 +250,51 @@ public: DECLARE_WRITE_LINE_MEMBER(pit_out0); DECLARE_WRITE_LINE_MEMBER(utoukond_ym3438_interrupt); SETA001_SPRITE_GFXBANK_CB_MEMBER(setac_gfxbank_callback); + void keroppij(machine_config &config); + void madshark(machine_config &config); + void jjsquawb(machine_config &config); + void oisipuzl(machine_config &config); + void zingzipbl(machine_config &config); + void eightfrc(machine_config &config); + void gundhara(machine_config &config); + void triplfun(machine_config &config); + void calibr50(machine_config &config); + void blandiap(machine_config &config); + void wits(machine_config &config); + void msgundam(machine_config &config); + void extdwnhl(machine_config &config); + void pairlove(machine_config &config); + void zingzip(machine_config &config); + void wiggie(machine_config &config); + void umanclub(machine_config &config); + void tndrcade(machine_config &config); + void daioh(machine_config &config); + void atehate(machine_config &config); + void usclssic(machine_config &config); + void zombraid(machine_config &config); + void thunderlbl(machine_config &config); + void blockcarb(machine_config &config); + void wrofaero(machine_config &config); + void downtown(machine_config &config); + void blockcar(machine_config &config); + void crazyfgt(machine_config &config); + void keroppi(machine_config &config); + void drgnunit(machine_config &config); + void orbs(machine_config &config); + void daiohp(machine_config &config); + void magspeed(machine_config &config); + void krzybowl(machine_config &config); + void kiwame(machine_config &config); + void qzkklgy2(machine_config &config); + void kamenrid(machine_config &config); + void superbar(machine_config &config); + void jjsquawk(machine_config &config); + void twineagl(machine_config &config); + void blandia(machine_config &config); + void thunderl(machine_config &config); + void metafox(machine_config &config); + void utoukond(machine_config &config); + void rezon(machine_config &config); }; class setaroul_state : public seta_state @@ -295,6 +340,7 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank); TIMER_DEVICE_CALLBACK_MEMBER(interrupt); + void setaroul(machine_config &config); private: required_device m_rtc; // ! Actually D4911C ! required_device m_hopper; @@ -346,6 +392,8 @@ public: DECLARE_WRITE16_MEMBER(inttoote_out_w); DECLARE_READ16_MEMBER(inttoote_700000_r); DECLARE_DRIVER_INIT(inttoote); + void inttoote(machine_config &config); + void jockeyc(machine_config &config); private: required_device m_rtc; // ! Actually D4911C ! required_device m_hopper1, m_hopper2; // the 2nd hopper is optional diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index 06f6a3e41a1..4da3ed50f8c 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -130,6 +130,22 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(funcube_interrupt); void funcube_debug_outputs(); + void seta2(machine_config &config); + void funcube(machine_config &config); + void funcube3(machine_config &config); + void funcube2(machine_config &config); + void grdians(machine_config &config); + void myangel(machine_config &config); + void mj4simai(machine_config &config); + void penbros(machine_config &config); + void pzlbowl(machine_config &config); + void myangel2(machine_config &config); + void reelquak(machine_config &config); + void ablastb(machine_config &config); + void gundamex(machine_config &config); + void telpacfl(machine_config &config); + void samshoot(machine_config &config); + void namcostr(machine_config &config); }; @@ -151,6 +167,7 @@ public: uint32_t staraudi_screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void staraudi(machine_config &config); protected: virtual void driver_start() override; diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h index eacba4ef146..09826e88acc 100644 --- a/src/mame/includes/sf.h +++ b/src/mame/includes/sf.h @@ -66,4 +66,8 @@ public: inline int invert( int nb ); void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); void write_dword( address_space &space, offs_t offset, uint32_t data ); + void sfp(machine_config &config); + void sfjp(machine_config &config); + void sfus(machine_config &config); + void sfan(machine_config &config); }; diff --git a/src/mame/includes/sg1000.h b/src/mame/includes/sg1000.h index 169a298cf5d..3c9f8f2f3d1 100644 --- a/src/mame/includes/sg1000.h +++ b/src/mame/includes/sg1000.h @@ -67,6 +67,8 @@ public: DECLARE_READ8_MEMBER( omv_r ); DECLARE_WRITE8_MEMBER( omv_w ); + void sg1000(machine_config &config); + void omv(machine_config &config); }; class sc3000_state : public sg1000_state @@ -77,6 +79,7 @@ public: { } virtual void machine_start() override; + void sc3000(machine_config &config); }; class sf7000_state : public sc3000_state @@ -102,6 +105,7 @@ public: DECLARE_WRITE8_MEMBER( ppi_pc_w ); DECLARE_FLOPPY_FORMATS( floppy_formats ); + void sf7000(machine_config &config); }; #endif diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index 26704c26f74..a526765aed5 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -90,4 +90,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); + void shadfrce(machine_config &config); }; diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index fe446603c24..d5c24a7db0c 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -60,4 +60,7 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void shangha3(machine_config &config); + void heberpop(machine_config &config); + void blocken(machine_config &config); }; diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index 8861b6f5afe..c7843a359ba 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -70,4 +70,7 @@ public: void shangkid_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void dynamski_draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); void dynamski_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void dynamski(machine_config &config); + void chinhero(machine_config &config); + void shangkid(machine_config &config); }; diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h index 3d126ecf822..fc9d0eb5a41 100644 --- a/src/mame/includes/shaolins.h +++ b/src/mame/includes/shaolins.h @@ -42,4 +42,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(interrupt); + void shaolins(machine_config &config); }; diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h index 29b16e26359..d3095f6d5a1 100644 --- a/src/mame/includes/shisen.h +++ b/src/mame/includes/shisen.h @@ -36,4 +36,5 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void shisen(machine_config &config); }; diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index 4a0965797eb..db9ee6a44ca 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -55,4 +55,7 @@ public: uint32_t screen_update_shootout(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_shootouj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int bank_bits ); + void shootouj(machine_config &config); + void shootouk(machine_config &config); + void shootout(machine_config &config); }; diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h index 84cfc76c159..547ca3cf2ac 100644 --- a/src/mame/includes/shuuz.h +++ b/src/mame/includes/shuuz.h @@ -33,4 +33,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); static const atari_motion_objects_config s_mob_config; + void shuuz(machine_config &config); }; diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index ba74d5089b1..582e8b2117f 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -78,4 +78,7 @@ public: void draw_sprites_region(bitmap_ind16 &bitmap, const rectangle &cliprect, int start_offset, int end_offset ); void draw_starfield( bitmap_ind16 &bitmap ); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void sidearms(machine_config &config); + void turtship(machine_config &config); + void whizz(machine_config &config); }; diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index 7a6f7f53cce..2d53dd6f129 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -60,4 +60,6 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); + void sidepcktb(machine_config &config); + void sidepckt(machine_config &config); }; diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index 24fa1f73b16..c2e10d8d4df 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -49,4 +49,5 @@ public: uint32_t screen_update_silkroad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void silkroad(machine_config &config); }; diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h index 8a85b6c117c..304d4aa7005 100644 --- a/src/mame/includes/simpl156.h +++ b/src/mame/includes/simpl156.h @@ -65,4 +65,9 @@ public: virtual void video_start() override; uint32_t screen_update_simpl156(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(simpl156_vbl_interrupt); + void joemacr(machine_config &config); + void magdrop(machine_config &config); + void chainrec(machine_config &config); + void mitchell156(machine_config &config); + void magdropp(machine_config &config); }; diff --git a/src/mame/includes/simple_st0016.h b/src/mame/includes/simple_st0016.h index e417391212c..e05127f40ab 100644 --- a/src/mame/includes/simple_st0016.h +++ b/src/mame/includes/simple_st0016.h @@ -37,4 +37,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(st0016_int); optional_device m_subcpu; required_device m_screen; + void st0016(machine_config &config); + void renju(machine_config &config); + void mayjinsn(machine_config &config); }; diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h index 4ac43b05977..f4d6f256cf0 100644 --- a/src/mame/includes/simpsons.h +++ b/src/mame/includes/simpsons.h @@ -64,6 +64,7 @@ public: DECLARE_WRITE8_MEMBER(banking_callback); K053246_CB_MEMBER(sprite_callback); + void simpsons(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h index c158f772752..bce5daf14e0 100644 --- a/src/mame/includes/skullxbo.h +++ b/src/mame/includes/skullxbo.h @@ -50,4 +50,5 @@ public: DECLARE_WRITE16_MEMBER( skullxbo_mobmsb_w ); static const atari_motion_objects_config s_mob_config; + void skullxbo(machine_config &config); }; diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h index e441fd6f64e..610183b32d3 100644 --- a/src/mame/includes/skydiver.h +++ b/src/mame/includes/skydiver.h @@ -77,6 +77,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(interrupt); + void skydiver(machine_config &config); }; /*----------- defined in audio/skydiver.c -----------*/ diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index 9bd248d368f..83eb041565e 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -45,4 +45,5 @@ public: INTERRUPT_GEN_MEMBER(skyfox_interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect); + void skyfox(machine_config &config); }; diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index 3f894b5696f..7a056dd0341 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -58,4 +58,5 @@ public: INTERRUPT_GEN_MEMBER(main_vblank_irq); INTERRUPT_GEN_MEMBER(mcu_vblank_irq); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); + void skykid(machine_config &config); }; diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h index eebc5827791..efbb254e9a7 100644 --- a/src/mame/includes/skyraid.h +++ b/src/mame/includes/skyraid.h @@ -41,6 +41,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void skyraid(machine_config &config); }; /*----------- defined in audio/skyraid.c -----------*/ diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index 043a9ea3f4b..e27aa6caac3 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -116,4 +116,13 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(sound_nmi); + void tigerhb2(machine_config &config); + void tigerhb1(machine_config &config); + void tigerh(machine_config &config); + void getstarb2(machine_config &config); + void slapfighb2(machine_config &config); + void getstarb1(machine_config &config); + void perfrman(machine_config &config); + void slapfigh(machine_config &config); + void slapfighb1(machine_config &config); }; diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h index 7ccdf55bff0..44fd178477b 100644 --- a/src/mame/includes/slapshot.h +++ b/src/mame/includes/slapshot.h @@ -91,6 +91,8 @@ public: INTERRUPT_GEN_MEMBER(interrupt); + void opwolf3(machine_config &config); + void slapshot(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/sms.h b/src/mame/includes/sms.h index ca063f4bf1f..33f99ce8e56 100644 --- a/src/mame/includes/sms.h +++ b/src/mame/includes/sms.h @@ -225,6 +225,24 @@ public: void screen_gg_sms_mode_scaling(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_sms1); + void sms_base(machine_config &config); + void sms_ntsc_base(machine_config &config); + void sms_pal_base(machine_config &config); + void sms_paln_base(machine_config &config); + void sms_br_base(machine_config &config); + void sms3_br(machine_config &config); + void sg1000m3(machine_config &config); + void smsj(machine_config &config); + void sms1_paln(machine_config &config); + void sms1_ntsc(machine_config &config); + void gamegear(machine_config &config); + void sms3_paln(machine_config &config); + void sms1_pal(machine_config &config); + void sms2_pal(machine_config &config); + void sms2_kr(machine_config &config); + void sms1_br(machine_config &config); + void sms2_ntsc(machine_config &config); + void sms1_kr(machine_config &config); protected: uint8_t read_bus(address_space &space, unsigned int bank, uint16_t base_addr, uint16_t offset); void setup_bios(); @@ -253,6 +271,7 @@ public: DECLARE_READ8_MEMBER(store_cart_peek); DECLARE_WRITE_LINE_MEMBER(sms_store_int_callback); + void sms_sdisp(machine_config &config); }; diff --git a/src/mame/includes/sms_bootleg.h b/src/mame/includes/sms_bootleg.h index 808838ec35c..c1f81f26190 100644 --- a/src/mame/includes/sms_bootleg.h +++ b/src/mame/includes/sms_bootleg.h @@ -11,4 +11,5 @@ class smsbootleg_state : public sms_state DECLARE_WRITE8_MEMBER(port08_w); DECLARE_WRITE8_MEMBER(port18_w); + void sms_supergame(machine_config &config); }; diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index 71a21294138..d1beaa603f0 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -204,4 +204,25 @@ public: int turbofront_check(int small, int num); int turbofront_check8(int small, int num); DECLARE_WRITE_LINE_MEMBER(ymirq_callback_1); + void gwar(machine_config &config); + void psychos(machine_config &config); + void fitegolf(machine_config &config); + void tdfever2(machine_config &config); + void aso(machine_config &config); + void gwara(machine_config &config); + void tdfever(machine_config &config); + void fitegolf2(machine_config &config); + void jcross(machine_config &config); + void choppera(machine_config &config); + void tnk3(machine_config &config); + void victroad(machine_config &config); + void chopper1(machine_config &config); + void vangrd2(machine_config &config); + void bermudat(machine_config &config); + void hal21(machine_config &config); + void marvins(machine_config &config); + void athena(machine_config &config); + void ikari(machine_config &config); + void sgladiat(machine_config &config); + void madcrush(machine_config &config); }; diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h index d429c80e065..342f5fe9e20 100644 --- a/src/mame/includes/snk6502.h +++ b/src/mame/includes/snk6502.h @@ -87,6 +87,12 @@ public: void sasuke_start_counter(); void postload(); + void pballoon(machine_config &config); + void nibbler(machine_config &config); + void satansat(machine_config &config); + void fantasy(machine_config &config); + void vanguard(machine_config &config); + void sasuke(machine_config &config); }; #endif // MAME_INCLUDES_SNK6502_H diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index b6a978a4de7..c945effebbb 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -71,4 +71,7 @@ public: void tile_callback_pow(int &tile, int& fx, int& fy, int& region); void tile_callback_notpow(int &tile, int& fx, int& fy, int& region); + void streetsm(machine_config &config); + void searchar(machine_config &config); + void pow(machine_config &config); }; diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h index 7cfc83df454..f99feae73dc 100644 --- a/src/mame/includes/snookr10.h +++ b/src/mame/includes/snookr10.h @@ -39,4 +39,8 @@ public: uint32_t screen_update_snookr10(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; + void apple10(machine_config &config); + void snookr10(machine_config &config); + void crystalc(machine_config &config); + void tenballs(machine_config &config); }; diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h index 35ddc0aab63..997f9f71fd5 100644 --- a/src/mame/includes/snowbros.h +++ b/src/mame/includes/snowbros.h @@ -76,4 +76,15 @@ public: void sb3_play_music(int data); void sb3_play_sound(int data); + void _4in1(machine_config &config); + void semiprot(machine_config &config); + void semicom_mcu(machine_config &config); + void yutnori(machine_config &config); + void snowbros(machine_config &config); + void semicom(machine_config &config); + void twinadv(machine_config &config); + void wintbob(machine_config &config); + void honeydol(machine_config &config); + void snowbro3(machine_config &config); + void finalttr(machine_config &config); }; diff --git a/src/mame/includes/softbox.h b/src/mame/includes/softbox.h index 606e9e9e1a1..bc6b3bae329 100644 --- a/src/mame/includes/softbox.h +++ b/src/mame/includes/softbox.h @@ -61,6 +61,7 @@ public: LED_READY }; + void softbox(machine_config &config); int m_ifc; // Tracks previous state of IEEE-488 IFC line }; diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h index a7cc9b06ba8..4af88abe0eb 100644 --- a/src/mame/includes/solomon.h +++ b/src/mame/includes/solomon.h @@ -48,4 +48,5 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_soundlatch; + void solomon(machine_config &config); }; diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index 7bb26342498..bca9ff4eba7 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -44,4 +44,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void sonson(machine_config &config); }; diff --git a/src/mame/includes/sorcerer.h b/src/mame/includes/sorcerer.h index 06d7c2c3bda..d20055e57da 100644 --- a/src/mame/includes/sorcerer.h +++ b/src/mame/includes/sorcerer.h @@ -83,6 +83,8 @@ public: DECLARE_SNAPSHOT_LOAD_MEMBER( sorcerer ); DECLARE_QUICKLOAD_LOAD_MEMBER( sorcerer); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void sorcerer(machine_config &config); + void sorcererd(machine_config &config); private: uint8_t m_fe; uint8_t m_keyboard_line; diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index 38b35979924..91ab614e45a 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -77,6 +77,8 @@ public: void draw_sprite(offs_t offs, pen_t *pens, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flip); void draw_objects(bitmap_rgb32 &bitmap, const rectangle &cliprect); + void spacefb(machine_config &config); + void spacefb_audio(machine_config &config); protected: enum @@ -86,6 +88,3 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; - -/*----------- defined in audio/spacefb.c -----------*/ -MACHINE_CONFIG_EXTERN( spacefb_audio ); diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index b23bea3cb4d..86635a2e896 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -85,4 +85,6 @@ public: { return 0xffff; } + void spbactn(machine_config &config); + void spbactnp(machine_config &config); }; diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h index 2b54ec84542..f60525dcb99 100644 --- a/src/mame/includes/spcforce.h +++ b/src/mame/includes/spcforce.h @@ -56,4 +56,6 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); + void meteors(machine_config &config); + void spcforce(machine_config &config); }; diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index e25104be042..197ac799427 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -87,4 +87,5 @@ public: void mcu63705_update_inputs(); void spd_adpcm_int(msm5205_device *device, int chip); + void spdodgeb(machine_config &config); }; diff --git a/src/mame/includes/spec128.h b/src/mame/includes/spec128.h index 29ad2639a7e..1184713a564 100644 --- a/src/mame/includes/spec128.h +++ b/src/mame/includes/spec128.h @@ -14,6 +14,4 @@ #define SPEC128_RETRACE_CYCLES 52 #define SPEC128_CYCLES_PER_LINE 228 -MACHINE_CONFIG_EXTERN( spectrum_128 ); - #endif // MAME_INCLUDES_SPEC128_H diff --git a/src/mame/includes/special.h b/src/mame/includes/special.h index 80ea784e24d..ae32c4af269 100644 --- a/src/mame/includes/special.h +++ b/src/mame/includes/special.h @@ -104,6 +104,11 @@ public: DECLARE_WRITE_LINE_MEMBER(fdc_drq); DECLARE_FLOPPY_FORMATS( specimx_floppy_formats ); + void special(machine_config &config); + void erik(machine_config &config); + void specimx(machine_config &config); + void specialp(machine_config &config); + void specialm(machine_config &config); private: void specimx_set_bank(offs_t i, uint8_t data); void erik_set_bank(); diff --git a/src/mame/includes/spectrum.h b/src/mame/includes/spectrum.h index 28b6c128129..d227e10e58c 100644 --- a/src/mame/includes/spectrum.h +++ b/src/mame/includes/spectrum.h @@ -184,6 +184,13 @@ public: required_device m_maincpu; + void spectrum_common(machine_config &config); + void spectrum(machine_config &config); + void ts2068(machine_config &config); + void uk2086(machine_config &config); + void tc2048(machine_config &config); + void spectrum_plus3(machine_config &config); + void spectrum_128(machine_config &config); protected: required_device m_cassette; required_device m_ram; @@ -258,6 +265,4 @@ INPUT_PORTS_EXTERN( spectrum ); INPUT_PORTS_EXTERN( spec128 ); INPUT_PORTS_EXTERN( spec_plus ); -MACHINE_CONFIG_EXTERN( spectrum ); - #endif // MAME_INCLUDES_SPECTRUM_H diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h index 7882fa1e7b9..da6d1700460 100644 --- a/src/mame/includes/speedatk.h +++ b/src/mame/includes/speedatk.h @@ -44,4 +44,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint8_t iox_key_matrix_calc(uint8_t p_side); + void speedatk(machine_config &config); }; diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h index 089bbfd6288..dfdc70d5c78 100644 --- a/src/mame/includes/speedbal.h +++ b/src/mame/includes/speedbal.h @@ -44,4 +44,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void speedbal(machine_config &config); }; diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h index f829ff4095b..8dc63b291c2 100644 --- a/src/mame/includes/speedspn.h +++ b/src/mame/includes/speedspn.h @@ -48,4 +48,5 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void speedspn(machine_config &config); }; diff --git a/src/mame/includes/spiders.h b/src/mame/includes/spiders.h index 9b00c1e347c..aac80bbc91b 100644 --- a/src/mame/includes/spiders.h +++ b/src/mame/includes/spiders.h @@ -44,7 +44,6 @@ public: required_device m_maincpu; required_device m_palette; required_device m_audiocpu; + void spiders(machine_config &config); + void spiders_audio(machine_config &config); }; - -/*----------- defined in audio/spiders.c -----------*/ -MACHINE_CONFIG_EXTERN( spiders_audio ); diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h index e46a4b2b195..ec8cf82cec1 100644 --- a/src/mame/includes/splash.h +++ b/src/mame/includes/splash.h @@ -91,6 +91,8 @@ public: INTERRUPT_GEN_MEMBER(roldfrog_interrupt); void roldfrog_update_irq( ); + void roldfrog(machine_config &config); + void splash(machine_config &config); }; class funystrp_state : public splash_state @@ -124,6 +126,7 @@ public: uint32_t screen_update_funystrp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void funystrp_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void funystrp(machine_config &config); private: virtual void machine_start() override; diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index 6ea352a1769..2aa13aa4a4e 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -91,6 +91,10 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void sprint1(machine_config &config); + void sprint2(machine_config &config); + void dominos4(machine_config &config); + void dominos(machine_config &config); }; /*----------- defined in audio/sprint2.c -----------*/ diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index e410f0a508b..b48a1eb752e 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -75,6 +75,7 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank); TIMER_CALLBACK_MEMBER(nmi_callback); + void sprint4(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index 64fae4a065e..63e62a0b95b 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -67,8 +67,9 @@ public: void set_pens(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void set_collision(int n); + void sprint8(machine_config &config); + void sprint8_audio(machine_config &config); }; /*----------- defined in audio/sprint8.c -----------*/ -MACHINE_CONFIG_EXTERN( sprint8_audio ); DISCRETE_SOUND_EXTERN( sprint8 ); diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h index 6c919f6b77e..28e55efea82 100644 --- a/src/mame/includes/spy.h +++ b/src/mame/includes/spy.h @@ -60,4 +60,5 @@ public: DECLARE_WRITE8_MEMBER(volume_callback1); K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); + void spy(machine_config &config); }; diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h index 54b4c814890..326de7a50a4 100644 --- a/src/mame/includes/srmp2.h +++ b/src/mame/includes/srmp2.h @@ -74,4 +74,8 @@ public: SETA001_SPRITE_GFXBANK_CB_MEMBER(srmp3_gfxbank_callback); uint8_t iox_key_matrix_calc(uint8_t p_side); + void mjyuugi(machine_config &config); + void srmp2(machine_config &config); + void rmgoldyh(machine_config &config); + void srmp3(machine_config &config); }; diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h index 7caa9852d58..c3e5f5ee18f 100644 --- a/src/mame/includes/srumbler.h +++ b/src/mame/includes/srumbler.h @@ -44,4 +44,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(interrupt); + void srumbler(machine_config &config); }; diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h index 9bc1ca6f3ae..344420ec948 100644 --- a/src/mame/includes/sshangha.h +++ b/src/mame/includes/sshangha.h @@ -72,4 +72,6 @@ public: required_device m_maincpu; required_device m_audiocpu; required_device m_palette; + void sshanghb(machine_config &config); + void sshangha(machine_config &config); }; diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index adf63c4d2e2..071f2afe00e 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -74,4 +74,6 @@ public: TIMER_CALLBACK_MEMBER(music_playback); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void sslam_play(int track, int data); + void sslam(machine_config &config); + void powerbls(machine_config &config); }; diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h index 0ef46e7a836..ae7c523110a 100644 --- a/src/mame/includes/ssozumo.h +++ b/src/mame/includes/ssozumo.h @@ -41,6 +41,7 @@ public: DECLARE_PALETTE_INIT(ssozumo); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void ssozumo(machine_config &config); protected: virtual void machine_start() override; virtual void video_start() override; diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h index 5376e2705dc..bb819078cc6 100644 --- a/src/mame/includes/sspeedr.h +++ b/src/mame/includes/sspeedr.h @@ -48,4 +48,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void sspeedr(machine_config &config); }; diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h index 426fb63fca5..0909450ca44 100644 --- a/src/mame/includes/ssrj.h +++ b/src/mame/includes/ssrj.h @@ -47,4 +47,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank); void draw_objects(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void ssrj(machine_config &config); }; diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index 6803750ad05..9dfdb3c1cad 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -152,6 +152,29 @@ public: void init_eaglshot_banking(); void init_st010(); + void ssv(machine_config &config); + void gdfs(machine_config &config); + void dynagear(machine_config &config); + void hypreac2(machine_config &config); + void meosism(machine_config &config); + void drifto94(machine_config &config); + void stmblade(machine_config &config); + void srmp4(machine_config &config); + void srmp7(machine_config &config); + void twineag2(machine_config &config); + void ryorioh(machine_config &config); + void janjans1(machine_config &config); + void eaglshot(machine_config &config); + void survarts(machine_config &config); + void sxyreac2(machine_config &config); + void ultrax(machine_config &config); + void vasara(machine_config &config); + void sxyreact(machine_config &config); + void mslider(machine_config &config); + void jsk(machine_config &config); + void hypreact(machine_config &config); + void keithlcy(machine_config &config); + void cairblad(machine_config &config); protected: optional_ioport_array<4> m_io_gun; optional_ioport m_io_key0; diff --git a/src/mame/includes/ssystem3.h b/src/mame/includes/ssystem3.h index 035028677cc..8304bf227b3 100644 --- a/src/mame/includes/ssystem3.h +++ b/src/mame/includes/ssystem3.h @@ -67,6 +67,7 @@ public: void ssystem3_playfield_write(int reset, int signal); void ssystem3_playfield_read(int *on, int *ready); + void ssystem3(machine_config &config); private: uint8_t m_porta; std::unique_ptr m_videoram; diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h index ee77d39cacb..b46a89dc0b4 100644 --- a/src/mame/includes/stactics.h +++ b/src/mame/includes/stactics.h @@ -87,6 +87,6 @@ public: void set_indicator_leds(int data, const char *output_name, int base_index); void update_artwork(); void move_motor(); + void stactics(machine_config &config); + void stactics_video(machine_config &config); }; -/*----------- defined in video/stactics.c -----------*/ -MACHINE_CONFIG_EXTERN( stactics_video ); diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h index e4285fa2a11..ce2a74980fd 100644 --- a/src/mame/includes/stadhero.h +++ b/src/mame/includes/stadhero.h @@ -38,4 +38,5 @@ public: TILE_GET_INFO_MEMBER(get_pf1_tile_info); uint32_t screen_update_stadhero(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void stadhero(machine_config &config); }; diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h index 443fea52f4d..8e7d49c3d79 100644 --- a/src/mame/includes/starcrus.h +++ b/src/mame/includes/starcrus.h @@ -70,4 +70,5 @@ public: int collision_check_p1p2(); int collision_check_s1p1p2(); int collision_check_s2p1p2(); + void starcrus(machine_config &config); }; diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h index bff3ca3b531..d298f7901b3 100644 --- a/src/mame/includes/starfire.h +++ b/src/mame/includes/starfire.h @@ -71,4 +71,6 @@ public: void get_pens(pen_t *pens); required_device m_maincpu; required_device m_screen; + void fireone(machine_config &config); + void starfire(machine_config &config); }; diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index 807e0d36776..b588c5e180b 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -124,6 +124,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void starshp1(machine_config &config); }; /*----------- defined in audio/starshp1.c -----------*/ diff --git a/src/mame/includes/starwars.h b/src/mame/includes/starwars.h index dd7cf5cee58..caacb81ef2b 100644 --- a/src/mame/includes/starwars.h +++ b/src/mame/includes/starwars.h @@ -84,4 +84,6 @@ public: void starwars_mproc_reset(); void run_mproc(); void esb_slapstic_tweak(address_space &space, offs_t offset); + void starwars(machine_config &config); + void esb(machine_config &config); }; diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index 2cf4167e905..b6728c8bcbc 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -58,6 +58,9 @@ public: DECLARE_WRITE8_MEMBER(stfight_68705_port_b_w); DECLARE_WRITE8_MEMBER(stfight_68705_port_c_w); + void stfight_base(machine_config &config); + void stfight(machine_config &config); + void cshooter(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index f1b769bd013..1baa6a44f63 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -65,4 +65,6 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void stlforce(machine_config &config); + void twinbrat(machine_config &config); }; diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h index 73d7fd91877..586933c29b0 100644 --- a/src/mame/includes/strnskil.h +++ b/src/mame/includes/strnskil.h @@ -48,4 +48,6 @@ public: DECLARE_PALETTE_INIT(strnskil); uint32_t screen_update_strnskil(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void strnskil(machine_config &config); + void banbam(machine_config &config); }; diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index 177458b1201..421c6846017 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -140,6 +140,13 @@ public: DECLARE_WRITE8_MEMBER(pdr2_output_w); void stv_select_game(int gameno); uint8_t m_prev_gamebank_select; + void stv_slot(machine_config &config); + void stv_cartslot(machine_config &config); + void stv(machine_config &config); + void hopper(machine_config &config); + void batmanfr(machine_config &config); + void stv_5838(machine_config &config); + void stv_5881(machine_config &config); }; class stvpc_state : public stv_state diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h index 334d7ecee85..daa7420b751 100644 --- a/src/mame/includes/subs.h +++ b/src/mame/includes/subs.h @@ -66,6 +66,7 @@ public: int steering_1(); int steering_2(); + void subs(machine_config &config); }; /*----------- defined in audio/subs.c -----------*/ diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index f46162d354c..7b8af646383 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -80,4 +80,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_bestbest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint16_t *sprites, int gfx); + void uballoon(machine_config &config); + void sunaq(machine_config &config); + void bssoccer(machine_config &config); + void bestbest(machine_config &config); }; diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index 0e913e83e43..1f55ba4e8e4 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -177,4 +177,12 @@ public: void draw_sprites (screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int start, int end, int which); void draw_text_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int start, int end, int ypos, bool write_mask); uint8_t *brickzn_decrypt(); + void brickzn(machine_config &config); + void starfigh(machine_config &config); + void sparkman(machine_config &config); + void hardhea2b(machine_config &config); + void brickzn11(machine_config &config); + void hardhead(machine_config &config); + void hardhea2(machine_config &config); + void rranger(machine_config &config); }; diff --git a/src/mame/includes/super6.h b/src/mame/includes/super6.h index 7e081cc54f0..92223c7bd99 100644 --- a/src/mame/includes/super6.h +++ b/src/mame/includes/super6.h @@ -61,6 +61,7 @@ public: DECLARE_READ8_MEMBER(io_read_byte); DECLARE_WRITE8_MEMBER(io_write_byte); + void super6(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h index a94540f4f8e..ab63ffab82c 100644 --- a/src/mame/includes/super80.h +++ b/src/mame/includes/super80.h @@ -93,6 +93,12 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(timer_h); TIMER_DEVICE_CALLBACK_MEMBER(timer_k); TIMER_DEVICE_CALLBACK_MEMBER(timer_p); + void super80m(machine_config &config); + void super80(machine_config &config); + void super80r(machine_config &config); + void super80e(machine_config &config); + void super80d(machine_config &config); + void super80v(machine_config &config); private: uint8_t m_s_options; uint8_t m_portf0; diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index 6e308fe8d59..333d097cf62 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -54,4 +54,6 @@ public: required_device m_eeprom; required_device m_gfxdecode; required_device m_palette; + void superchs(machine_config &config); + void chase3(machine_config &config); }; diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h index 59cd6457ff2..44d953ad0ca 100644 --- a/src/mame/includes/superqix.h +++ b/src/mame/includes/superqix.h @@ -101,6 +101,9 @@ public: DECLARE_MACHINE_START(superqix); DECLARE_MACHINE_RESET(superqix); + void sqix(machine_config &config); + void sqix_8031(machine_config &config); + void sqix_nomcu(machine_config &config); protected: virtual void machine_init_common() override; @@ -153,6 +156,7 @@ public: u32 screen_update_pbillian(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void pbillian(machine_config &config); protected: virtual void machine_init_common() override; diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h index 9a6ff7383b9..78478598ec6 100644 --- a/src/mame/includes/suprloco.h +++ b/src/mame/includes/suprloco.h @@ -46,4 +46,5 @@ public: inline void draw_pixel(bitmap_ind16 &bitmap,const rectangle &cliprect,int x,int y,int color,int flip); void draw_sprite(bitmap_ind16 &bitmap,const rectangle &cliprect,int spr_number); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void suprloco(machine_config &config); }; diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index f7563f5db00..19da21f8a45 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -164,4 +164,10 @@ public: void hit_recalc(); void init_drc(); void set_drc_pcflush(uint32_t addr); + void sknsk(machine_config &config); + void sknsu(machine_config &config); + void sknsa(machine_config &config); + void sknsj(machine_config &config); + void sknse(machine_config &config); + void skns(machine_config &config); }; diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h index 1c7f5e9cfb3..5ca00ed9721 100644 --- a/src/mame/includes/suprridr.h +++ b/src/mame/includes/suprridr.h @@ -63,4 +63,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); int is_screen_flipped(); + void suprridr(machine_config &config); }; diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index 8acf6ffbff6..5b1bf1c312c 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -65,6 +65,7 @@ public: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_suprslam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void suprslam(machine_config &config); }; #endif // MAME_INCLUDES_SUPRSLAM_H diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h index b6c780730c0..eed8d66ba7e 100644 --- a/src/mame/includes/surpratk.h +++ b/src/mame/includes/surpratk.h @@ -47,4 +47,5 @@ public: K05324X_CB_MEMBER(sprite_callback); K052109_CB_MEMBER(tile_callback); DECLARE_WRITE8_MEMBER(banking_callback); + void surpratk(machine_config &config); }; diff --git a/src/mame/includes/svision.h b/src/mame/includes/svision.h index 0b699a53c59..f704ad71012 100644 --- a/src/mame/includes/svision.h +++ b/src/mame/includes/svision.h @@ -75,6 +75,11 @@ public: void svision_irq(); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(svision_cart); + void svisionp(machine_config &config); + void svisions(machine_config &config); + void tvlinkp(machine_config &config); + void svision(machine_config &config); + void svisionn(machine_config &config); protected: required_device m_maincpu; required_device m_sound; diff --git a/src/mame/includes/swtpc09.h b/src/mame/includes/swtpc09.h index 3136208398c..651b182fd44 100644 --- a/src/mame/includes/swtpc09.h +++ b/src/mame/includes/swtpc09.h @@ -99,6 +99,11 @@ public: DECLARE_READ8_MEMBER ( m6844_r ); DECLARE_WRITE8_MEMBER ( m6844_w ); + void swtpc09_base(machine_config &config); + void swtpc09i(machine_config &config); + void swtpc09d3(machine_config &config); + void swtpc09u(machine_config &config); + void swtpc09(machine_config &config); protected: virtual void machine_start() override; diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index c1a1a8af046..ae22186e425 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -144,4 +144,49 @@ public: optional_memory_bank m_bank1d; std::unique_ptr m_banked_decrypted_opcodes; + void sys1ppix_315_5051(machine_config &config); + void sys1ppisx_315_5064(machine_config &config); + void sys2_317_0007(machine_config &config); + void sys1piox_315_5110(machine_config &config); + void sys1piox_315_5065(machine_config &config); + void sys2m(machine_config &config); + void sys1ppix_315_5178(machine_config &config); + void sys1ppix_315_5179(machine_config &config); + void sys1piox_315_5093(machine_config &config); + void sys2_315_5176(machine_config &config); + void sys2(machine_config &config); + void sys2_315_5177(machine_config &config); + void nob(machine_config &config); + void sys1ppisx_315_5041(machine_config &config); + void sys1piox_315_5132(machine_config &config); + void sys1piox_315_5162(machine_config &config); + void sys1piox_315_5133(machine_config &config); + void sys1pioxb(machine_config &config); + void sys1ppi(machine_config &config); + void sys1piox_315_5135(machine_config &config); + void sys2rowxboot(machine_config &config); + void sys1piox_315_5102(machine_config &config); + void sys1piosx_315_spat(machine_config &config); + void sys2x(machine_config &config); + void sys1piox_315_5051(machine_config &config); + void sys1piox_315_5098(machine_config &config); + void sys1piosx_315_5099(machine_config &config); + void sys2xboot(machine_config &config); + void sys2xb(machine_config &config); + void nobm(machine_config &config); + void mcu(machine_config &config); + void sys2_317_0006(machine_config &config); + void sys1piox_317_0006(machine_config &config); + void sys1ppix_315_5033(machine_config &config); + void sys1pio(machine_config &config); + void sys1pios(machine_config &config); + void sys2rowm(machine_config &config); + void sys1ppix_315_5098(machine_config &config); + void sys1ppix_315_5048(machine_config &config); + void sys2row(machine_config &config); + void sys1ppis(machine_config &config); + void sys1ppix_315_5065(machine_config &config); + void sys1piox_315_5177(machine_config &config); + void sys1piox_315_5155(machine_config &config); + void sys2rowxb(machine_config &config); }; diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index e240795bfa7..5193b83f2dc 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -231,4 +231,32 @@ public: DECLARE_WRITE_LINE_MEMBER(datsu_msm5205_callback); DECLARE_WRITE_LINE_MEMBER(shdancbl_msm5205_callback); DECLARE_WRITE_LINE_MEMBER(sound_cause_nmi); + void z80_ym2151(machine_config &config); + void z80_ym2151_upd7759(machine_config &config); + void datsu_ym2151_msm5205(machine_config &config); + void datsu_2x_ym2203_msm5205(machine_config &config); + void system16_base(machine_config &config); + void goldnaxeb_base(machine_config &config); + void passshtb(machine_config &config); + void goldnaxeb2(machine_config &config); + void beautyb(machine_config &config); + void goldnaxeb1(machine_config &config); + void mwalkbl(machine_config &config); + void eswatbl2(machine_config &config); + void ddcrewbl(machine_config &config); + void shdancbla(machine_config &config); + void astormbl(machine_config &config); + void astormb2(machine_config &config); + void passsht4b(machine_config &config); + void wb3bb(machine_config &config); + void shdancbl(machine_config &config); + void shinobi_datsu(machine_config &config); + void bayrouteb1(machine_config &config); + void tetrisbl(machine_config &config); + void eswatbl(machine_config &config); + void dduxbl(machine_config &config); + void bayrouteb2(machine_config &config); + void tturfbl(machine_config &config); + void altbeastbl(machine_config &config); + void system18(machine_config &config); }; diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h index ff6a7477fbf..7f16d758342 100644 --- a/src/mame/includes/tagteam.h +++ b/src/mame/includes/tagteam.h @@ -51,4 +51,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void tagteam(machine_config &config); }; diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index 0642c432e5a..145d1b15151 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -61,4 +61,5 @@ public: void tail2nos_postload(); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); K051316_CB_MEMBER(zoom_callback); + void tail2nos(machine_config &config); }; diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index 0af5385697e..dfe5ed5fa14 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -87,6 +87,24 @@ public: INTERRUPT_GEN_MEMBER(sbm_interrupt); INTERRUPT_GEN_MEMBER(realpunc_interrupt); + void spacedx(machine_config &config); + void rambo3(machine_config &config); + void hitice(machine_config &config); + void ashura(machine_config &config); + void silentd(machine_config &config); + void tetrista(machine_config &config); + void spacedxo(machine_config &config); + void rambo3p(machine_config &config); + void rastsag2(machine_config &config); + void qzshowby(machine_config &config); + void sbm(machine_config &config); + void tetrist(machine_config &config); + void pbobble(machine_config &config); + void masterw(machine_config &config); + void ryujin(machine_config &config); + void viofight(machine_config &config); + void crimec(machine_config &config); + void selfeena(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -138,4 +156,5 @@ class taitob_c_state : public taitob_state public: using taitob_state::taitob_state; static constexpr feature_type unemulated_features() { return feature::CAMERA; } + void realpunc(machine_config &config); }; diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index 7033361a0ca..65983fc55cc 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -191,6 +191,43 @@ public: void taito_f2_tc360_spritemixdraw(screen_device &screen, bitmap_ind16 &dest_bmp, const rectangle &clip, gfx_element *gfx, uint32_t code, uint32_t color, int flipx, int flipy, int sx, int sy, int scalex, int scaley ); + void taito_f2_tc0220ioc(machine_config &config); + void taito_f2_tc0510nio(machine_config &config); + void taito_f2_te7750(machine_config &config); + void taito_f2(machine_config &config); + void thundfox(machine_config &config); + void dinorex(machine_config &config); + void mjnquest(machine_config &config); + void cameltrya(machine_config &config); + void koshien(machine_config &config); + void qzchikyu(machine_config &config); + void metalb(machine_config &config); + void yesnoj(machine_config &config); + void quizhq(machine_config &config); + void dondokod(machine_config &config); + void qcrayon2(machine_config &config); + void qtorimon(machine_config &config); + void driftout(machine_config &config); + void solfigtr(machine_config &config); + void qzquest(machine_config &config); + void liquidk(machine_config &config); + void deadconx(machine_config &config); + void ssi(machine_config &config); + void pulirula(machine_config &config); + void growl(machine_config &config); + void ninjak(machine_config &config); + void footchmp(machine_config &config); + void cameltry(machine_config &config); + void finalb(machine_config &config); + void hthero(machine_config &config); + void driveout(machine_config &config); + void gunfront(machine_config &config); + void qcrayon(machine_config &config); + void megab(machine_config &config); + void qjinsei(machine_config &config); + void deadconxj(machine_config &config); + void footchmpbl(machine_config &config); + void yuyugogo(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index 681a6551f6d..9d3e91b7679 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -315,6 +315,13 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank_f3); INTERRUPT_GEN_MEMBER(f3_interrupt2); + void f3_eeprom(machine_config &config); + void f3(machine_config &config); + void f3_224a(machine_config &config); + void bubsympb(machine_config &config); + void f3_224b(machine_config &config); + void f3_224c(machine_config &config); + void f3_224b_eeprom(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void device_post_load(void) override; diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h index c913d0cfcd1..d9dabe3e064 100644 --- a/src/mame/includes/taito_h.h +++ b/src/mame/includes/taito_h.h @@ -45,4 +45,8 @@ public: void recordbr_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); void dleague_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); void taitoh_log_vram(); + void recordbr(machine_config &config); + void syvalion(machine_config &config); + void dleague(machine_config &config); + void tetristh(machine_config &config); }; diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index ef95cc1c104..37295911696 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -95,6 +95,7 @@ public: void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void palette_notifier(int addr); void bank_w(address_space &space, offs_t offset, u8 data, int banknum); + void l_system_video(machine_config &config); protected: virtual void state_register(); @@ -122,6 +123,9 @@ public: DECLARE_WRITE8_MEMBER(sound_bankswitch_w); + void kurikint(machine_config &config); + void evilston(machine_config &config); + void raimais(machine_config &config); protected: virtual void state_register() override; virtual void taito_machine_reset() override; @@ -149,6 +153,7 @@ public: DECLARE_READ8_MEMBER(rombank2switch_r); DECLARE_WRITE8_MEMBER(portA_w); + void fhawk(machine_config &config); protected: virtual void state_register() override; virtual void taito_machine_reset() override; @@ -182,6 +187,7 @@ public: DECLARE_WRITE8_MEMBER(msm5205_stop_w); DECLARE_WRITE8_MEMBER(msm5205_volume_w); + void champwr(machine_config &config); protected: virtual void state_register() override; virtual void taito_machine_reset() override; @@ -213,6 +219,11 @@ public: DECLARE_MACHINE_RESET(palamed); DECLARE_MACHINE_RESET(cachat); + void palamed(machine_config &config); + void plotting(machine_config &config); + void puzznici(machine_config &config); + void cachat(machine_config &config); + void puzznic(machine_config &config); protected: virtual void state_register() override; virtual void taito_machine_reset() override; @@ -233,4 +244,5 @@ public: DECLARE_WRITE8_MEMBER(bankg_w); DECLARE_MACHINE_RESET(horshoes); + void horshoes(machine_config &config); }; diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h index ab8ec9b43f1..8d0e3b2e280 100644 --- a/src/mame/includes/taito_o.h +++ b/src/mame/includes/taito_o.h @@ -34,4 +34,5 @@ public: uint32_t screen_update_parentj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(parentj_interrupt); void parentj_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); + void parentj(machine_config &config); }; diff --git a/src/mame/includes/taito_x.h b/src/mame/includes/taito_x.h index e8f4016dbef..b4713170347 100644 --- a/src/mame/includes/taito_x.h +++ b/src/mame/includes/taito_x.h @@ -36,6 +36,10 @@ public: DECLARE_WRITE16_MEMBER( cchip1_ctrl_w ); DECLARE_WRITE16_MEMBER( cchip1_bank_w ); DECLARE_WRITE16_MEMBER( cchip1_ram_w ); + void superman(machine_config &config); + void ballbros(machine_config &config); + void gigandes(machine_config &config); + void daisenpu(machine_config &config); }; #endif // MAME_INCLUDES_TAITO_X_H diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index 8fd88780d6f..a49dce2cdce 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -123,6 +123,17 @@ public: void spacegun_draw_sprites_16x8(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect,int y_offs); void parse_cpu_control(); + void sci(machine_config &config); + void spacegun(machine_config &config); + void chasehq(machine_config &config); + void dblaxle(machine_config &config); + void bshark(machine_config &config); + void aquajack(machine_config &config); + void nightstr(machine_config &config); + void contcirc(machine_config &config); + void racingb(machine_config &config); + void bsharkjjs(machine_config &config); + void enforce(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index 8db8ae58f8f..b1654371eb5 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -135,4 +135,5 @@ public: void fill_slope( bitmap_ind16 &bitmap, const rectangle &cliprect, uint16_t header, int32_t x1, int32_t x2, int32_t sl1, int32_t sl2, int32_t y1, int32_t y2, int32_t *nx1, int32_t *nx2 ); void fill_poly( bitmap_ind16 &bitmap, const rectangle &cliprect, const struct taitoair_poly *q ); + void airsys(machine_config &config); }; diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index c01f0b4376a..8b29d13222c 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -135,4 +135,6 @@ public: INTERRUPT_GEN_MEMBER(taitojc_vblank); void draw_object(bitmap_ind16 &bitmap, const rectangle &cliprect, uint32_t w1, uint32_t w2, uint8_t bank_type); void draw_object_bank(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t bank_type, uint8_t pri); + void taitojc(machine_config &config); + void dendego(machine_config &config); }; diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index 60c1259a66b..b61818c6185 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -153,4 +153,7 @@ public: void copy_layer(bitmap_ind16 &bitmap, const rectangle &cliprect,copy_layer_func_t copy_layer_func, int which, int *sprites_on, rectangle *sprite_areas); void copy_layers(bitmap_ind16 &bitmap, const rectangle &cliprect,copy_layer_func_t copy_layer_func, int *sprites_on, rectangle *sprite_areas); int video_update_common(bitmap_ind16 &bitmap, const rectangle &cliprect, copy_layer_func_t copy_layer_func); + void mcu(machine_config &config); + void nomcu(machine_config &config); + void kikstart(machine_config &config); }; diff --git a/src/mame/includes/tandy2k.h b/src/mame/includes/tandy2k.h index 818da73a760..bee218e3c02 100644 --- a/src/mame/includes/tandy2k.h +++ b/src/mame/includes/tandy2k.h @@ -224,6 +224,8 @@ public: int m_centronics_select; int m_centronics_perror; int m_centronics_busy; + void tandy2k_hd(machine_config &config); + void tandy2k(machine_config &config); }; #endif // MAME_INCLUDES_TANDY2K_H diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index 0bf7b290b04..40874f1de56 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -93,6 +93,7 @@ public: void draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect); void set_collision(int index); + void tank8(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h index 424e4f6edad..7b2438eec11 100644 --- a/src/mame/includes/tankbatt.h +++ b/src/mame/includes/tankbatt.h @@ -52,4 +52,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect); + void tankbatt(machine_config &config); }; diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h index 96c9e294c45..e7f5980f4ce 100644 --- a/src/mame/includes/tankbust.h +++ b/src/mame/includes/tankbust.h @@ -60,4 +60,5 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); TIMER_CALLBACK_MEMBER(soundlatch_callback); TIMER_CALLBACK_MEMBER(soundirqline_callback); + void tankbust(machine_config &config); }; diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h index e86a13d106f..b7ee8c08d52 100644 --- a/src/mame/includes/taotaido.h +++ b/src/mame/includes/taotaido.h @@ -59,6 +59,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank); uint32_t tile_callback( uint32_t code ); + void taotaido(machine_config &config); }; #endif // MAME_INCLUDES_TAOTAIDO_H diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h index 2dbbf0f2417..9633a22c9d2 100644 --- a/src/mame/includes/targeth.h +++ b/src/mame/includes/targeth.h @@ -41,6 +41,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void targeth(machine_config &config); protected: virtual void video_start() override; virtual void machine_start() override; diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index 2fd43b3a875..0f9a7967210 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -86,6 +86,7 @@ public: uint32_t screen_update_apache3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(apache3_68000_reset); + void apache3(machine_config &config); private: void draw_sky(bitmap_rgb32 &bitmap, const rectangle &cliprect, int palette_base, int start_offset); void draw_ground(bitmap_rgb32 &dst, const rectangle &cliprect); @@ -131,6 +132,7 @@ public: DECLARE_VIDEO_START(roundup5); uint32_t screen_update_roundup5(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void roundup5(machine_config &config); private: void draw_road(bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &shadow_bitmap); @@ -184,6 +186,8 @@ public: uint32_t screen_update_cyclwarr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_bigfight(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void cyclwarr(machine_config &config); + void bigfight(machine_config &config); private: required_device_array m_io; required_device m_soundlatch; diff --git a/src/mame/includes/taxidriv.h b/src/mame/includes/taxidriv.h index 7a73c1cf083..6303747ae93 100644 --- a/src/mame/includes/taxidriv.h +++ b/src/mame/includes/taxidriv.h @@ -67,4 +67,5 @@ public: DECLARE_PALETTE_INIT(taxidriv); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void taxidriv(machine_config &config); }; diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index 80d86597467..d151292e5b6 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -82,4 +82,5 @@ public: void adpcm_int(msm5205_device *device, int chip); DECLARE_WRITE_LINE_MEMBER(adpcm_int_1); DECLARE_WRITE_LINE_MEMBER(adpcm_int_2); + void tbowl(machine_config &config); }; diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index 9ea6ccb945e..d1d20e447b7 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -89,4 +89,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int sprite_priority); inline uint8_t fix_input0(uint8_t in1, uint8_t in2); inline uint8_t fix_input1(uint8_t in1, uint8_t in2); + void tceptor(machine_config &config); }; diff --git a/src/mame/includes/tdv2324.h b/src/mame/includes/tdv2324.h index 3d360ee6b07..bcb84bbad9a 100644 --- a/src/mame/includes/tdv2324.h +++ b/src/mame/includes/tdv2324.h @@ -80,6 +80,7 @@ public: // video state required_shared_ptr m_video_ram; + void tdv2324(machine_config &config); }; diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index de0e741c326..2a4b4fffcd4 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -77,4 +77,9 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void geminib(machine_config &config); + void backfirt(machine_config &config); + void silkworm(machine_config &config); + void gemini(machine_config &config); + void rygar(machine_config &config); }; diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index 9c5c224469d..6dcc0e0240b 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -79,4 +79,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void save_state(); + void ginkun(machine_config &config); + void fstarfrc(machine_config &config); + void riot(machine_config &config); }; diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index 2eff7e99122..f90331391f7 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -119,4 +119,5 @@ public: void tilemap_copy_to_compose(uint16_t pri); void do_final_mix(bitmap_rgb32 &bitmap); void descramble(); + void deroon(machine_config &config); }; diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index 4c5baed9f20..87555c22ccf 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -86,6 +86,8 @@ public: void gridiron_draw_led(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t led,int player); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void tehkanwcb(machine_config &config); + void tehkanwc(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/tek405x.h b/src/mame/includes/tek405x.h index ecae3626410..9d8cbc94d97 100644 --- a/src/mame/includes/tek405x.h +++ b/src/mame/includes/tek405x.h @@ -144,6 +144,7 @@ public: // GPIB int m_talk; TIMER_DEVICE_CALLBACK_MEMBER(keyboard_tick); + void tek4051(machine_config &config); }; class tek4052_state : public driver_device @@ -161,6 +162,7 @@ public: virtual void machine_start() override; virtual void video_start() override; + void tek4052(machine_config &config); }; #endif // MAME_INCLUDES_TEK405X_H diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h index 25e408010ca..afca927b17c 100644 --- a/src/mame/includes/terracre.h +++ b/src/mame/includes/terracre.h @@ -50,4 +50,8 @@ public: DECLARE_MACHINE_START(amazon); uint32_t screen_update_amazon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void amazon_base(machine_config &config); + void amazon_1412m2(machine_config &config); + void ym2203(machine_config &config); + void ym3526(machine_config &config); }; diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index b89c85721cc..0aabac31001 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -138,6 +138,11 @@ public: TIMER_CALLBACK_MEMBER(rockn_timer_level1_callback); TIMER_CALLBACK_MEMBER(rockn_timer_sub_level1_callback); void init_rockn_timer(); + void rockn2(machine_config &config); + void tetrisp2(machine_config &config); + void nndmseal(machine_config &config); + void rocknms(machine_config &config); + void rockn(machine_config &config); }; class stepstag_state : public tetrisp2_state @@ -163,4 +168,5 @@ public: uint32_t screen_update_stepstag_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_stepstag_mid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); inline int mypal(int x); + void stepstag(machine_config &config); }; diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h index 7fdd23ef5cb..8414b3818ac 100644 --- a/src/mame/includes/thedeep.h +++ b/src/mame/includes/thedeep.h @@ -74,4 +74,5 @@ public: INTERRUPT_GEN_MEMBER(mcu_irq); TIMER_DEVICE_CALLBACK_MEMBER(interrupt); + void thedeep(machine_config &config); }; diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index b96c44ed8a8..1c61fb58c80 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -62,4 +62,9 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority_to_draw); INTERRUPT_GEN_MEMBER(vblank_irq); + void suprmous(machine_config &config); + void desertdn(machine_config &config); + void intrepid(machine_config &config); + void thepit(machine_config &config); + void fitter(machine_config &config); }; diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h index ff0ecb4ddef..4ea9ebcbf87 100644 --- a/src/mame/includes/thief.h +++ b/src/mame/includes/thief.h @@ -52,4 +52,7 @@ public: required_device m_samples; required_device m_tms; required_device m_palette; + void natodef(machine_config &config); + void sharkatt(machine_config &config); + void thief(machine_config &config); }; diff --git a/src/mame/includes/thomson.h b/src/mame/includes/thomson.h index 52ca0698b01..1cfc3673d02 100644 --- a/src/mame/includes/thomson.h +++ b/src/mame/includes/thomson.h @@ -355,6 +355,19 @@ public: MC6854_OUT_FRAME_CB(to7_network_got_frame); + void to9(machine_config &config); + void to7(machine_config &config); + void mo5e(machine_config &config); + void to770a(machine_config &config); + void t9000(machine_config &config); + void to8(machine_config &config); + void pro128(machine_config &config); + void mo6(machine_config &config); + void mo5(machine_config &config); + void to9p(machine_config &config); + void mo5nr(machine_config &config); + void to770(machine_config &config); + void to8d(machine_config &config); protected: required_device m_maincpu; required_device m_cassette; diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h index cb6f6567a11..3c3c2567c53 100644 --- a/src/mame/includes/thoop2.h +++ b/src/mame/includes/thoop2.h @@ -34,6 +34,7 @@ public: TILE_GET_INFO_MEMBER(get_tile_info_screen1); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void thoop2(machine_config &config); protected: virtual void machine_start() override; virtual void video_start() override; diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h index 9fbd6c5df11..fbe2be08cab 100644 --- a/src/mame/includes/thunderj.h +++ b/src/mame/includes/thunderj.h @@ -37,4 +37,5 @@ public: uint32_t screen_update_thunderj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); static const atari_motion_objects_config s_mob_config; + void thunderj(machine_config &config); }; diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h index a667b3cf27a..846618f2a9b 100644 --- a/src/mame/includes/thunderx.h +++ b/src/mame/includes/thunderx.h @@ -78,6 +78,9 @@ public: K051960_CB_MEMBER(sprite_callback); DECLARE_WRITE8_MEMBER(banking_callback); + void scontra(machine_config &config); + void gbusters(machine_config &config); + void thunderx(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/ti85.h b/src/mame/includes/ti85.h index 1d1e71e5387..dfacd42dbae 100644 --- a/src/mame/includes/ti85.h +++ b/src/mame/includes/ti85.h @@ -225,6 +225,18 @@ public: ti83pse_timer m_ctimer[3]; + void ti83(machine_config &config); + void ti82(machine_config &config); + void ti83p(machine_config &config); + void ti81v2(machine_config &config); + void ti73(machine_config &config); + void ti85d(machine_config &config); + void ti83pse(machine_config &config); + void ti84pse(machine_config &config); + void ti86(machine_config &config); + void ti81(machine_config &config); + void ti85(machine_config &config); + void ti84p(machine_config &config); //address_space &asic; }; diff --git a/src/mame/includes/ti89.h b/src/mame/includes/ti89.h index 64bb84917dd..fcf9b396f3e 100644 --- a/src/mame/includes/ti89.h +++ b/src/mame/includes/ti89.h @@ -85,6 +85,11 @@ public: DECLARE_PALETTE_INIT(ti68k); DECLARE_INPUT_CHANGED_MEMBER(ti68k_on_key); TIMER_DEVICE_CALLBACK_MEMBER(ti68k_timer_callback); + void v200(machine_config &config); + void ti92(machine_config &config); + void ti89(machine_config &config); + void ti92p(machine_config &config); + void ti89t(machine_config &config); }; #endif // TI89_H_ diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index 7586e4a5134..cacceec1eac 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -61,6 +61,8 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void kot(machine_config &config); + void tiamc1(machine_config &config); private: optional_device m_speaker; void update_bg_palette(); diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h index 7e2e04fa337..58698b040a1 100644 --- a/src/mame/includes/tigeroad.h +++ b/src/mame/includes/tigeroad.h @@ -60,6 +60,9 @@ public: required_device m_spritegen; required_device m_soundlatch; + void toramich(machine_config &config); + void tigeroad(machine_config &config); + void f1dream_comad(machine_config &config); protected: /* misc */ bool m_has_coinlock; @@ -90,6 +93,8 @@ public: DECLARE_WRITE8_MEMBER(mcu_pb_w); DECLARE_WRITE8_MEMBER(mcu_pc_w); + void pushman(machine_config &config); + void bballs(machine_config &config); protected: virtual void machine_start() override; diff --git a/src/mame/includes/tiki100.h b/src/mame/includes/tiki100.h index ac67c00dc2c..2a13d183a17 100644 --- a/src/mame/includes/tiki100.h +++ b/src/mame/includes/tiki100.h @@ -96,6 +96,7 @@ public: DECLARE_WRITE_LINE_MEMBER( busrq_w ); + void tiki100(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -124,7 +125,7 @@ protected: ROM0 = 0x01, ROM1 = 0x02, VIR = 0x04, - RAM = 0x08 + RAM0 = 0x08 }; // memory state diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h index 634e2ea7ea4..600dd60d5c6 100644 --- a/src/mame/includes/timelimt.h +++ b/src/mame/includes/timelimt.h @@ -49,4 +49,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(irq); + void timelimt(machine_config &config); }; diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index 1b2732ebce3..59a8210a2be 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -78,4 +78,8 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); INTERRUPT_GEN_MEMBER(interrupt); + void timeplt(machine_config &config); + void chkun(machine_config &config); + void psurge(machine_config &config); + void bikkuric(machine_config &config); }; diff --git a/src/mame/includes/tmc1800.h b/src/mame/includes/tmc1800.h index 9ac6ab12f91..846e93cee8f 100644 --- a/src/mame/includes/tmc1800.h +++ b/src/mame/includes/tmc1800.h @@ -76,6 +76,8 @@ public: int m_keylatch; /* key latch */ DECLARE_DRIVER_INIT(tmc1800); + void tmc1800(machine_config &config); + void tmc1800_video(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -101,6 +103,8 @@ public: /* keyboard state */ int m_keylatch; + void osc1000b(machine_config &config); + void osc1000b_video(machine_config &config); }; class tmc2000_state : public tmc1800_base_state @@ -143,6 +147,8 @@ public: /* keyboard state */ int m_keylatch; + void tmc2000(machine_config &config); + void tmc2000_video(machine_config &config); }; class nano_state : public tmc1800_base_state @@ -181,13 +187,8 @@ public: /* keyboard state */ int m_keylatch; /* key latch */ + void nano(machine_config &config); + void nano_video(machine_config &config); }; -/* ---------- defined in video/tmc1800.c ---------- */ - -MACHINE_CONFIG_EXTERN( tmc1800_video ); -MACHINE_CONFIG_EXTERN( osc1000b_video ); -MACHINE_CONFIG_EXTERN( tmc2000_video ); -MACHINE_CONFIG_EXTERN( nano_video ); - #endif diff --git a/src/mame/includes/tmc2000e.h b/src/mame/includes/tmc2000e.h index 890813d5e99..b2856e06d68 100644 --- a/src/mame/includes/tmc2000e.h +++ b/src/mame/includes/tmc2000e.h @@ -66,6 +66,7 @@ public: /* keyboard state */ int m_keylatch; /* key latch */ int m_reset; /* reset activated */ + void tmc2000e(machine_config &config); }; #endif diff --git a/src/mame/includes/tmc600.h b/src/mame/includes/tmc600.h index d006ae9d53b..d3bae5717f2 100644 --- a/src/mame/includes/tmc600.h +++ b/src/mame/includes/tmc600.h @@ -85,10 +85,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(blink_tick); CDP1869_CHAR_RAM_READ_MEMBER(tmc600_char_ram_r); CDP1869_PCB_READ_MEMBER(tmc600_pcb_r); + void tmc600(machine_config &config); + void tmc600_video(machine_config &config); }; -// ---------- defined in video/tmc600.c ---------- - -MACHINE_CONFIG_EXTERN( tmc600_video ); - #endif diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index 8205bffd82e..7df06da0315 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -183,6 +183,18 @@ public: K052109_CB_MEMBER(blswhstl_tile_callback); SAMPLES_START_CB_MEMBER(tmnt_decode_sample); + void cuebrick(machine_config &config); + void blswhstl(machine_config &config); + void ssriders(machine_config &config); + void tmnt2(machine_config &config); + void lgtnfght(machine_config &config); + void thndrx2(machine_config &config); + void prmrsocr(machine_config &config); + void sunsetbl(machine_config &config); + void glfgreat(machine_config &config); + void tmnt(machine_config &config); + void mia(machine_config &config); + void punkshot(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index 3013f3e0da4..12da1a16cc2 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -40,6 +40,10 @@ public: DECLARE_PALETTE_INIT(prompalette); + void tnzs(machine_config &config); + void tnzs_base(machine_config &config); + void tnzs_mainbank(machine_config &config); + protected: /* devices */ required_device m_maincpu; @@ -103,6 +107,8 @@ public: extrmatn_state(const machine_config &mconfig, device_type type, const char *tag) : tnzs_mcu_state(mconfig, type, tag, false) { } + void extrmatn(machine_config &config); + void plumppop(machine_config &config); }; class arknoid2_state : public extrmatn_state @@ -126,6 +132,7 @@ public: DECLARE_WRITE8_MEMBER(mcu_w); INTERRUPT_GEN_MEMBER(mcu_interrupt); + void arknoid2(machine_config &config); private: required_ioport m_coin1; required_ioport m_coin2; @@ -173,6 +180,7 @@ public: SAMPLES_START_CB_MEMBER(init_samples); + void kageki(machine_config &config); private: required_device m_samples; @@ -198,6 +206,7 @@ public: DECLARE_WRITE8_MEMBER(subbankswitch_w); + void jpopnics(machine_config &config); private: required_device m_upd4701; }; @@ -210,6 +219,7 @@ public: { } virtual DECLARE_WRITE8_MEMBER(bankswitch1_w) override; + void insectx(machine_config &config); }; class tnzsb_state : public tnzs_base_state @@ -227,6 +237,7 @@ public: virtual DECLARE_WRITE8_MEMBER(bankswitch1_w) override; + void tnzsb(machine_config &config); protected: required_device m_audiocpu; required_device m_soundlatch; @@ -244,6 +255,7 @@ public: DECLARE_WRITE8_MEMBER(sound_bank_w); + void kabukiz(machine_config &config); protected: required_memory_bank m_audiobank; }; diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index c9455017136..f791ede28d8 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -163,6 +163,14 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void demonwld(machine_config &config); + void samesame(machine_config &config); + void truxton(machine_config &config); + void outzone(machine_config &config); + void vimana(machine_config &config); + void outzonecv(machine_config &config); + void hellfire(machine_config &config); + void zerowing(machine_config &config); }; class toaplan1_rallybik_state : public toaplan1_state @@ -184,4 +192,5 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank_rallybik); required_device m_spritegen; + void rallybik(machine_config &config); }; diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index c793f2b0fb8..1259919118c 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -153,4 +153,26 @@ public: DECLARE_WRITE8_MEMBER(pwrkick_coin_lockout_w); DECLARE_WRITE_LINE_MEMBER(toaplan2_reset); + void dogyuun(machine_config &config); + void othldrby(machine_config &config); + void snowbro2(machine_config &config); + void bgareggabl(machine_config &config); + void pwrkick(machine_config &config); + void mahoudai(machine_config &config); + void tekipaki(machine_config &config); + void bbakraid(machine_config &config); + void fixeightbl(machine_config &config); + void fixeight(machine_config &config); + void ghox(machine_config &config); + void bgaregga(machine_config &config); + void batrider(machine_config &config); + void shippumd(machine_config &config); + void kbash(machine_config &config); + void pipibibs(machine_config &config); + void pipibibsbl(machine_config &config); + void batsugun(machine_config &config); + void enmadaio(machine_config &config); + void truxton2(machine_config &config); + void vfive(machine_config &config); + void kbash2(machine_config &config); }; diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index 6994ecb0602..b52045fd7c6 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -76,4 +76,7 @@ public: uint32_t screen_update_tokib(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void toki_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); void tokib_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); + void toki(machine_config &config); + void jujuba(machine_config &config); + void tokib(machine_config &config); }; diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h index a8dbbc7fe56..56fb5beeec0 100644 --- a/src/mame/includes/toobin.h +++ b/src/mame/includes/toobin.h @@ -50,4 +50,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); static const atari_motion_objects_config s_mob_config; + void toobin(machine_config &config); }; diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h index 9aeec158bc5..3db7527ea3e 100644 --- a/src/mame/includes/topspeed.h +++ b/src/mame/includes/topspeed.h @@ -93,4 +93,5 @@ public: // video/topspeed.c void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_topspeed(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void topspeed(machine_config &config); }; diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index f902bbf680c..6c61787473e 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -62,4 +62,6 @@ public: INTERRUPT_GEN_MEMBER(main_vblank_irq); INTERRUPT_GEN_MEMBER(sub_vblank_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void tp84(machine_config &config); + void tp84b(machine_config &config); }; diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index 5dca2311b54..e2c9cc0da00 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -85,4 +85,11 @@ public: INTERRUPT_GEN_MEMBER(vblank_nmi); INTERRUPT_GEN_MEMBER(yieartf_timer_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void reaktor(machine_config &config); + void atlantol(machine_config &config); + void yieartf(machine_config &config); + void wizzquiz(machine_config &config); + void trackfld(machine_config &config); + void hyprolyb(machine_config &config); + void mastkin(machine_config &config); }; diff --git a/src/mame/includes/tranz330.h b/src/mame/includes/tranz330.h index 146eb533c03..5c1e882ec7e 100644 --- a/src/mame/includes/tranz330.h +++ b/src/mame/includes/tranz330.h @@ -53,6 +53,7 @@ public: DECLARE_READ8_MEMBER( pio_b_r ); DECLARE_READ8_MEMBER( card_r ); + void tranz330(machine_config &config); private: required_device m_cpu; required_device m_ctc; diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h index d3d0ed0c9b8..b78b01ce549 100644 --- a/src/mame/includes/travrusa.h +++ b/src/mame/includes/travrusa.h @@ -38,4 +38,7 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + void shtrider(machine_config &config); + void travrusa(machine_config &config); + void shtriderb(machine_config &config); }; diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index 55b5b6de9c3..66f195c09b3 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -91,6 +91,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void set_collision(int code); + void triplhnt(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h index 47cdaed7dd7..023942f5f19 100644 --- a/src/mame/includes/trs80.h +++ b/src/mame/includes/trs80.h @@ -128,6 +128,17 @@ public: uint32_t screen_update_radionic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_meritum(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void sys80(machine_config &config); + void trs80(machine_config &config); + void lnw80(machine_config &config); + void model4p(machine_config &config); + void meritum(machine_config &config); + void model3(machine_config &config); + void radionic(machine_config &config); + void model1(machine_config &config); + void ht1080z(machine_config &config); + void cp500(machine_config &config); + void model4(machine_config &config); private: uint8_t *m_p_gfxram; uint8_t m_model4; diff --git a/src/mame/includes/trs80m2.h b/src/mame/includes/trs80m2.h index be42ec9c49c..0f8b818d021 100644 --- a/src/mame/includes/trs80m2.h +++ b/src/mame/includes/trs80m2.h @@ -93,6 +93,7 @@ public: DECLARE_WRITE_LINE_MEMBER(write_centronics_fault); DECLARE_WRITE_LINE_MEMBER(write_centronics_perror); + void trs80m2(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -156,6 +157,7 @@ public: DECLARE_WRITE8_MEMBER( ual_w ); DECLARE_WRITE8_MEMBER( tcl_w ); + void trs80m16(machine_config &config); protected: virtual void machine_start() override; diff --git a/src/mame/includes/truco.h b/src/mame/includes/truco.h index 6396900cc53..aed5b99cce2 100644 --- a/src/mame/includes/truco.h +++ b/src/mame/includes/truco.h @@ -37,4 +37,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(interrupt); + void truco(machine_config &config); }; diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h index 24ad0ce79ed..ef0091e4fa1 100644 --- a/src/mame/includes/trucocl.h +++ b/src/mame/includes/trucocl.h @@ -41,6 +41,7 @@ public: required_device m_dac; required_device m_gfxdecode; + void trucocl(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h index a8f00617d60..723e544a669 100644 --- a/src/mame/includes/tryout.h +++ b/src/mame/includes/tryout.h @@ -58,4 +58,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); + void tryout(machine_config &config); }; diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h index df1e64e3929..133fb16c985 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -72,6 +72,9 @@ public: INTERRUPT_GEN_MEMBER(interrupt); INTERRUPT_GEN_MEMBER(vsgongf_sound_interrupt); + void tsamurai(machine_config &config); + void m660(machine_config &config); + void vsgongf(machine_config &config); protected: virtual void machine_start() override; virtual void video_start() override; diff --git a/src/mame/includes/tsispch.h b/src/mame/includes/tsispch.h index 952d10badff..b9139afe53f 100644 --- a/src/mame/includes/tsispch.h +++ b/src/mame/includes/tsispch.h @@ -41,6 +41,7 @@ public: DECLARE_WRITE_LINE_MEMBER(dsp_to_8086_p0_w); DECLARE_WRITE_LINE_MEMBER(dsp_to_8086_p1_w); + void prose2k(machine_config &config); protected: virtual void machine_reset() override; diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index d015c8223d8..32a373bf73e 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -110,6 +110,9 @@ public: required_device m_screen; + void tubepb(machine_config &config); + void tubep(machine_config &config); + void rjammer(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index 5a5796978da..68de431d85e 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -133,4 +133,18 @@ public: void tumblepb_gfx_rearrange(int rgn); void suprtrio_decrypt_code(); void suprtrio_decrypt_gfx(); + void tumblepb(machine_config &config); + void bcstory(machine_config &config); + void pangpang(machine_config &config); + void semibase(machine_config &config); + void tumbleb2(machine_config &config); + void cookbib(machine_config &config); + void metlsavr(machine_config &config); + void fncywld(machine_config &config); + void suprtrio(machine_config &config); + void htchctch(machine_config &config); + void sdfight(machine_config &config); + void chokchok(machine_config &config); + void cookbib_mcu(machine_config &config); + void jumpkids(machine_config &config); }; diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index 53d73cb4c28..54eaf02f08f 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -50,4 +50,5 @@ public: void draw_box(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_shell(bitmap_ind16 &bitmap, const rectangle &cliprect, int picture_code, int hposition,int vstart,int vstop,int vstretch,int hstretch); + void tunhunt(machine_config &config); }; diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index 41b8049a420..5644cb5ca0f 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -188,10 +188,12 @@ public: void turbo_update_samples(); inline void subroc3d_update_volume(int leftchan, uint8_t dis, uint8_t dir); void buckrog_update_samples(); + void turbo(machine_config &config); + void buckrog(machine_config &config); + void buckroge(machine_config &config); + void buckrogu(machine_config &config); + void subroc3d(machine_config &config); + void turbo_samples(machine_config &config); + void subroc3d_samples(machine_config &config); + void buckrog_samples(machine_config &config); }; - - -/*----------- defined in audio/turbo.c -----------*/ -MACHINE_CONFIG_EXTERN( turbo_samples ); -MACHINE_CONFIG_EXTERN( subroc3d_samples ); -MACHINE_CONFIG_EXTERN( buckrog_samples ); diff --git a/src/mame/includes/turrett.h b/src/mame/includes/turrett.h index 4de2ec6a290..2af087c7808 100644 --- a/src/mame/includes/turrett.h +++ b/src/mame/includes/turrett.h @@ -84,6 +84,7 @@ public: uint8_t m_frame; uint8_t m_adc; + void turrett(machine_config &config); protected: // driver_device overrides virtual void machine_reset() override; diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h index 81a424768e0..14a23f4d296 100644 --- a/src/mame/includes/tutankhm.h +++ b/src/mame/includes/tutankhm.h @@ -42,4 +42,5 @@ public: DECLARE_MACHINE_RESET(tutankhm); uint32_t screen_update_tutankhm(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(tutankhm_interrupt); + void tutankhm(machine_config &config); }; diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index b9fe3b0c97b..25045dc5855 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -81,6 +81,9 @@ public: INTERRUPT_GEN_MEMBER(CPUB_interrupt); TIMER_CALLBACK_MEMBER(sprite_tick); DECLARE_WRITE8_MEMBER(volume_callback); + void devilw(machine_config &config); + void miaj(machine_config &config); + void twin16(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -106,6 +109,7 @@ public: DECLARE_WRITE16_MEMBER(gfx_bank_w); DECLARE_DRIVER_INIT(fround); + void fround(machine_config &config); protected: virtual void video_start() override; virtual void tile_get_info(tile_data &tileinfo, uint16_t data, int color_base) override; @@ -124,6 +128,7 @@ public: DECLARE_WRITE8_MEMBER(nvram_bank_w); DECLARE_DRIVER_INIT(cuebrickj); + void cuebrickj(machine_config &config); private: uint16_t m_nvram[0x400 * 0x20 / 2]; }; diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index e4bd3a4d6f8..8cf1a0ce804 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -124,4 +124,7 @@ public: required_device m_gfxdecode; required_device m_screen; required_device m_palette; + void twincobr(machine_config &config); + void fsharkbt(machine_config &config); + void fshark(machine_config &config); }; diff --git a/src/mame/includes/tx0.h b/src/mame/includes/tx0.h index f946e2d72c2..bfbdc0a3702 100644 --- a/src/mame/includes/tx0.h +++ b/src/mame/includes/tx0.h @@ -201,6 +201,8 @@ public: DECLARE_WRITE_LINE_MEMBER(tx0_io_reset_callback); void magtape_callback(); + void tx0_64kw(machine_config &config); + void tx0_8kw(machine_config &config); private: required_device m_gfxdecode; required_device m_palette; diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index d9fe40a979f..3c1927f7b8f 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -233,6 +233,9 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank_buggyboy); INTERRUPT_GEN_MEMBER(z80_irq); TIMER_CALLBACK_MEMBER(interrupt_callback); + void tx1(machine_config &config); + void buggyboy(machine_config &config); + void buggybjr(machine_config &config); }; /*----------- defined in audio/tx1.c -----------*/ diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h index 74879dc72ca..256fa7c83bc 100644 --- a/src/mame/includes/ultraman.h +++ b/src/mame/includes/ultraman.h @@ -49,4 +49,5 @@ public: K051316_CB_MEMBER(zoom_callback_2); K051316_CB_MEMBER(zoom_callback_3); K051960_CB_MEMBER(sprite_callback); + void ultraman(machine_config &config); }; diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index 1e5936e0256..0830656f5f7 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -70,6 +70,7 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank); TIMER_CALLBACK_MEMBER(nmi_callback); + void ultratnk(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index 89f738c9c1f..febb2dacf42 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -73,6 +73,8 @@ public: void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect,const int *primasks,int x_offs,int y_offs); void draw_sprites_cbombers(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect,const int *primasks,int x_offs,int y_offs); + void undrfire(machine_config &config); + void cbombers(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index fd7be8ffa66..8539e2daac5 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -60,4 +60,7 @@ public: required_device m_palette; optional_shared_ptr m_generic_paletteram_16; optional_shared_ptr m_generic_paletteram_32; + void zeropnt2(machine_config &config); + void zeropnt(machine_config &config); + void burglarx(machine_config &config); }; diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h index 0b3dfd7dc8f..2d8bffab1d4 100644 --- a/src/mame/includes/usgames.h +++ b/src/mame/includes/usgames.h @@ -31,4 +31,6 @@ public: DECLARE_PALETTE_INIT(usgames); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void usg32(machine_config &config); + void usg185(machine_config &config); }; diff --git a/src/mame/includes/ut88.h b/src/mame/includes/ut88.h index e25128df05a..1d696a6b904 100644 --- a/src/mame/includes/ut88.h +++ b/src/mame/includes/ut88.h @@ -64,6 +64,8 @@ public: DECLARE_MACHINE_RESET(ut88mini); uint32_t screen_update_ut88(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void ut88(machine_config &config); + void ut88mini(machine_config &config); private: required_device m_cassette; optional_device m_ppi; diff --git a/src/mame/includes/v1050.h b/src/mame/includes/v1050.h index f56c6b22840..55f0c3a39a6 100644 --- a/src/mame/includes/v1050.h +++ b/src/mame/includes/v1050.h @@ -152,6 +152,8 @@ public: MC6845_UPDATE_ROW(crtc_update_row); + void v1050(machine_config &config); + void v1050_video(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -227,8 +229,4 @@ private: int m_centronics_perror; }; -//----------- defined in video/v1050.c ----------- - -MACHINE_CONFIG_EXTERN( v1050_video ); - #endif // MAME_INCLUDES_V1050_H diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index b1341d991ef..66c92af8673 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -60,4 +60,5 @@ public: void update_24bitcol( int offset ); DECO16IC_BANK_CB_MEMBER(bank_callback); + void vaportra(machine_config &config); }; diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index c6885f1c5f4..bf4be017f9b 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -56,4 +56,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); + void vastar(machine_config &config); }; diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h index 04ff4b18aed..ffc71b7543e 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -61,4 +61,5 @@ public: void spprombank_w(int bank); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); inline int scanline_to_vcount(int scanline); + void vball(machine_config &config); }; diff --git a/src/mame/includes/vc4000.h b/src/mame/includes/vc4000.h index 99bf5156150..5a55f137331 100644 --- a/src/mame/includes/vc4000.h +++ b/src/mame/includes/vc4000.h @@ -127,6 +127,13 @@ public: INTERRUPT_GEN_MEMBER(vc4000_video_line); DECLARE_QUICKLOAD_LOAD_MEMBER(vc4000); + void cx3000tc(machine_config &config); + void mpu1000(machine_config &config); + void vc4000(machine_config &config); + void database(machine_config &config); + void h21(machine_config &config); + void rwtrntcs(machine_config &config); + void elektor(machine_config &config); protected: required_device m_maincpu; required_device m_screen; diff --git a/src/mame/includes/vcs80.h b/src/mame/includes/vcs80.h index 5bb587bdb7b..ae0d0306fdf 100644 --- a/src/mame/includes/vcs80.h +++ b/src/mame/includes/vcs80.h @@ -80,6 +80,7 @@ public: int m_keyclk; DECLARE_DRIVER_INIT(vcs80); TIMER_DEVICE_CALLBACK_MEMBER(vcs80_keyboard_tick); + void vcs80(machine_config &config); }; #endif diff --git a/src/mame/includes/vector06.h b/src/mame/includes/vector06.h index ffd003f2261..0bad3a26fc0 100644 --- a/src/mame/includes/vector06.h +++ b/src/mame/includes/vector06.h @@ -72,6 +72,7 @@ public: TIMER_CALLBACK_MEMBER(reset_check_callback); IRQ_CALLBACK_MEMBER(vector06_irq_callback); + void vector06(machine_config &config); private: required_device m_maincpu; required_device m_speaker; diff --git a/src/mame/includes/vectrex.h b/src/mame/includes/vectrex.h index 024c8d74226..669e5b4cb77 100644 --- a/src/mame/includes/vectrex.h +++ b/src/mame/includes/vectrex.h @@ -123,6 +123,8 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER( vectrex_cart ); DECLARE_WRITE_LINE_MEMBER(vectrex_via_irq); + void vectrex(machine_config &config); + void raaspec(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h index d7754a44908..6fa933e7ed3 100644 --- a/src/mame/includes/vendetta.h +++ b/src/mame/includes/vendetta.h @@ -76,6 +76,8 @@ public: DECLARE_WRITE8_MEMBER(banking_callback); K053246_CB_MEMBER(sprite_callback); + void esckids(machine_config &config); + void vendetta(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/vertigo.h b/src/mame/includes/vertigo.h index 6f0abfa9761..c1e9c850ea5 100644 --- a/src/mame/includes/vertigo.h +++ b/src/mame/includes/vertigo.h @@ -123,10 +123,12 @@ public: DECLARE_WRITE_LINE_MEMBER(v_irq3_w); TTL74148_OUTPUT_CB(update_irq); + void exidy440_audio(machine_config &config); void vertigo_vproc_init(); void vertigo_vproc_reset(); void am2901x4 (am2901 *bsp, microcode *mc); void vertigo_vgen (vector_generator *vg); void vertigo_vproc(int cycles, int irq4); void update_irq_encoder(int line, int state); + void vertigo(machine_config &config); }; diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index 29767683b96..c7d3cf401b8 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -158,6 +158,40 @@ public: int get_vcounter(); int is_cabinet_color(); virtual pen_t choose_pen(uint8_t x, uint8_t y, pen_t back_pen); + void vicdual_root(machine_config &config); + void vicdual_dualgame_root(machine_config &config); + void heiankyo(machine_config &config); + void headon(machine_config &config); + void headon_audio(machine_config &config); + void sspacaho(machine_config &config); + void headonn(machine_config &config); + void invho2(machine_config &config); + void frogs(machine_config &config); + void frogs_audio(machine_config &config); + void headons(machine_config &config); + void invinco(machine_config &config); + void invinco_audio(machine_config &config); + void invds(machine_config &config); + void headon2(machine_config &config); + void carnival(machine_config &config); + void carnival_audio(machine_config &config); + void pulsar(machine_config &config); + void pulsar_audio(machine_config &config); + void spacetrk(machine_config &config); + void headon2bw(machine_config &config); + void safari(machine_config &config); + void brdrline(machine_config &config); + void brdrline_audio(machine_config &config); + void carnivalh(machine_config &config); + void samurai(machine_config &config); + void sspaceat(machine_config &config); + void digger(machine_config &config); + void depthch(machine_config &config); + void depthch_audio(machine_config &config); + void carhntds(machine_config &config); + void alphaho(machine_config &config); + void tranqgun(machine_config &config); + void tranqgun_audio(machine_config &config); }; class nsub_state : public vicdual_state @@ -186,4 +220,5 @@ public: DECLARE_MACHINE_RESET(nsub); virtual pen_t choose_pen(uint8_t x, uint8_t y, pen_t back_pen) override; + void nsub(machine_config &config); }; diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h index 877e2d96e4e..9cf5941860e 100644 --- a/src/mame/includes/victory.h +++ b/src/mame/includes/victory.h @@ -92,4 +92,6 @@ public: int command7(); void update_background(); void update_foreground(); + void victory(machine_config &config); + void victory_audio(machine_config &config); }; diff --git a/src/mame/includes/vidbrain.h b/src/mame/includes/vidbrain.h index cc4aa98c00d..9a49470b699 100644 --- a/src/mame/includes/vidbrain.h +++ b/src/mame/includes/vidbrain.h @@ -97,10 +97,8 @@ public: // timers emu_timer *m_timer_ne555; + void vidbrain(machine_config &config); + void vidbrain_video(machine_config &config); }; -//----------- defined in video/vidbrain.c ----------- - -MACHINE_CONFIG_EXTERN( vidbrain_video ); - #endif diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index 2feb75a9c90..9f7154cf478 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -73,6 +73,7 @@ public: void update_plunger(); double calc_plunger_pos(); + void videopin(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h index f2cf295ea81..b64c2407cfd 100644 --- a/src/mame/includes/vigilant.h +++ b/src/mame/includes/vigilant.h @@ -57,4 +57,7 @@ public: void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); void vigilant_postload(); + void vigilant(machine_config &config); + void kikcubic(machine_config &config); + void buccanrs(machine_config &config); }; diff --git a/src/mame/includes/vindictr.h b/src/mame/includes/vindictr.h index 019c443004b..71da096a087 100644 --- a/src/mame/includes/vindictr.h +++ b/src/mame/includes/vindictr.h @@ -40,4 +40,5 @@ public: DECLARE_WRITE16_MEMBER( vindictr_paletteram_w ); static const atari_motion_objects_config s_mob_config; + void vindictr(machine_config &config); }; diff --git a/src/mame/includes/vip.h b/src/mame/includes/vip.h index 3e7ae9b67db..9a3d773d3d0 100644 --- a/src/mame/includes/vip.h +++ b/src/mame/includes/vip.h @@ -123,6 +123,8 @@ public: // expansion state uint8_t m_byteio_data; + void vp111(machine_config &config); + void vip(machine_config &config); }; #endif diff --git a/src/mame/includes/vixen.h b/src/mame/includes/vixen.h index 0873a9cbfa2..b3be9f230c8 100644 --- a/src/mame/includes/vixen.h +++ b/src/mame/includes/vixen.h @@ -76,6 +76,7 @@ public: DECLARE_READ8_MEMBER(oprom_r); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void vixen(machine_config &config); private: required_device m_maincpu; required_device m_fdc; diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index 6c48175bda0..5d582af0c77 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -72,6 +72,7 @@ public: void cchip_init(); void cchip_reset(); + void volfied(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h index c068a2f70b3..72e6e8d9112 100644 --- a/src/mame/includes/vsnes.h +++ b/src/mame/includes/vsnes.h @@ -101,6 +101,14 @@ public: DECLARE_READ8_MEMBER(vsnes_bootleg_z80_data_r); DECLARE_READ8_MEMBER(vsnes_bootleg_z80_address_r); + void vsdual(machine_config &config); + void vsgshoe(machine_config &config); + void vsnes(machine_config &config); + void vsdual_pi(machine_config &config); + void topgun(machine_config &config); + void mightybj(machine_config &config); + void vsnes_bootleg(machine_config &config); + void jajamaru(machine_config &config); private: int m_coin; int m_do_vrom_bank; diff --git a/src/mame/includes/vtech2.h b/src/mame/includes/vtech2.h index 4353118021c..8356992462d 100644 --- a/src/mame/includes/vtech2.h +++ b/src/mame/includes/vtech2.h @@ -91,6 +91,9 @@ public: device_t *laser_file(); required_device m_gfxdecode; required_device m_palette; + void laser350(machine_config &config); + void laser700(machine_config &config); + void laser500(machine_config &config); }; diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h index 1ced01169c0..b243fb39742 100644 --- a/src/mame/includes/vulgus.h +++ b/src/mame/includes/vulgus.h @@ -52,4 +52,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); + void vulgus(machine_config &config); }; diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h index 42a43fedb7c..eec16aab759 100644 --- a/src/mame/includes/warpwarp.h +++ b/src/mame/includes/warpwarp.h @@ -97,4 +97,9 @@ public: void draw_ball(bitmap_ind16 &bitmap, const rectangle &cliprect,pen_t pen); INTERRUPT_GEN_MEMBER(vblank_irq); + void warpwarp(machine_config &config); + void geebee(machine_config &config); + void navarone(machine_config &config); + void bombbee(machine_config &config); + void geebeeb(machine_config &config); }; diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h index 4f3d4187293..c92a98dcf96 100644 --- a/src/mame/includes/warriorb.h +++ b/src/mame/includes/warriorb.h @@ -70,4 +70,6 @@ public: uint32_t screen_update_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int x_offs, int y_offs ); uint32_t update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffs, tc0100scn_device *tc0100scn); + void warriorb(machine_config &config); + void darius2d(machine_config &config); }; diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h index af93cc61548..5120a59098e 100644 --- a/src/mame/includes/wc90.h +++ b/src/mame/includes/wc90.h @@ -79,4 +79,7 @@ public: DECLARE_VIDEO_START(wc90t); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void wc90t(machine_config &config); + void wc90(machine_config &config); + void pac90(machine_config &config); }; diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h index bcf6d22e333..69216b1fa62 100644 --- a/src/mame/includes/wc90b.h +++ b/src/mame/includes/wc90b.h @@ -71,4 +71,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); + void wc90b(machine_config &config); }; diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index 35756625ed2..2303061edde 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -137,6 +137,8 @@ public: required_device m_screen; required_device m_soundlatch; + void hotchase(machine_config &config); + void wecleman(machine_config &config); private: struct sprite_t { diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h index be8bce62eb9..ee0a8d4f36d 100644 --- a/src/mame/includes/welltris.h +++ b/src/mame/includes/welltris.h @@ -52,4 +52,6 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect); void setbank(int num, int bank); + void quiz18k(machine_config &config); + void welltris(machine_config &config); }; diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index 3c145529fac..9ec081f9b95 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -56,6 +56,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(cpub_interrupt); + void wgp2(machine_config &config); + void wgp(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index be0001e2b94..88f19f162a3 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -123,6 +123,14 @@ public: required_device m_pia_0; required_device m_pia_1; required_device m_pia_2; + void playball(machine_config &config); + void defender(machine_config &config); + void sinistar(machine_config &config); + void lottofun(machine_config &config); + void spdball(machine_config &config); + void williams(machine_config &config); + void williams_muxed(machine_config &config); + void jin(machine_config &config); }; @@ -161,6 +169,8 @@ public: uint32_t screen_update_blaster(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); inline void update_blaster_banking(); + void blastkit(machine_config &config); + void blaster(machine_config &config); }; @@ -208,6 +218,9 @@ public: DECLARE_MACHINE_RESET(williams2); DECLARE_VIDEO_START(williams2); uint32_t screen_update_williams2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void williams2(machine_config &config); + void mysticm(machine_config &config); + void inferno(machine_config &config); }; @@ -222,6 +235,7 @@ public: DECLARE_WRITE_LINE_MEMBER(maxvol_w); DECLARE_WRITE8_MEMBER(lamp_w); + void tshoot(machine_config &config); private: required_ioport_array<2> m_gun; }; @@ -242,6 +256,7 @@ public: TIMER_CALLBACK_MEMBER(joust2_deferred_snd_cmd_w); DECLARE_WRITE8_MEMBER(joust2_snd_cmd_w); DECLARE_WRITE_LINE_MEMBER(joust2_pia_3_cb1_w); + void joust2(machine_config &config); }; /*----------- defined in video/williams.cpp -----------*/ diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h index be19ae94cb6..473d5224b28 100644 --- a/src/mame/includes/wiping.h +++ b/src/mame/includes/wiping.h @@ -39,4 +39,5 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(sound_timer_irq); + void wiping(machine_config &config); }; diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index 001b9db0c44..72391b6da44 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -82,4 +82,8 @@ public: INTERRUPT_GEN_MEMBER(wiz_sound_interrupt); void draw_tiles(bitmap_ind16 &bitmap, const rectangle &cliprect, int layer, int charbank, int colortype); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int set, int charbank); + void wiz(machine_config &config); + void kungfut(machine_config &config); + void scion(machine_config &config); + void stinger(machine_config &config); }; diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index 73c269a5baf..e5f5bf5716c 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -96,6 +96,7 @@ public: void draw_pt(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_water(palette_device &palette, bitmap_ind16 &bitmap, const rectangle &cliprect); + void wolfpack(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/wpc_dot.h b/src/mame/includes/wpc_dot.h index 92dd863d15c..c8f4dd94af6 100644 --- a/src/mame/includes/wpc_dot.h +++ b/src/mame/includes/wpc_dot.h @@ -34,6 +34,7 @@ public: m_dmdbank6(*this, "dmdbank6") { } + void wpc_dot(machine_config &config); protected: // devices diff --git a/src/mame/includes/wpc_flip1.h b/src/mame/includes/wpc_flip1.h index 2c17608552f..1c1f1768e68 100644 --- a/src/mame/includes/wpc_flip1.h +++ b/src/mame/includes/wpc_flip1.h @@ -18,6 +18,7 @@ public: { } public: DECLARE_DRIVER_INIT(wpc_flip1); + void wpc_flip1(machine_config &config); }; #endif /* WPC_FLIP1_H_ */ diff --git a/src/mame/includes/wpc_flip2.h b/src/mame/includes/wpc_flip2.h index 5c9a5acf1b9..3ff48444bce 100644 --- a/src/mame/includes/wpc_flip2.h +++ b/src/mame/includes/wpc_flip2.h @@ -18,6 +18,7 @@ public: { } public: DECLARE_DRIVER_INIT(wpc_flip2); + void wpc_flip2(machine_config &config); }; #endif /* WPC_FLIP2_H_ */ diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h index 62c2b1d12f9..73ae4e92a1a 100644 --- a/src/mame/includes/wrally.h +++ b/src/mame/includes/wrally.h @@ -36,6 +36,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void wrally(machine_config &config); protected: virtual void machine_start() override; virtual void video_start() override; diff --git a/src/mame/includes/wswan.h b/src/mame/includes/wswan.h index f3945a2f3fe..06800718ab2 100644 --- a/src/mame/includes/wswan.h +++ b/src/mame/includes/wswan.h @@ -69,6 +69,8 @@ public: DECLARE_MACHINE_START(wscolor); DECLARE_PALETTE_INIT(wscolor); + void wscolor(machine_config &config); + void wswan(machine_config &config); protected: /* Interrupt flags */ static const uint8_t WSWAN_IFLAG_STX = 0x01; diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index e4bd246d11a..fd25bf35aaf 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -55,4 +55,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void wwfsstar(machine_config &config); }; diff --git a/src/mame/includes/x07.h b/src/mame/includes/x07.h index 7e50cc3c0af..def5ac0ff6d 100644 --- a/src/mame/includes/x07.h +++ b/src/mame/includes/x07.h @@ -282,4 +282,5 @@ public: TIMER_CALLBACK_MEMBER(rstb_clear); TIMER_CALLBACK_MEMBER(beep_stop); TIMER_DEVICE_CALLBACK_MEMBER(blink_timer); + void x07(machine_config &config); }; diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h index fa3b9f2d4df..a85f4618b3f 100644 --- a/src/mame/includes/x1.h +++ b/src/mame/includes/x1.h @@ -298,6 +298,8 @@ public: required_device m_gfxdecode; required_device m_palette; optional_device m_dma; + void x1turbo(machine_config &config); + void x1(machine_config &config); }; /*----------- defined in machine/x1.c -----------*/ diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h index f0a3e252bc3..e61528b8882 100644 --- a/src/mame/includes/x68k.h +++ b/src/mame/includes/x68k.h @@ -341,6 +341,10 @@ public: DECLARE_READ16_MEMBER(x68k_tvram_r); IRQ_CALLBACK_MEMBER(x68k_int_ack); + void x68kxvi(machine_config &config); + void x68ksupr(machine_config &config); + void x68030(machine_config &config); + void x68000(machine_config &config); private: inline void x68k_plot_pixel(bitmap_rgb32 &bitmap, int x, int y, uint32_t color); void x68k_crtc_text_copy(int src, int dest, uint8_t planes); diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index ec571256165..61cfc916b7b 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -57,6 +57,8 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void xsleenab(machine_config &config); + void xsleena(machine_config &config); protected: virtual void machine_start() override; virtual void video_start() override; diff --git a/src/mame/includes/xbox.h b/src/mame/includes/xbox.h index fa1d0f4b16b..50d1aeac3e5 100644 --- a/src/mame/includes/xbox.h +++ b/src/mame/includes/xbox.h @@ -72,6 +72,7 @@ public: } debugp[]; const debugger_constants *debugc_bios; + void xbox_base(machine_config &config); private: void dump_string_command(int ref, const std::vector ¶ms); void dump_process_command(int ref, const std::vector ¶ms); @@ -96,6 +97,5 @@ private: ADDRESS_MAP_EXTERN(xbox_base_map, 32); ADDRESS_MAP_EXTERN(xbox_base_map_io, 32); -MACHINE_CONFIG_EXTERN(xbox_base); #endif // MAME_INCLUDES_XBOX_H diff --git a/src/mame/includes/xerox820.h b/src/mame/includes/xerox820.h index 03f747b932b..3e10e4e0d60 100644 --- a/src/mame/includes/xerox820.h +++ b/src/mame/includes/xerox820.h @@ -82,6 +82,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick); + void mk83(machine_config &config); + void xerox820(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; @@ -128,6 +130,7 @@ public: DECLARE_WRITE8_MEMBER( kbpio_pa_w ); + void bigboard(machine_config &config); protected: virtual void machine_reset() override; @@ -157,6 +160,8 @@ public: DECLARE_WRITE8_MEMBER( rdpio_pb_w ); DECLARE_WRITE_LINE_MEMBER( rdpio_pardy_w ); + void xerox168(machine_config &config); + void xerox820ii(machine_config &config); protected: virtual void machine_reset() override; diff --git a/src/mame/includes/xevious.h b/src/mame/includes/xevious.h index bc110e9153f..a4d933daaef 100644 --- a/src/mame/includes/xevious.h +++ b/src/mame/includes/xevious.h @@ -73,4 +73,6 @@ public: char m_battles_sound_played; optional_device m_subcpu3; + void xevious(machine_config &config); + void battles(machine_config &config); }; diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h index ab0935a2e18..169c8abf91f 100644 --- a/src/mame/includes/xexex.h +++ b/src/mame/includes/xexex.h @@ -99,4 +99,5 @@ public: K056832_CB_MEMBER(tile_callback); K053246_CB_MEMBER(sprite_callback); K054539_CB_MEMBER(ym_set_mixing); + void xexex(machine_config &config); }; diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index f0f306ea612..79706842c9b 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -72,4 +72,6 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(xmen_scanline); K052109_CB_MEMBER(tile_callback); K053246_CB_MEMBER(sprite_callback); + void xmen(machine_config &config); + void xmen6p(machine_config &config); }; diff --git a/src/mame/includes/xor100.h b/src/mame/includes/xor100.h index db8b743d4b5..cdf10f75c67 100644 --- a/src/mame/includes/xor100.h +++ b/src/mame/includes/xor100.h @@ -68,6 +68,7 @@ public: DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); DECLARE_WRITE_LINE_MEMBER(write_centronics_select); + void xor100(machine_config &config); protected: virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h index 0d5733b855c..c74bf8c079e 100644 --- a/src/mame/includes/xorworld.h +++ b/src/mame/includes/xorworld.h @@ -36,4 +36,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + void xorworld(machine_config &config); }; diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h index 4a2f32fa11b..81d28603165 100644 --- a/src/mame/includes/xxmissio.h +++ b/src/mame/includes/xxmissio.h @@ -53,4 +53,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx); + void xxmissio(machine_config &config); }; diff --git a/src/mame/includes/xybots.h b/src/mame/includes/xybots.h index 19b46fcc310..ec05578bf04 100644 --- a/src/mame/includes/xybots.h +++ b/src/mame/includes/xybots.h @@ -37,4 +37,5 @@ public: uint32_t screen_update_xybots(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); static const atari_motion_objects_config s_mob_config; + void xybots(machine_config &config); }; diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h index 3fb92317de0..17bd1962526 100644 --- a/src/mame/includes/xyonix.h +++ b/src/mame/includes/xyonix.h @@ -33,4 +33,5 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void handle_coins(int coin); + void xyonix(machine_config &config); }; diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h index c4100259f57..18aa64087d8 100644 --- a/src/mame/includes/yiear.h +++ b/src/mame/includes/yiear.h @@ -52,4 +52,5 @@ public: INTERRUPT_GEN_MEMBER(yiear_vblank_interrupt); INTERRUPT_GEN_MEMBER(yiear_nmi_interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void yiear(machine_config &config); }; diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index 6086df5705e..d637bf4d4b5 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -65,4 +65,6 @@ public: virtual void video_start() override; uint32_t screen_update_yunsun16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); + void magicbub(machine_config &config); + void shocking(machine_config &config); }; diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index 94903be37e1..c8dc4b91366 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -67,4 +67,5 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void yunsung8(machine_config &config); }; diff --git a/src/mame/includes/z80ne.h b/src/mame/includes/z80ne.h index ffe4765b7f5..7188cdf62ba 100644 --- a/src/mame/includes/z80ne.h +++ b/src/mame/includes/z80ne.h @@ -150,6 +150,10 @@ public: DECLARE_READ8_MEMBER(lx390_fdc_r); DECLARE_WRITE8_MEMBER(lx390_fdc_w); + void z80net(machine_config &config); + void z80netf(machine_config &config); + void z80ne(machine_config &config); + void z80netb(machine_config &config); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; diff --git a/src/mame/includes/z88.h b/src/mame/includes/z88.h index beae4c38fa2..f4e29f1fd86 100644 --- a/src/mame/includes/z88.h +++ b/src/mame/includes/z88.h @@ -92,6 +92,7 @@ public: uint8_t * m_ram_base; z88cart_slot_device * m_carts[4]; DECLARE_PALETTE_INIT(z88); + void z88(machine_config &config); }; #endif /* MAME_INCLUDES_Z88_H */ diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index 4d1cef16719..3ce39a5376c 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -44,4 +44,5 @@ public: uint32_t screen_update_tinvader(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); int SpriteCollision(int first,int second); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void tinvader(machine_config &config); }; diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h index 5dba416a792..792e7af9061 100644 --- a/src/mame/includes/zaccaria.h +++ b/src/mame/includes/zaccaria.h @@ -37,6 +37,7 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,uint8_t *spriteram,int color,int section); + void zaccaria(machine_config &config); protected: required_device m_maincpu; required_device m_gfxdecode; diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index 8dc2feb31b5..f0b246af7c9 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -103,9 +103,15 @@ public: inline int find_minimum_y(uint8_t value, int flip); inline int find_minimum_x(uint8_t value, int flip); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint16_t flipxmask, uint16_t flipymask); + void root(machine_config &config); + void ixion(machine_config &config); + void futspye(machine_config &config); + void congo(machine_config &config); + void szaxxon(machine_config &config); + void razmataze(machine_config &config); + void szaxxone(machine_config &config); + void zaxxon(machine_config &config); + void zaxxon_samples(machine_config &config); + void congo_samples(machine_config &config); }; - -/*----------- defined in audio/zaxxon.c -----------*/ -MACHINE_CONFIG_EXTERN( zaxxon_samples ); -MACHINE_CONFIG_EXTERN( congo_samples ); diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h index bdebef88411..de5cb27c7da 100644 --- a/src/mame/includes/zerozone.h +++ b/src/mame/includes/zerozone.h @@ -45,6 +45,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void zerozone(machine_config &config); protected: // driver_device overrides diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h index 33039a43200..4cc502e8041 100644 --- a/src/mame/includes/zodiack.h +++ b/src/mame/includes/zodiack.h @@ -70,4 +70,5 @@ public: DECLARE_PALETTE_INIT(zodiack); INTERRUPT_GEN_MEMBER(zodiack_sound_nmi_gen); INTERRUPT_GEN_MEMBER(zodiack_main_nmi_gen); + void zodiack(machine_config &config); }; diff --git a/src/mame/includes/zorba.h b/src/mame/includes/zorba.h index 14fa6bb41e2..5816cf49a08 100644 --- a/src/mame/includes/zorba.h +++ b/src/mame/includes/zorba.h @@ -80,6 +80,7 @@ public: DECLARE_WRITE_LINE_MEMBER(printer_select_w); DECLARE_INPUT_CHANGED_MEMBER(printer_type); + void zorba(machine_config &config); private: required_ioport m_config_port; diff --git a/src/mame/includes/zx.h b/src/mame/includes/zx.h index 0d31dbbb4fa..a12877fa3dc 100644 --- a/src/mame/includes/zx.h +++ b/src/mame/includes/zx.h @@ -64,6 +64,13 @@ public: void zx_tape_input(); void zx_ula_hsync(); + void zx81(machine_config &config); + void zx81_spk(machine_config &config); + void ts1000(machine_config &config); + void pc8300(machine_config &config); + void pow3000(machine_config &config); + void ts1500(machine_config &config); + void zx80(machine_config &config); protected: enum { diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp index 17de5e2c5de..9cc2c6e8d84 100644 --- a/src/mame/machine/abc1600mac.cpp +++ b/src/mame/machine/abc1600mac.cpp @@ -66,7 +66,7 @@ static ADDRESS_MAP_START( program_map, AS_PROGRAM, 8, abc1600_mac_device ) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( abc1600_mac_device::device_add_mconfig ) +MACHINE_CONFIG_START(abc1600_mac_device::device_add_mconfig) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1600)) // XTAL_64MHz/8/10/20000/8/8 MACHINE_CONFIG_END diff --git a/src/mame/machine/abc80kb.cpp b/src/mame/machine/abc80kb.cpp index af158f21125..d4291c1dec7 100644 --- a/src/mame/machine/abc80kb.cpp +++ b/src/mame/machine/abc80kb.cpp @@ -125,7 +125,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( abc80_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(abc80_keyboard_device::device_add_mconfig) MCFG_CPU_ADD(I8048_TAG, I8048, 4000000) MCFG_CPU_IO_MAP(abc80_keyboard_io) MCFG_DEVICE_DISABLE() diff --git a/src/mame/machine/acs8600_ics.cpp b/src/mame/machine/acs8600_ics.cpp index 1419f6badea..bd75dde71c2 100644 --- a/src/mame/machine/acs8600_ics.cpp +++ b/src/mame/machine/acs8600_ics.cpp @@ -92,7 +92,7 @@ static const z80_daisy_config ics_daisy_chain[] = nullptr }; -MACHINE_CONFIG_MEMBER( acs8600_ics_device::device_add_mconfig ) +MACHINE_CONFIG_START(acs8600_ics_device::device_add_mconfig) MCFG_CPU_ADD("icscpu", Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(ics_mem) MCFG_CPU_IO_MAP(ics_io) diff --git a/src/mame/machine/alpha8201.cpp b/src/mame/machine/alpha8201.cpp index cd2c00a4bee..59f1adb08be 100644 --- a/src/mame/machine/alpha8201.cpp +++ b/src/mame/machine/alpha8201.cpp @@ -316,7 +316,7 @@ void alpha_8201_device::device_start() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER(alpha_8201_device::device_add_mconfig) +MACHINE_CONFIG_START(alpha_8201_device::device_add_mconfig) MCFG_CPU_ADD("mcu", HD44801, DERIVED_CLOCK(1,1)) // 8H MCFG_HMCS40_READ_R_CB(0, READ8(alpha_8201_device, mcu_data_r)) diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp index 42ecef4a781..964cb70f5df 100644 --- a/src/mame/machine/apollo.cpp +++ b/src/mame/machine/apollo.cpp @@ -1054,7 +1054,7 @@ static SLOT_INTERFACE_START(apollo_isa_cards) SLOT_INTERFACE("3c505", ISA16_3C505) // 3Com 3C505 Ethernet card SLOT_INTERFACE_END -MACHINE_CONFIG_START( common ) +MACHINE_CONFIG_START(apollo_state::common) // configuration MUST be reset first ! MCFG_DEVICE_ADD(APOLLO_CONF_TAG, APOLLO_CONF, 0) @@ -1149,7 +1149,7 @@ MACHINE_CONFIG_START( common ) MACHINE_CONFIG_END // for machines with the keyboard and a graphics head -MACHINE_CONFIG_START( apollo ) +MACHINE_CONFIG_START(apollo_state::apollo) MCFG_FRAGMENT_ADD(common) MCFG_APOLLO_SIO_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz ) MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler)) @@ -1171,7 +1171,7 @@ static DEVICE_INPUT_DEFAULTS_START( apollo_terminal ) DEVICE_INPUT_DEFAULTS_END // for headless machines using a serial console -MACHINE_CONFIG_START( apollo_terminal ) +MACHINE_CONFIG_START(apollo_state::apollo_terminal) MCFG_FRAGMENT_ADD(common) MCFG_APOLLO_SIO_ADD( APOLLO_SIO_TAG, XTAL_3_6864MHz ) MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler)) diff --git a/src/mame/machine/apricotkb.cpp b/src/mame/machine/apricotkb.cpp index c12d17755a6..0eb5aeea02d 100644 --- a/src/mame/machine/apricotkb.cpp +++ b/src/mame/machine/apricotkb.cpp @@ -67,7 +67,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( apricot_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(apricot_keyboard_device::device_add_mconfig) #ifdef UPD7507_EMULATED MCFG_CPU_ADD(UPD7507C_TAG, UPD7507, XTAL_32_768kHz) MCFG_CPU_IO_MAP(apricot_keyboard_io) diff --git a/src/mame/machine/asic65.cpp b/src/mame/machine/asic65.cpp index 1991435431f..8e245871f51 100644 --- a/src/mame/machine/asic65.cpp +++ b/src/mame/machine/asic65.cpp @@ -536,7 +536,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( asic65_device::device_add_mconfig ) +MACHINE_CONFIG_START(asic65_device::device_add_mconfig) /* ASIC65 */ MCFG_CPU_ADD("asic65cpu", TMS32010, 20000000) diff --git a/src/mame/machine/at.cpp b/src/mame/machine/at.cpp index a7a3255aa02..19d4ee78bc2 100644 --- a/src/mame/machine/at.cpp +++ b/src/mame/machine/at.cpp @@ -46,14 +46,14 @@ void at_mb_device::device_start() i80286_cpu_device::static_set_a20_callback(*m_maincpu, i80286_cpu_device::a20_cb(&at_mb_device::a20_286, this)); } -MACHINE_CONFIG_START( at_softlists ) +MACHINE_CONFIG_START(at_mb_device::at_softlists) /* software lists */ MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") MCFG_SOFTWARE_LIST_ADD("at_disk_list","ibm5170") MCFG_SOFTWARE_LIST_ADD("at_cdrom_list","ibm5170_cdrom") MACHINE_CONFIG_END -MACHINE_CONFIG_MEMBER( at_mb_device::device_add_mconfig ) +MACHINE_CONFIG_START(at_mb_device::device_add_mconfig) MCFG_DEVICE_ADD("pit8254", PIT8254, 0) MCFG_PIT8253_CLK0(4772720/4) /* heartbeat IRQ */ MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259_master", pic8259_device, ir0_w)) diff --git a/src/mame/machine/at.h b/src/mame/machine/at.h index dcaf1d5af9e..0f9bea86b00 100644 --- a/src/mame/machine/at.h +++ b/src/mame/machine/at.h @@ -29,6 +29,7 @@ public: uint32_t a20_286(bool state); + void at_softlists(machine_config &config); protected: void device_start() override; void device_reset() override; @@ -93,6 +94,5 @@ private: DECLARE_DEVICE_TYPE(AT_MB, at_mb_device) -MACHINE_CONFIG_EXTERN(at_softlists); #endif // MAME_MACHINE_AT_H diff --git a/src/mame/machine/atarifdc.cpp b/src/mame/machine/atarifdc.cpp index 512ea43137c..7262575fea0 100644 --- a/src/mame/machine/atarifdc.cpp +++ b/src/mame/machine/atarifdc.cpp @@ -796,6 +796,6 @@ void atari_fdc_device::device_start() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( atari_fdc_device::device_add_mconfig ) +MACHINE_CONFIG_START(atari_fdc_device::device_add_mconfig) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(atari_floppy_interface) MACHINE_CONFIG_END diff --git a/src/mame/machine/beta.cpp b/src/mame/machine/beta.cpp index 0d4b7b370c3..a714a26d310 100644 --- a/src/mame/machine/beta.cpp +++ b/src/mame/machine/beta.cpp @@ -266,7 +266,7 @@ ROM_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( beta_disk_device::device_add_mconfig ) +MACHINE_CONFIG_START(beta_disk_device::device_add_mconfig) MCFG_KR1818VG93_ADD("wd179x", XTAL_8MHz / 8) MCFG_FLOPPY_DRIVE_ADD("wd179x:0", beta_disk_floppies, "525qd", beta_disk_device::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) diff --git a/src/mame/machine/c117.cpp b/src/mame/machine/c117.cpp index 94576cf9832..c7780007fd7 100644 --- a/src/mame/machine/c117.cpp +++ b/src/mame/machine/c117.cpp @@ -120,7 +120,7 @@ void namco_c117_device::device_reset() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( namco_c117_device::device_add_mconfig ) +MACHINE_CONFIG_START(namco_c117_device::device_add_mconfig) MCFG_WATCHDOG_ADD("watchdog") MACHINE_CONFIG_END diff --git a/src/mame/machine/cedar_magnet_flop.cpp b/src/mame/machine/cedar_magnet_flop.cpp index b1cd0b2165b..61020923366 100644 --- a/src/mame/machine/cedar_magnet_flop.cpp +++ b/src/mame/machine/cedar_magnet_flop.cpp @@ -16,7 +16,7 @@ cedar_magnet_flop_device::cedar_magnet_flop_device(const machine_config &mconfig } -MACHINE_CONFIG_MEMBER( cedar_magnet_flop_device::device_add_mconfig ) +MACHINE_CONFIG_START(cedar_magnet_flop_device::device_add_mconfig) MCFG_NVRAM_ADD_NO_FILL("floppy_nvram") MACHINE_CONFIG_END diff --git a/src/mame/machine/cedar_magnet_plane.cpp b/src/mame/machine/cedar_magnet_plane.cpp index f341f4a6c22..e6f9a0883ab 100644 --- a/src/mame/machine/cedar_magnet_plane.cpp +++ b/src/mame/machine/cedar_magnet_plane.cpp @@ -69,7 +69,7 @@ WRITE8_MEMBER(cedar_magnet_plane_device::plane_portcf_w) m_cf_data = data; } -MACHINE_CONFIG_MEMBER( cedar_magnet_plane_device::device_add_mconfig ) +MACHINE_CONFIG_START(cedar_magnet_plane_device::device_add_mconfig) MCFG_CPU_ADD("planecpu", Z80,4000000) MCFG_CPU_PROGRAM_MAP(cedar_magnet_plane_map) MCFG_CPU_IO_MAP(cedar_magnet_plane_io) diff --git a/src/mame/machine/cedar_magnet_sprite.cpp b/src/mame/machine/cedar_magnet_sprite.cpp index 87c1fb4a3b7..6587d8fb174 100644 --- a/src/mame/machine/cedar_magnet_sprite.cpp +++ b/src/mame/machine/cedar_magnet_sprite.cpp @@ -199,7 +199,7 @@ WRITE8_MEMBER(cedar_magnet_sprite_device::sprite_port9c_w) // printf("%s:sprite_port9c_w %02x\n", machine().describe_context(), data); } -MACHINE_CONFIG_MEMBER( cedar_magnet_sprite_device::device_add_mconfig ) +MACHINE_CONFIG_START(cedar_magnet_sprite_device::device_add_mconfig) MCFG_CPU_ADD("spritecpu", Z80,4000000) MCFG_CPU_PROGRAM_MAP(cedar_magnet_sprite_map) MCFG_CPU_IO_MAP(cedar_magnet_sprite_io) diff --git a/src/mame/machine/compiskb.cpp b/src/mame/machine/compiskb.cpp index 58cf775f965..efb0bf05d8d 100644 --- a/src/mame/machine/compiskb.cpp +++ b/src/mame/machine/compiskb.cpp @@ -55,7 +55,7 @@ const tiny_rom_entry *compis_keyboard_device::device_rom_region() const // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( compis_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(compis_keyboard_device::device_add_mconfig) MCFG_CPU_ADD(I8748_TAG, I8748, 2016000) // XTAL_4_032MHz/2 ??? MCFG_MCS48_PORT_BUS_IN_CB(READ8(compis_keyboard_device, bus_r)) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(compis_keyboard_device, bus_w)) diff --git a/src/mame/machine/cuda.cpp b/src/mame/machine/cuda.cpp index 1493847920d..0a37d7d57e9 100644 --- a/src/mame/machine/cuda.cpp +++ b/src/mame/machine/cuda.cpp @@ -84,7 +84,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( cuda_device::device_add_mconfig ) +MACHINE_CONFIG_START(cuda_device::device_add_mconfig) MCFG_CPU_ADD(CUDA_CPU_TAG, M68HC05EG, XTAL_32_768kHz*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control MCFG_CPU_PROGRAM_MAP(cuda_map) MACHINE_CONFIG_END diff --git a/src/mame/machine/dec_lk201.cpp b/src/mame/machine/dec_lk201.cpp index cd95a4817ba..21d7f57640f 100644 --- a/src/mame/machine/dec_lk201.cpp +++ b/src/mame/machine/dec_lk201.cpp @@ -210,7 +210,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( lk201_device::device_add_mconfig ) +MACHINE_CONFIG_START(lk201_device::device_add_mconfig) MCFG_CPU_ADD(LK201_CPU_TAG, M68HC05EG, XTAL_4MHz) // actually 68HC05C4, clock verified by Lord_Nightmare MCFG_CPU_PROGRAM_MAP(lk201_map) diff --git a/src/mame/machine/decopincpu.cpp b/src/mame/machine/decopincpu.cpp index f1c3c6bd999..ae645f7799a 100644 --- a/src/mame/machine/decopincpu.cpp +++ b/src/mame/machine/decopincpu.cpp @@ -197,7 +197,7 @@ WRITE8_MEMBER( decocpu_type1_device::solenoid2_w ) // todo } -MACHINE_CONFIG_MEMBER( decocpu_type1_device::device_add_mconfig ) +MACHINE_CONFIG_START(decocpu_type1_device::device_add_mconfig) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(decocpu1_map) @@ -308,7 +308,7 @@ decocpu_type2_device::decocpu_type2_device(const machine_config &mconfig, device : decocpu_type1_device(mconfig, type, tag, owner, clock) {} -MACHINE_CONFIG_MEMBER( decocpu_type2_device::device_add_mconfig ) +MACHINE_CONFIG_START(decocpu_type2_device::device_add_mconfig) decocpu_type1_device::device_add_mconfig(config); /* basic machine hardware */ diff --git a/src/mame/machine/dmv_keyb.cpp b/src/mame/machine/dmv_keyb.cpp index 6bd7b835555..4339065374d 100644 --- a/src/mame/machine/dmv_keyb.cpp +++ b/src/mame/machine/dmv_keyb.cpp @@ -227,7 +227,7 @@ void dmv_keyboard_device::device_reset() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( dmv_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(dmv_keyboard_device::device_add_mconfig) MCFG_CPU_ADD("mcu", I8741, XTAL_6MHz) MCFG_MCS48_PORT_P1_IN_CB(READ8(dmv_keyboard_device, port1_r)) MCFG_MCS48_PORT_P2_IN_CB(READ8(dmv_keyboard_device, port2_r)) diff --git a/src/mame/machine/egret.cpp b/src/mame/machine/egret.cpp index 2b6834b8cc7..60f59bb7010 100644 --- a/src/mame/machine/egret.cpp +++ b/src/mame/machine/egret.cpp @@ -83,7 +83,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( egret_device::device_add_mconfig ) +MACHINE_CONFIG_START(egret_device::device_add_mconfig) MCFG_CPU_ADD(EGRET_CPU_TAG, M68HC05EG, XTAL_32_768kHz*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control MCFG_CPU_PROGRAM_MAP(egret_map) MACHINE_CONFIG_END diff --git a/src/mame/machine/esqlcd.cpp b/src/mame/machine/esqlcd.cpp index b125237950a..9fdb8c42390 100644 --- a/src/mame/machine/esqlcd.cpp +++ b/src/mame/machine/esqlcd.cpp @@ -161,7 +161,7 @@ static unsigned char const Font5x7[][5] = { }; //-------------------------------------------------------------------------------------------------------------------------------------------- -MACHINE_CONFIG_MEMBER(esq2x16_sq1_device::device_add_mconfig) +MACHINE_CONFIG_START(esq2x16_sq1_device::device_add_mconfig) MCFG_DEFAULT_LAYOUT(layout_esq2by16) MACHINE_CONFIG_END diff --git a/src/mame/machine/esqpanel.cpp b/src/mame/machine/esqpanel.cpp index 07b36e58565..7537a0fbf31 100644 --- a/src/mame/machine/esqpanel.cpp +++ b/src/mame/machine/esqpanel.cpp @@ -655,7 +655,7 @@ void esqpanel_device::set_analog_value(offs_t offset, uint16_t value) /* panel with 1x22 VFD display used in the EPS-16 and EPS-16 Plus */ -MACHINE_CONFIG_MEMBER(esqpanel1x22_device::device_add_mconfig) +MACHINE_CONFIG_START(esqpanel1x22_device::device_add_mconfig) MCFG_ESQ1X22_ADD("vfd") MACHINE_CONFIG_END @@ -669,7 +669,7 @@ esqpanel1x22_device::esqpanel1x22_device(const machine_config &mconfig, const ch /* panel with 2x40 VFD display used in the ESQ-1, SQ-80 */ -MACHINE_CONFIG_MEMBER(esqpanel2x40_device::device_add_mconfig) +MACHINE_CONFIG_START(esqpanel2x40_device::device_add_mconfig) MCFG_ESQ2X40_ADD("vfd") MACHINE_CONFIG_END @@ -683,7 +683,7 @@ esqpanel2x40_device::esqpanel2x40_device(const machine_config &mconfig, const ch /* panel with 2x40 VFD display used in the VFX, VFX-SD, SD-1 series */ -MACHINE_CONFIG_MEMBER(esqpanel2x40_vfx_device::device_add_mconfig) +MACHINE_CONFIG_START(esqpanel2x40_vfx_device::device_add_mconfig) MCFG_ESQ2X40_ADD("vfd") MACHINE_CONFIG_END @@ -708,7 +708,7 @@ bool esqpanel2x40_vfx_device::write_contents(std::ostream &o) // --- SQ1 - Parduz -------------------------------------------------------------------------------------------------------------------------- -MACHINE_CONFIG_MEMBER(esqpanel2x16_sq1_device::device_add_mconfig) +MACHINE_CONFIG_START(esqpanel2x16_sq1_device::device_add_mconfig) MCFG_ESQ2X16_SQ1_ADD("vfd") MACHINE_CONFIG_END diff --git a/src/mame/machine/esqvfd.cpp b/src/mame/machine/esqvfd.cpp index 57965118432..4201b8cb885 100644 --- a/src/mame/machine/esqvfd.cpp +++ b/src/mame/machine/esqvfd.cpp @@ -191,7 +191,7 @@ void esqvfd_device::update_display() /* 2x40 VFD display used in the ESQ-1, VFX-SD, SD-1, and others */ -MACHINE_CONFIG_MEMBER(esq2x40_device::device_add_mconfig) +MACHINE_CONFIG_START(esq2x40_device::device_add_mconfig) MCFG_DEFAULT_LAYOUT(layout_esq2by40) MACHINE_CONFIG_END @@ -325,7 +325,7 @@ esq2x40_device::esq2x40_device(const machine_config &mconfig, const char *tag, d /* 1x22 display from the VFX (not right, but it'll do for now) */ -MACHINE_CONFIG_MEMBER(esq1x22_device::device_add_mconfig) +MACHINE_CONFIG_START(esq1x22_device::device_add_mconfig) MCFG_DEFAULT_LAYOUT(layout_esq1by22) MACHINE_CONFIG_END @@ -373,7 +373,7 @@ esq1x22_device::esq1x22_device(const machine_config &mconfig, const char *tag, d } /* SQ-1 display, I think it's really an LCD but we'll deal with it for now */ -MACHINE_CONFIG_MEMBER(esq2x40_sq1_device::device_add_mconfig) +MACHINE_CONFIG_START(esq2x40_sq1_device::device_add_mconfig) MCFG_DEFAULT_LAYOUT(layout_esq2by40) // we use the normal 2x40 layout MACHINE_CONFIG_END diff --git a/src/mame/machine/gaelco_ds5002fp.cpp b/src/mame/machine/gaelco_ds5002fp.cpp index ce05d6a5618..0ab9746a516 100644 --- a/src/mame/machine/gaelco_ds5002fp.cpp +++ b/src/mame/machine/gaelco_ds5002fp.cpp @@ -41,7 +41,7 @@ WRITE8_MEMBER(gaelco_ds5002fp_device::hostmem_w) m_hostmem->write_byte(offset, data); } -MACHINE_CONFIG_MEMBER(gaelco_ds5002fp_device::device_add_mconfig) +MACHINE_CONFIG_START(gaelco_ds5002fp_device::device_add_mconfig) MCFG_CPU_ADD("mcu", DS5002FP, DERIVED_CLOCK(1, 1)) MCFG_CPU_PROGRAM_MAP(dallas_rom) MCFG_CPU_IO_MAP(dallas_ram) diff --git a/src/mame/machine/genpin.cpp b/src/mame/machine/genpin.cpp index fad813d653b..2acf31e5506 100644 --- a/src/mame/machine/genpin.cpp +++ b/src/mame/machine/genpin.cpp @@ -11,7 +11,7 @@ This is for common pinball machine coding. #include "speaker.h" -MACHINE_CONFIG_START( genpin_audio ) +MACHINE_CONFIG_START(genpin_class::genpin_audio) MCFG_SPEAKER_STANDARD_MONO("mechvol") MCFG_SOUND_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(6) diff --git a/src/mame/machine/genpin.h b/src/mame/machine/genpin.h index 9c6bc50c6e0..d1ee6620bd0 100644 --- a/src/mame/machine/genpin.h +++ b/src/mame/machine/genpin.h @@ -32,9 +32,6 @@ const char *const genpin_sample_names[] = nullptr /* end of array */ }; -MACHINE_CONFIG_EXTERN( genpin_audio ); - - class genpin_class : public driver_device { public: @@ -44,6 +41,8 @@ public: { } required_device m_samples; + + void genpin_audio(machine_config &config); }; diff --git a/src/mame/machine/hec2hrp.cpp b/src/mame/machine/hec2hrp.cpp index 245f92c1417..7b30674683b 100644 --- a/src/mame/machine/hec2hrp.cpp +++ b/src/mame/machine/hec2hrp.cpp @@ -803,7 +803,7 @@ static DISCRETE_SOUND_START( hec2hrp ) DISCRETE_OUTPUT(NODE_01, 5000) DISCRETE_SOUND_END -MACHINE_CONFIG_START( hector_audio ) +MACHINE_CONFIG_START(hec2hrp_state::hector_audio) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") MCFG_SOUND_ROUTE(0, "mono", 0.25) /* Sound level for cassette, as it is in mono => output channel=0*/ diff --git a/src/mame/machine/hng64_net.cpp b/src/mame/machine/hng64_net.cpp index 295543d7a5f..c9e922f634d 100644 --- a/src/mame/machine/hng64_net.cpp +++ b/src/mame/machine/hng64_net.cpp @@ -140,7 +140,7 @@ void hng64_state::reset_net() m_mmub[5] = 0; // rolls back to 0xffff } -MACHINE_CONFIG_START( hng64_network ) +MACHINE_CONFIG_START(hng64_state::hng64_network) MCFG_CPU_ADD("network", KL5C80A12, HNG64_MASTER_CLOCK / 4) /* KL5C80A12CFP - binary compatible with Z80. */ MCFG_CPU_PROGRAM_MAP(hng_comm_map) MCFG_CPU_IO_MAP(hng_comm_io_map) diff --git a/src/mame/machine/hng64_net.h b/src/mame/machine/hng64_net.h deleted file mode 100644 index fd28a398efe..00000000000 --- a/src/mame/machine/hng64_net.h +++ /dev/null @@ -1,4 +0,0 @@ -// license:LGPL-2.1+ -// copyright-holders:David Haywood, Angelo Salese, ElSemi, Andrew Gardner - -MACHINE_CONFIG_EXTERN(hng64_network); diff --git a/src/mame/machine/hp9845_printer.cpp b/src/mame/machine/hp9845_printer.cpp index 3741b737552..0342f39e5dd 100644 --- a/src/mame/machine/hp9845_printer.cpp +++ b/src/mame/machine/hp9845_printer.cpp @@ -137,7 +137,7 @@ const tiny_rom_entry *hp9845_printer_device::device_rom_region() const return ROM_NAME(hp9845_printer); } -MACHINE_CONFIG_MEMBER(hp9845_printer_device::device_add_mconfig) +MACHINE_CONFIG_START(hp9845_printer_device::device_add_mconfig) MCFG_DEVICE_ADD("prt_alpha", BITBANGER, 0) MCFG_DEVICE_ADD("prt_graphic", BITBANGER, 0) MACHINE_CONFIG_END diff --git a/src/mame/machine/ibm6580_fdc.cpp b/src/mame/machine/ibm6580_fdc.cpp index 6a188c90a73..5553456a683 100644 --- a/src/mame/machine/ibm6580_fdc.cpp +++ b/src/mame/machine/ibm6580_fdc.cpp @@ -32,7 +32,7 @@ const tiny_rom_entry *dw_fdc_device::device_rom_region() const return ROM_NAME( dw_fdc ); } -MACHINE_CONFIG_MEMBER( dw_fdc_device::device_add_mconfig ) +MACHINE_CONFIG_START(dw_fdc_device::device_add_mconfig) MCFG_CPU_ADD("mcu", I8048, XTAL_24MHz/4) // divisor is unverified // MCFG_MCS48_PORT_BUS_IN_CB(READ8(dw_fdc_device, bus_r)) // MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(dw_fdc_device, bus_w)) diff --git a/src/mame/machine/ibm6580_kbd.cpp b/src/mame/machine/ibm6580_kbd.cpp index 51ced305773..15941df6c22 100644 --- a/src/mame/machine/ibm6580_kbd.cpp +++ b/src/mame/machine/ibm6580_kbd.cpp @@ -32,7 +32,7 @@ const tiny_rom_entry *dw_keyboard_device::device_rom_region() const return ROM_NAME( dw_keyboard ); } -MACHINE_CONFIG_MEMBER( dw_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(dw_keyboard_device::device_add_mconfig) MCFG_CPU_ADD("mcu", I8049, XTAL_6MHz) // XXX RC oscillator MCFG_MCS48_PORT_BUS_IN_CB(READ8(dw_keyboard_device, bus_r)) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(dw_keyboard_device, bus_w)) diff --git a/src/mame/machine/inder_sb.cpp b/src/mame/machine/inder_sb.cpp index ce14408e500..32ee5f10cf2 100644 --- a/src/mame/machine/inder_sb.cpp +++ b/src/mame/machine/inder_sb.cpp @@ -206,7 +206,7 @@ static ADDRESS_MAP_START( sound_io, AS_IO, 8, inder_sb_device ) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( inder_sb_device::device_add_mconfig ) +MACHINE_CONFIG_START(inder_sb_device::device_add_mconfig) MCFG_CPU_ADD("audiocpu", Z80, 8000000) // unk freq MCFG_Z80_DAISY_CHAIN(daisy_chain) MCFG_CPU_PROGRAM_MAP(sound_map) diff --git a/src/mame/machine/inder_vid.cpp b/src/mame/machine/inder_vid.cpp index 3b7cd017c17..07e17105110 100644 --- a/src/mame/machine/inder_vid.cpp +++ b/src/mame/machine/inder_vid.cpp @@ -85,7 +85,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, inder_vid_device ) AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb888_w) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( inder_vid_device::device_add_mconfig ) +MACHINE_CONFIG_START(inder_vid_device::device_add_mconfig) MCFG_CPU_ADD("tms", TMS34010, XTAL_40MHz) MCFG_CPU_PROGRAM_MAP(megaphx_tms_map) MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */ diff --git a/src/mame/machine/isbc_208.cpp b/src/mame/machine/isbc_208.cpp index b21f6986805..5b85b93536d 100644 --- a/src/mame/machine/isbc_208.cpp +++ b/src/mame/machine/isbc_208.cpp @@ -28,7 +28,7 @@ static SLOT_INTERFACE_START( isbc_208_floppies ) SLOT_INTERFACE( "525dd", FLOPPY_525_DD ) SLOT_INTERFACE_END -MACHINE_CONFIG_MEMBER( isbc_208_device::device_add_mconfig ) +MACHINE_CONFIG_START(isbc_208_device::device_add_mconfig) MCFG_DEVICE_ADD("dmac", AM9517A, XTAL_8MHz/4) MCFG_I8237_OUT_HREQ_CB(WRITELINE(isbc_208_device, hreq_w)) MCFG_I8237_OUT_EOP_CB(WRITELINE(isbc_208_device, out_eop_w)) diff --git a/src/mame/machine/isbc_215g.cpp b/src/mame/machine/isbc_215g.cpp index f60eabdc3ec..58789cf1cff 100644 --- a/src/mame/machine/isbc_215g.cpp +++ b/src/mame/machine/isbc_215g.cpp @@ -350,7 +350,7 @@ WRITE_LINE_MEMBER(isbc_215g_device::isbx_irq_11_w) m_isbx_irq[3] = state ? true : false; } -MACHINE_CONFIG_MEMBER( isbc_215g_device::device_add_mconfig ) +MACHINE_CONFIG_START(isbc_215g_device::device_add_mconfig) MCFG_CPU_ADD("u84", I8089, XTAL_15MHz / 3) MCFG_CPU_PROGRAM_MAP(isbc_215g_mem) MCFG_CPU_IO_MAP(isbc_215g_io) diff --git a/src/mame/machine/iteagle_fpga.cpp b/src/mame/machine/iteagle_fpga.cpp index 29383fae809..5c8962d57ae 100644 --- a/src/mame/machine/iteagle_fpga.cpp +++ b/src/mame/machine/iteagle_fpga.cpp @@ -36,7 +36,7 @@ iteagle_fpga_device::iteagle_fpga_device(const machine_config &mconfig, const ch { } -MACHINE_CONFIG_MEMBER(iteagle_fpga_device::device_add_mconfig) +MACHINE_CONFIG_START(iteagle_fpga_device::device_add_mconfig) MCFG_NVRAM_ADD_0FILL("eagle2_rtc") MCFG_NVRAM_ADD_1FILL("eagle1_bram") @@ -647,7 +647,7 @@ DEVICE_ADDRESS_MAP_START(eeprom_map, 32, iteagle_eeprom_device) AM_RANGE(0x0000, 0x000F) AM_READWRITE(eeprom_r, eeprom_w) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( iteagle_eeprom_device::device_add_mconfig ) +MACHINE_CONFIG_START(iteagle_eeprom_device::device_add_mconfig) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MACHINE_CONFIG_END @@ -761,7 +761,7 @@ WRITE32_MEMBER( iteagle_eeprom_device::eeprom_w ) // Attached Peripheral Controller //************************************ -MACHINE_CONFIG_MEMBER(iteagle_periph_device::device_add_mconfig) +MACHINE_CONFIG_START(iteagle_periph_device::device_add_mconfig) MCFG_NVRAM_ADD_0FILL("eagle1_rtc") MACHINE_CONFIG_END diff --git a/src/mame/machine/jvs13551.cpp b/src/mame/machine/jvs13551.cpp index afb05bbafe6..4de551dfeb3 100644 --- a/src/mame/machine/jvs13551.cpp +++ b/src/mame/machine/jvs13551.cpp @@ -49,7 +49,7 @@ void sega_837_13551_device::static_set_port_tag(device_t &device, int port, cons ctrl.port_tag[port] = tag; } -MACHINE_CONFIG_MEMBER(sega_837_13551_device::device_add_mconfig) +MACHINE_CONFIG_START(sega_837_13551_device::device_add_mconfig) MCFG_CPU_ADD("iomcu", TMP90PH44, 10000000) // unknown clock MACHINE_CONFIG_END diff --git a/src/mame/machine/k573cass.cpp b/src/mame/machine/k573cass.cpp index f6cb1e45a15..d9f270dad7b 100644 --- a/src/mame/machine/k573cass.cpp +++ b/src/mame/machine/k573cass.cpp @@ -76,7 +76,7 @@ konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &m { } -MACHINE_CONFIG_MEMBER( konami573_cassette_x_device::device_add_mconfig ) +MACHINE_CONFIG_START(konami573_cassette_x_device::device_add_mconfig) MCFG_X76F041_ADD( "eeprom" ) MACHINE_CONFIG_END @@ -120,7 +120,7 @@ konami573_cassette_xi_device::konami573_cassette_xi_device(const machine_config { } -MACHINE_CONFIG_MEMBER( konami573_cassette_xi_device::device_add_mconfig ) +MACHINE_CONFIG_START(konami573_cassette_xi_device::device_add_mconfig) MCFG_X76F041_ADD( "eeprom" ) MCFG_DS2401_ADD( "id" ) MCFG_DEVICE_ADD( "adc0838", ADC0838, 0 ) @@ -188,7 +188,7 @@ konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &m { } -MACHINE_CONFIG_MEMBER( konami573_cassette_y_device::device_add_mconfig ) +MACHINE_CONFIG_START(konami573_cassette_y_device::device_add_mconfig) MCFG_X76F100_ADD( "eeprom" ) MACHINE_CONFIG_END @@ -264,7 +264,7 @@ konami573_cassette_yi_device::konami573_cassette_yi_device(const machine_config { } -MACHINE_CONFIG_MEMBER( konami573_cassette_yi_device::device_add_mconfig ) +MACHINE_CONFIG_START(konami573_cassette_yi_device::device_add_mconfig) MCFG_X76F100_ADD( "eeprom" ) MCFG_DS2401_ADD( "id" ) MACHINE_CONFIG_END @@ -292,7 +292,7 @@ konami573_cassette_zi_device::konami573_cassette_zi_device(const machine_config { } -MACHINE_CONFIG_MEMBER( konami573_cassette_zi_device::device_add_mconfig ) +MACHINE_CONFIG_START(konami573_cassette_zi_device::device_add_mconfig) MCFG_DS2401_ADD( "id" ) MCFG_ZS01_ADD( "eeprom" ) MCFG_ZS01_DS2401( "id" ) diff --git a/src/mame/machine/k573dio.cpp b/src/mame/machine/k573dio.cpp index 8f4ed59491b..fe539ab94c3 100644 --- a/src/mame/machine/k573dio.cpp +++ b/src/mame/machine/k573dio.cpp @@ -131,7 +131,7 @@ const tiny_rom_entry *k573dio_device::device_rom_region() const return ROM_NAME(k573dio); } -MACHINE_CONFIG_MEMBER( k573dio_device::device_add_mconfig ) +MACHINE_CONFIG_START(k573dio_device::device_add_mconfig) MCFG_MAS3507D_ADD( "mpeg" ) MCFG_DS2401_ADD( "digital_id" ) MACHINE_CONFIG_END diff --git a/src/mame/machine/k7659kb.cpp b/src/mame/machine/k7659kb.cpp index 373ed33be86..619b799ff77 100644 --- a/src/mame/machine/k7659kb.cpp +++ b/src/mame/machine/k7659kb.cpp @@ -61,7 +61,7 @@ const tiny_rom_entry *k7659_keyboard_device::device_rom_region() const // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( k7659_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(k7659_keyboard_device::device_add_mconfig) MACHINE_CONFIG_END diff --git a/src/mame/machine/kay_kbd.cpp b/src/mame/machine/kay_kbd.cpp index a4f5e76f835..1c811d57459 100644 --- a/src/mame/machine/kay_kbd.cpp +++ b/src/mame/machine/kay_kbd.cpp @@ -349,7 +349,7 @@ tiny_rom_entry const *kaypro_10_keyboard_device::device_rom_region() const return ROM_NAME(kaypro_10_keyboard); } -MACHINE_CONFIG_MEMBER(kaypro_10_keyboard_device::device_add_mconfig) +MACHINE_CONFIG_START(kaypro_10_keyboard_device::device_add_mconfig) MCFG_CPU_ADD("mcu", I8049, XTAL_6MHz) MCFG_MCS48_PORT_P1_IN_CB(READ8(kaypro_10_keyboard_device, p1_r)) MCFG_MCS48_PORT_P2_IN_CB(READ8(kaypro_10_keyboard_device, p2_r)) diff --git a/src/mame/machine/km035.cpp b/src/mame/machine/km035.cpp index f7cc03a7629..d376eb1125d 100644 --- a/src/mame/machine/km035.cpp +++ b/src/mame/machine/km035.cpp @@ -54,7 +54,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( km035_device::device_add_mconfig ) +MACHINE_CONFIG_START(km035_device::device_add_mconfig) MCFG_CPU_ADD(KM035_CPU_TAG, I8035, XTAL_4_608MHz) MCFG_CPU_PROGRAM_MAP(km035_map) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(km035_device, bus_w)) diff --git a/src/mame/machine/lisa.cpp b/src/mame/machine/lisa.cpp index a7da401a0a8..4c58e4b53b5 100644 --- a/src/mame/machine/lisa.cpp +++ b/src/mame/machine/lisa.cpp @@ -103,7 +103,7 @@ enum lisa_model_t { /*lisa1,*/ /* twiggy floppy drive */ lisa2, /* 3.5'' Sony floppy drive */ - lisa210, /* modified I/O board, and internal 10Meg drive */ + lisa_210, /* modified I/O board, and internal 10Meg drive */ mac_xl /* same as above with modified video */ }; @@ -918,7 +918,7 @@ DRIVER_INIT_MEMBER(lisa_state,lisa210) { m_ram_ptr = memregion("maincpu")->base() + RAM_OFFSET; m_rom_ptr = memregion("maincpu")->base() + ROM_OFFSET; - m_model = lisa210; + m_model = lisa_210; m_features.has_fast_timers = 1; m_features.floppy_hardware = sony_lisa210; m_features.has_double_sided_floppy = 0; diff --git a/src/mame/machine/m1comm.cpp b/src/mame/machine/m1comm.cpp index 6a4b8be6361..308480148bf 100644 --- a/src/mame/machine/m1comm.cpp +++ b/src/mame/machine/m1comm.cpp @@ -97,7 +97,7 @@ DEFINE_DEVICE_TYPE(M1COMM, m1comm_device, "m1comm", "Model 1 Communication Board // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( m1comm_device::device_add_mconfig ) +MACHINE_CONFIG_START(m1comm_device::device_add_mconfig) MCFG_CPU_ADD(Z80_TAG, Z80, 8000000) /* 32 MHz / 4 */ MCFG_CPU_PROGRAM_MAP(m1comm_mem) MCFG_CPU_IO_MAP(m1comm_io) diff --git a/src/mame/machine/m20_8086.cpp b/src/mame/machine/m20_8086.cpp index 895f3e856e9..abd414b7065 100644 --- a/src/mame/machine/m20_8086.cpp +++ b/src/mame/machine/m20_8086.cpp @@ -55,7 +55,7 @@ static ADDRESS_MAP_START(i86_io, AS_IO, 16, m20_8086_device) AM_RANGE(0x7ffa, 0x7ffd) AM_WRITE(handshake_w) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( m20_8086_device::device_add_mconfig ) +MACHINE_CONFIG_START(m20_8086_device::device_add_mconfig) MCFG_CPU_ADD("8086", I8086, XTAL_24MHz/3) MCFG_CPU_PROGRAM_MAP(i86_prog) MCFG_CPU_IO_MAP(i86_io) diff --git a/src/mame/machine/m24_kbd.cpp b/src/mame/machine/m24_kbd.cpp index 4b094389133..c3a4f8c2147 100644 --- a/src/mame/machine/m24_kbd.cpp +++ b/src/mame/machine/m24_kbd.cpp @@ -16,7 +16,7 @@ const tiny_rom_entry *m24_keyboard_device::device_rom_region() const return ROM_NAME( m24_keyboard ); } -MACHINE_CONFIG_MEMBER( m24_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(m24_keyboard_device::device_add_mconfig) MCFG_CPU_ADD("mcu", I8049, XTAL_6MHz) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(m24_keyboard_device, bus_w)) MCFG_MCS48_PORT_P1_IN_CB(READ8(m24_keyboard_device, p1_r)) diff --git a/src/mame/machine/m24_z8000.cpp b/src/mame/machine/m24_z8000.cpp index 50a38b480ed..92477f5c5e1 100644 --- a/src/mame/machine/m24_z8000.cpp +++ b/src/mame/machine/m24_z8000.cpp @@ -63,7 +63,7 @@ static ADDRESS_MAP_START(z8000_io, AS_IO, 16, m24_z8000_device) AM_RANGE(0x8000, 0x83ff) AM_READWRITE(i86_io_r, i86_io_w) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( m24_z8000_device::device_add_mconfig ) +MACHINE_CONFIG_START(m24_z8000_device::device_add_mconfig) MCFG_CPU_ADD("z8000", Z8001, XTAL_8MHz/2) MCFG_CPU_PROGRAM_MAP(z8000_prog) MCFG_CPU_DATA_MAP(z8000_data) diff --git a/src/mame/machine/m2comm.cpp b/src/mame/machine/m2comm.cpp index 4aa8f877265..f7bd43a6efd 100644 --- a/src/mame/machine/m2comm.cpp +++ b/src/mame/machine/m2comm.cpp @@ -182,7 +182,7 @@ DEFINE_DEVICE_TYPE(M2COMM, m2comm_device, "m2comm", "Model 2 Communication Board // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( m2comm_device::device_add_mconfig ) +MACHINE_CONFIG_START(m2comm_device::device_add_mconfig) MACHINE_CONFIG_END //************************************************************************** diff --git a/src/mame/machine/m3comm.cpp b/src/mame/machine/m3comm.cpp index 929d13f5b19..4b4dc1f082e 100644 --- a/src/mame/machine/m3comm.cpp +++ b/src/mame/machine/m3comm.cpp @@ -116,7 +116,7 @@ DEFINE_DEVICE_TYPE(M3COMM, m3comm_device, "m3comm", "Model 3 Communication Board // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( m3comm_device::device_add_mconfig ) +MACHINE_CONFIG_START(m3comm_device::device_add_mconfig) MCFG_CPU_ADD(M68K_TAG, M68000, 10000000) // random MCFG_CPU_PROGRAM_MAP(m3comm_mem) diff --git a/src/mame/machine/mackbd.cpp b/src/mame/machine/mackbd.cpp index c7aa2329174..205bedbb26e 100644 --- a/src/mame/machine/mackbd.cpp +++ b/src/mame/machine/mackbd.cpp @@ -172,7 +172,7 @@ INPUT_PORTS_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( mackbd_device::device_add_mconfig ) +MACHINE_CONFIG_START(mackbd_device::device_add_mconfig) MCFG_CPU_ADD(MACKBD_CPU_TAG, I8021, 3000000) // "the approximate clock rate of the MPU is 3 MHz" MCFG_CPU_PROGRAM_MAP(mackbd_map) MCFG_CPU_IO_MAP(mackbd_io_map) diff --git a/src/mame/machine/mega32x.cpp b/src/mame/machine/mega32x.cpp index 86ef2481d8a..cd435c77961 100644 --- a/src/mame/machine/mega32x.cpp +++ b/src/mame/machine/mega32x.cpp @@ -1772,7 +1772,7 @@ const rom_entry *sega_32x_device::device_rom_region() const #define _32X_INTERLEAVE_LEVEL \ MCFG_QUANTUM_TIME(attotime::from_hz(1800000)) -MACHINE_CONFIG_MEMBER( sega_32x_ntsc_device::device_add_mconfig ) +MACHINE_CONFIG_START(sega_32x_ntsc_device::device_add_mconfig) #ifndef _32X_SWAP_MASTER_SLAVE_HACK MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 ) @@ -1802,7 +1802,7 @@ MACHINE_CONFIG_MEMBER( sega_32x_ntsc_device::device_add_mconfig ) _32X_INTERLEAVE_LEVEL MACHINE_CONFIG_END -MACHINE_CONFIG_MEMBER( sega_32x_pal_device::device_add_mconfig ) +MACHINE_CONFIG_START(sega_32x_pal_device::device_add_mconfig) #ifndef _32X_SWAP_MASTER_SLAVE_HACK MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 ) diff --git a/src/mame/machine/megacd.cpp b/src/mame/machine/megacd.cpp index ce33cc71a3d..a0fe8c3411d 100644 --- a/src/mame/machine/megacd.cpp +++ b/src/mame/machine/megacd.cpp @@ -285,7 +285,7 @@ static GFXDECODE_START( segacd ) GFXDECODE_END -MACHINE_CONFIG_MEMBER( sega_segacd_device::device_add_mconfig ) +MACHINE_CONFIG_START(sega_segacd_device::device_add_mconfig) MCFG_CPU_ADD("segacd_68k", M68000, SEGACD_CLOCK ) /* 12.5 MHz */ MCFG_CPU_PROGRAM_MAP(segacd_map) diff --git a/src/mame/machine/megacdcd.cpp b/src/mame/machine/megacdcd.cpp index ea4fb87b08f..24b410a1ff3 100644 --- a/src/mame/machine/megacdcd.cpp +++ b/src/mame/machine/megacdcd.cpp @@ -1184,7 +1184,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( lc89510_temp_device::segacd_access_timer_callback } -MACHINE_CONFIG_MEMBER( lc89510_temp_device::device_add_mconfig ) +MACHINE_CONFIG_START(lc89510_temp_device::device_add_mconfig) MCFG_TIMER_DRIVER_ADD_PERIODIC("hock_timer", lc89510_temp_device, segacd_access_timer_callback, attotime::from_hz(75)) MCFG_SOUND_ADD( "cdda", CDDA, 0 ) diff --git a/src/mame/machine/megadriv.cpp b/src/mame/machine/megadriv.cpp index 3a44ee78f81..8172a000d33 100644 --- a/src/mame/machine/megadriv.cpp +++ b/src/mame/machine/megadriv.cpp @@ -28,8 +28,6 @@ Known Non-Issues (confirmed on Real Genesis) #include "speaker.h" -MACHINE_CONFIG_EXTERN( megadriv ); - void md_base_state::megadriv_z80_bank_w(uint16_t data) { m_genz80.z80_bank_addr = ((m_genz80.z80_bank_addr >> 1) | (data << 23)) & 0xff8000; @@ -875,12 +873,12 @@ IRQ_CALLBACK_MEMBER(md_base_state::genesis_int_callback) return (0x60+irqline*4)/4; // vector address } -MACHINE_CONFIG_START( megadriv_timers ) +MACHINE_CONFIG_START(md_base_state::megadriv_timers) MCFG_TIMER_DEVICE_ADD("md_scan_timer", "gen_vdp", sega315_5313_device, megadriv_scanline_timer_callback) MACHINE_CONFIG_END -MACHINE_CONFIG_START( md_ntsc ) +MACHINE_CONFIG_START(md_base_state::md_ntsc) MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_NTSC / 7) /* 7.67 MHz */ MCFG_CPU_PROGRAM_MAP(megadriv_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback) @@ -927,7 +925,7 @@ MACHINE_CONFIG_START( md_ntsc ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */ MACHINE_CONFIG_END -MACHINE_CONFIG_START( dcat16_megadriv_base ) +MACHINE_CONFIG_START(md_cons_state::dcat16_megadriv_base) MCFG_FRAGMENT_ADD( md_ntsc ) MCFG_CPU_MODIFY("maincpu") @@ -937,7 +935,7 @@ MACHINE_CONFIG_END /************ PAL hardware has a different master clock *************/ -MACHINE_CONFIG_START( md_pal ) +MACHINE_CONFIG_START(md_base_state::md_pal) MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_PAL / 7) /* 7.67 MHz */ MCFG_CPU_PROGRAM_MAP(megadriv_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback) diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp index 46ba0ff9492..8829097b3ac 100644 --- a/src/mame/machine/midwayic.cpp +++ b/src/mame/machine/midwayic.cpp @@ -249,7 +249,7 @@ WRITE8_MEMBER(midway_serial_pic_emu_device::write_c) // printf("%s: write_c %02x\n", machine().describe_context(), data); } -MACHINE_CONFIG_MEMBER( midway_serial_pic_emu_device::device_add_mconfig ) +MACHINE_CONFIG_START(midway_serial_pic_emu_device::device_add_mconfig) MCFG_CPU_ADD("pic", PIC16C57, 12000000) /* ? Mhz */ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(midway_serial_pic_emu_device, write_a)) MCFG_PIC16C5x_READ_B_CB(READ8(midway_serial_pic_emu_device, read_b)) diff --git a/src/mame/machine/mie.cpp b/src/mame/machine/mie.cpp index 379865bf827..850a53ad574 100644 --- a/src/mame/machine/mie.cpp +++ b/src/mame/machine/mie.cpp @@ -75,7 +75,7 @@ const tiny_rom_entry *mie_device::device_rom_region() const return ROM_NAME(mie); } -MACHINE_CONFIG_MEMBER( mie_device::device_add_mconfig ) +MACHINE_CONFIG_START(mie_device::device_add_mconfig) MCFG_CPU_ADD("mie", Z80, DERIVED_CLOCK(1,1)) MCFG_CPU_PROGRAM_MAP(mie_map) MCFG_CPU_IO_MAP(mie_port) diff --git a/src/mame/machine/mm1kb.cpp b/src/mame/machine/mm1kb.cpp index 56b6cb9813f..bb2663e070b 100644 --- a/src/mame/machine/mm1kb.cpp +++ b/src/mame/machine/mm1kb.cpp @@ -57,7 +57,7 @@ bool mm1_keyboard_device::first_time = true; // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( mm1_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(mm1_keyboard_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("keyboard_and_chassis_sounds", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(2) diff --git a/src/mame/machine/mmboard.cpp b/src/mame/machine/mmboard.cpp index ba4ed5801c3..b29e3ccfd09 100644 --- a/src/mame/machine/mmboard.cpp +++ b/src/mame/machine/mmboard.cpp @@ -318,7 +318,7 @@ mephisto_display_modul_device::mephisto_display_modul_device(const machine_confi // device_add_mconfig //------------------------------------------------- -MACHINE_CONFIG_MEMBER( mephisto_display_modul_device::device_add_mconfig ) +MACHINE_CONFIG_START(mephisto_display_modul_device::device_add_mconfig) /* video hardware */ MCFG_SCREEN_ADD("screen", LCD) MCFG_SCREEN_REFRESH_RATE(50) diff --git a/src/mame/machine/mpu4.cpp b/src/mame/machine/mpu4.cpp index 54bc2641605..1fc93577b78 100644 --- a/src/mame/machine/mpu4.cpp +++ b/src/mame/machine/mpu4.cpp @@ -2661,7 +2661,7 @@ ADDRESS_MAP_END MCFG_STEPPER_INDEX_PATTERN(0x00)\ MCFG_STEPPER_INIT_PHASE(2) -MACHINE_CONFIG_START( mpu4_std_3reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_std_3reel) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2670,7 +2670,7 @@ MACHINE_CONFIG_START( mpu4_std_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type2_3reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type2_3reel) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2679,7 +2679,7 @@ MACHINE_CONFIG_START( mpu4_type2_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type3_3reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type3_3reel) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2688,7 +2688,7 @@ MACHINE_CONFIG_START( mpu4_type3_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type4_3reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type4_3reel) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2697,7 +2697,7 @@ MACHINE_CONFIG_START( mpu4_type4_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_bwb_3reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_3reel) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2706,7 +2706,7 @@ MACHINE_CONFIG_START( mpu4_bwb_3reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel2_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_std_4reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_std_4reel) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2717,7 +2717,7 @@ MACHINE_CONFIG_START( mpu4_std_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type2_4reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type2_4reel) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2728,7 +2728,7 @@ MACHINE_CONFIG_START( mpu4_type2_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type3_4reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type3_4reel) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2739,7 +2739,7 @@ MACHINE_CONFIG_START( mpu4_type3_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type4_4reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type4_4reel) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2750,7 +2750,7 @@ MACHINE_CONFIG_START( mpu4_type4_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_bwb_4reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_4reel) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2761,7 +2761,7 @@ MACHINE_CONFIG_START( mpu4_bwb_4reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel3_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_std_5reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_std_5reel) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2774,7 +2774,7 @@ MACHINE_CONFIG_START( mpu4_std_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type2_5reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type2_5reel) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2787,7 +2787,7 @@ MACHINE_CONFIG_START( mpu4_type2_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type3_5reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type3_5reel) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2800,7 +2800,7 @@ MACHINE_CONFIG_START( mpu4_type3_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type4_5reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type4_5reel) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2813,7 +2813,7 @@ MACHINE_CONFIG_START( mpu4_type4_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_bwb_5reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_5reel) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2826,7 +2826,7 @@ MACHINE_CONFIG_START( mpu4_bwb_5reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_std_6reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_std_6reel) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2841,7 +2841,7 @@ MACHINE_CONFIG_START( mpu4_std_6reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel4_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type2_6reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type2_6reel) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2856,7 +2856,7 @@ MACHINE_CONFIG_START( mpu4_type2_6reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel5_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type3_6reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type3_6reel) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2871,7 +2871,7 @@ MACHINE_CONFIG_START( mpu4_type3_6reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel5_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type4_6reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type4_6reel) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2886,7 +2886,7 @@ MACHINE_CONFIG_START( mpu4_type4_6reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel5_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_bwb_6reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_6reel) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2902,7 +2902,7 @@ MACHINE_CONFIG_START( mpu4_bwb_6reel ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_std_7reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_std_7reel) MCFG_MPU4_STD_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_STD_REEL_ADD("reel1") @@ -2921,7 +2921,7 @@ MACHINE_CONFIG_START( mpu4_std_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type2_7reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type2_7reel) MCFG_MPU4_TYPE2_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE2_REEL_ADD("reel1") @@ -2940,7 +2940,7 @@ MACHINE_CONFIG_START( mpu4_type2_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type3_7reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type3_7reel) MCFG_MPU4_TYPE3_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE3_REEL_ADD("reel1") @@ -2959,7 +2959,7 @@ MACHINE_CONFIG_START( mpu4_type3_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_type4_7reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_type4_7reel) MCFG_MPU4_TYPE4_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_TYPE4_REEL_ADD("reel1") @@ -2978,7 +2978,7 @@ MACHINE_CONFIG_START( mpu4_type4_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_bwb_7reel ) +MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_7reel) MCFG_MPU4_BWB_REEL_ADD("reel0") MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel0_optic_cb)) MCFG_MPU4_BWB_REEL_ADD("reel1") @@ -2997,7 +2997,7 @@ MACHINE_CONFIG_START( mpu4_bwb_7reel ) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel7_optic_cb)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_common ) +MACHINE_CONFIG_START(mpu4_state::mpu4_common) MCFG_TIMER_DRIVER_ADD_PERIODIC("50hz", mpu4_state, gen_50hz, attotime::from_hz(100)) MCFG_MSC1937_ADD("vfd",0) @@ -3066,7 +3066,7 @@ MACHINE_CONFIG_START( mpu4_common ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( mpu4_common2 ) +MACHINE_CONFIG_START(mpu4_state::mpu4_common2) MCFG_DEVICE_ADD("ptm_ic3ss", PTM6840, MPU4_MASTER_CLOCK / 4) MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0) MCFG_PTM6840_OUT0_CB(DEVWRITELINE("ptm_ic3ss", ptm6840_device, set_c2)) @@ -3083,7 +3083,7 @@ MACHINE_CONFIG_START( mpu4_common2 ) MACHINE_CONFIG_END /* machine driver for MOD 2 board */ -MACHINE_CONFIG_START( mpu4base ) +MACHINE_CONFIG_START(mpu4_state::mpu4base) MCFG_MACHINE_START_OVERRIDE(mpu4_state,mod2 ) MCFG_MACHINE_RESET_OVERRIDE(mpu4_state,mpu4) @@ -3100,7 +3100,7 @@ MACHINE_CONFIG_START( mpu4base ) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( mod2 , mpu4base ) +MACHINE_CONFIG_DERIVED(mpu4_state::mod2, mpu4base) MCFG_SOUND_ADD("ay8913", AY8913, MPU4_MASTER_CLOCK/4) MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) MCFG_AY8910_RES_LOADS(820, 0, 0) @@ -3109,7 +3109,7 @@ MACHINE_CONFIG_DERIVED( mod2 , mpu4base ) MCFG_FRAGMENT_ADD(mpu4_std_6reel) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( mod2_alt , mpu4base ) +MACHINE_CONFIG_DERIVED(mpu4_state::mod2_alt, mpu4base) MCFG_SOUND_ADD("ay8913", AY8913, MPU4_MASTER_CLOCK/4) MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) MCFG_AY8910_RES_LOADS(820, 0, 0) @@ -3120,7 +3120,7 @@ MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( mod4yam, mpu4base ) +MACHINE_CONFIG_DERIVED(mpu4_state::mod4yam, mpu4base) MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4yam) MCFG_FRAGMENT_ADD(mpu4_std_6reel) @@ -3130,7 +3130,7 @@ MACHINE_CONFIG_DERIVED( mod4yam, mpu4base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( mod4oki, mpu4base ) +MACHINE_CONFIG_DERIVED(mpu4_state::mod4oki, mpu4base) MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4oki) MCFG_FRAGMENT_ADD(mpu4_common2) @@ -3141,7 +3141,7 @@ MACHINE_CONFIG_DERIVED( mod4oki, mpu4base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( mod4oki_alt, mpu4base ) +MACHINE_CONFIG_DERIVED(mpu4_state::mod4oki_alt, mpu4base) MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4oki) MCFG_FRAGMENT_ADD(mpu4_common2) @@ -3152,7 +3152,7 @@ MACHINE_CONFIG_DERIVED( mod4oki_alt, mpu4base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( mod4oki_5r, mpu4base ) +MACHINE_CONFIG_DERIVED(mpu4_state::mod4oki_5r, mpu4base) MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4oki) MCFG_FRAGMENT_ADD(mpu4_common2) @@ -3163,7 +3163,7 @@ MACHINE_CONFIG_DERIVED( mod4oki_5r, mpu4base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( bwboki, mpu4base ) +MACHINE_CONFIG_DERIVED(mpu4_state::bwboki, mpu4base) MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4bwb) MCFG_FRAGMENT_ADD(mpu4_common2) MCFG_FRAGMENT_ADD(mpu4_bwb_5reel) @@ -3173,7 +3173,7 @@ MACHINE_CONFIG_DERIVED( bwboki, mpu4base ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(mpu4crys, mod2 ) +MACHINE_CONFIG_DERIVED(mpu4_state::mpu4crys, mod2) MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4cry) MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK) diff --git a/src/mame/machine/ms7004.cpp b/src/mame/machine/ms7004.cpp index 2404e290e82..dd7aeb70168 100644 --- a/src/mame/machine/ms7004.cpp +++ b/src/mame/machine/ms7004.cpp @@ -56,7 +56,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( ms7004_device::device_add_mconfig ) +MACHINE_CONFIG_START(ms7004_device::device_add_mconfig) MCFG_CPU_ADD(MS7004_CPU_TAG, I8035, XTAL_4_608MHz) MCFG_CPU_PROGRAM_MAP(ms7004_map) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(ms7004_device, p1_w)) diff --git a/src/mame/machine/namco50.cpp b/src/mame/machine/namco50.cpp index 7aa4b49a0cc..0490ef47308 100644 --- a/src/mame/machine/namco50.cpp +++ b/src/mame/machine/namco50.cpp @@ -250,7 +250,7 @@ void namco_50xx_device::device_start() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( namco_50xx_device::device_add_mconfig ) +MACHINE_CONFIG_START(namco_50xx_device::device_add_mconfig) MCFG_CPU_ADD("mcu", MB8842, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_MB88XX_READ_K_CB(READ8(namco_50xx_device, K_r)) MCFG_MB88XX_WRITE_O_CB(WRITE8(namco_50xx_device, O_w)) diff --git a/src/mame/machine/namco51.cpp b/src/mame/machine/namco51.cpp index 76c34a5a76b..30c6d69755b 100644 --- a/src/mame/machine/namco51.cpp +++ b/src/mame/machine/namco51.cpp @@ -388,7 +388,7 @@ void namco_51xx_device::device_reset() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( namco_51xx_device::device_add_mconfig ) +MACHINE_CONFIG_START(namco_51xx_device::device_add_mconfig) MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ // MCFG_MB88XX_READ_K_CB(READ8(namco_51xx_device, namco_51xx_K_r)) // MCFG_MB88XX_WRITE_O_CB(WRITE8(namco_51xx_device, namco_51xx_O_w)) diff --git a/src/mame/machine/namco53.cpp b/src/mame/machine/namco53.cpp index d730d408483..8ae59a45cef 100644 --- a/src/mame/machine/namco53.cpp +++ b/src/mame/machine/namco53.cpp @@ -168,7 +168,7 @@ void namco_53xx_device::device_start() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( namco_53xx_device::device_add_mconfig ) +MACHINE_CONFIG_START(namco_53xx_device::device_add_mconfig) MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */ MCFG_MB88XX_READ_K_CB(READ8(namco_53xx_device, K_r)) MCFG_MB88XX_WRITE_O_CB(WRITE8(namco_53xx_device, O_w)) diff --git a/src/mame/machine/namco62.cpp b/src/mame/machine/namco62.cpp index d44d7c5c6b0..f63eac5db2d 100644 --- a/src/mame/machine/namco62.cpp +++ b/src/mame/machine/namco62.cpp @@ -57,7 +57,7 @@ void namco_62xx_device::device_start() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( namco_62xx_device::device_add_mconfig ) +MACHINE_CONFIG_START(namco_62xx_device::device_add_mconfig) MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 (TODO: Correct?) */ // MCFG_MB88XX_READ_K_CB(READ8(namco_62xx_device, namco_62xx_K_r)) // MCFG_MB88XX_WRITE_O_CB(WRITE8(namco_62xx_device, namco_62xx_O_w)) diff --git a/src/mame/machine/naomim2.cpp b/src/mame/machine/naomim2.cpp index aaaa089135b..16123db826f 100644 --- a/src/mame/machine/naomim2.cpp +++ b/src/mame/machine/naomim2.cpp @@ -200,7 +200,7 @@ uint16_t naomi_m2_board::read_callback(uint32_t addr) } } -MACHINE_CONFIG_MEMBER( naomi_m2_board::device_add_mconfig ) +MACHINE_CONFIG_START(naomi_m2_board::device_add_mconfig) MCFG_DEVICE_ADD("segam2crypt", SEGA315_5881_CRYPT, 0) MCFG_SET_READ_CALLBACK(naomi_m2_board, read_callback) MACHINE_CONFIG_END diff --git a/src/mame/machine/nmk004.cpp b/src/mame/machine/nmk004.cpp index a12d5bce263..d3557129cdc 100644 --- a/src/mame/machine/nmk004.cpp +++ b/src/mame/machine/nmk004.cpp @@ -109,7 +109,7 @@ void nmk004_device::device_start() //------------------------------------------------- // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( nmk004_device::device_add_mconfig ) +MACHINE_CONFIG_START(nmk004_device::device_add_mconfig) MCFG_CPU_ADD("mcu",TMP90840, DERIVED_CLOCK(1,1)) // Toshiba TMP90C840AF in QFP64 package with 8Kbyte internal ROM MCFG_CPU_PROGRAM_MAP(nmk004_sound_mem_map) MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(nmk004_device, nmk004_port4_w)) diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp index a86f241e8d3..bff7f8f22e3 100644 --- a/src/mame/machine/pc1512kb.cpp +++ b/src/mame/machine/pc1512kb.cpp @@ -50,7 +50,7 @@ const tiny_rom_entry *pc1512_keyboard_device::device_rom_region() const // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( pc1512_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(pc1512_keyboard_device::device_add_mconfig) MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_6MHz) MCFG_MCS48_PORT_BUS_IN_CB(READ8(pc1512_keyboard_device, kb_bus_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(pc1512_keyboard_device, kb_p1_w)) diff --git a/src/mame/machine/pcd_kbd.cpp b/src/mame/machine/pcd_kbd.cpp index a4b9bd4689b..bc5024ed511 100644 --- a/src/mame/machine/pcd_kbd.cpp +++ b/src/mame/machine/pcd_kbd.cpp @@ -26,7 +26,7 @@ static ADDRESS_MAP_START( pcd_keyboard_map, AS_PROGRAM, 8, pcd_keyboard_device ) AM_RANGE(0x000, 0xfff) AM_ROM ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( pcd_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(pcd_keyboard_device::device_add_mconfig) MCFG_CPU_ADD("mcu", I8035, 5760000*2) // FIXME: the mc2661 baud rate calculation MCFG_CPU_PROGRAM_MAP(pcd_keyboard_map) MCFG_MCS48_PORT_BUS_IN_CB(READ8(pcd_keyboard_device, bus_r)) diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp index 2d6f84b6d33..561ca96c286 100644 --- a/src/mame/machine/pce_cd.cpp +++ b/src/mame/machine/pce_cd.cpp @@ -241,7 +241,7 @@ void pce_cd_device::nvram_init(nvram_device &nvram, void *data, size_t size) } // TODO: left and right speaker tags should be passed from the parent config, instead of using the hard-coded ones below!?! - MACHINE_CONFIG_MEMBER( pce_cd_device::device_add_mconfig ) + MACHINE_CONFIG_START(pce_cd_device::device_add_mconfig) MCFG_NVRAM_ADD_CUSTOM_DRIVER("bram", pce_cd_device, nvram_init) MCFG_CDROM_ADD("cdrom") diff --git a/src/mame/machine/pcshare.cpp b/src/mame/machine/pcshare.cpp index 8f7e34f4d8e..a2a72f64f3d 100644 --- a/src/mame/machine/pcshare.cpp +++ b/src/mame/machine/pcshare.cpp @@ -16,6 +16,10 @@ #include "emu.h" #include "machine/pcshare.h" #include "cpu/i86/i286.h" +#include "bus/isa/trident.h" +#include "video/pc_vga.h" +#include "video/clgd542x.h" +#include "screen.h" /****************** DMA8237 Controller @@ -135,7 +139,54 @@ ADDRESS_MAP_START( pcat32_io_common, AS_IO, 32, pcat_base_state ) AM_RANGE(0x00c0, 0x00df) AM_DEVREADWRITE8("dma8237_2", am9517a_device, read, write, 0x00ff00ff) ADDRESS_MAP_END -MACHINE_CONFIG_START(pcat_common) + +MACHINE_CONFIG_START(pcat_base_state::pcvideo_vga) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update) + + MCFG_PALETTE_ADD("palette", 0x100) + MCFG_DEVICE_ADD("vga", VGA, 0) +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(pcat_base_state::pcvideo_trident_vga) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_UPDATE_DEVICE("vga", trident_vga_device, screen_update) + + MCFG_PALETTE_ADD("palette", 0x100) + MCFG_DEVICE_ADD("vga", TRIDENT_VGA, 0) +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(pcat_base_state::pcvideo_s3_vga) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_UPDATE_DEVICE("vga", s3_vga_device, screen_update) + + MCFG_PALETTE_ADD("palette", 0x100) + MCFG_DEVICE_ADD("vga", S3_VGA, 0) +MACHINE_CONFIG_END + + +MACHINE_CONFIG_START(pcat_base_state::pcvideo_cirrus_gd5428) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update) + + MCFG_PALETTE_ADD("palette", 0x100) + MCFG_DEVICE_ADD("vga", CIRRUS_GD5428, 0) +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(pcat_base_state::pcvideo_cirrus_gd5430) + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480) + MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5430_device, screen_update) + + MCFG_PALETTE_ADD("palette", 0x100) + MCFG_DEVICE_ADD("vga", CIRRUS_GD5430, 0) +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(pcat_base_state::pcat_common) MCFG_DEVICE_ADD("pic8259_1", PIC8259, 0) MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0)) MCFG_PIC8259_IN_SP_CB(VCC) diff --git a/src/mame/machine/pcshare.h b/src/mame/machine/pcshare.h index d8f6a11a3e3..b0b9e4c42f2 100644 --- a/src/mame/machine/pcshare.h +++ b/src/mame/machine/pcshare.h @@ -47,7 +47,13 @@ public: uint8_t m_dma_offset[2][4]; uint8_t m_at_pages[0x10]; int m_pit_out2; + void pcat_common(machine_config &config); + void pcvideo_vga(machine_config &config); + void pcvideo_trident_vga(machine_config &config); + void pcvideo_s3_vga(machine_config &config); + void pcvideo_cirrus_gd5428(machine_config &config); + void pcvideo_cirrus_gd5430(machine_config &config); + }; ADDRESS_MAP_EXTERN(pcat32_io_common, 32); -MACHINE_CONFIG_EXTERN(pcat_common); diff --git a/src/mame/machine/pgmprot_igs025_igs012.cpp b/src/mame/machine/pgmprot_igs025_igs012.cpp index fa965163b1b..4238f1bd11d 100644 --- a/src/mame/machine/pgmprot_igs025_igs012.cpp +++ b/src/mame/machine/pgmprot_igs025_igs012.cpp @@ -132,7 +132,7 @@ static ADDRESS_MAP_START( drgw2_mem, AS_PROGRAM, 16, pgm_012_025_state ) AM_RANGE(0xd00000, 0xd00fff) AM_NOP // Written, but never read back? Related to the protection device? - IGS012? ADDRESS_MAP_END -MACHINE_CONFIG_START( pgm_012_025_drgw2 ) +MACHINE_CONFIG_START(pgm_012_025_state::pgm_012_025_drgw2) MCFG_FRAGMENT_ADD(pgmbase) MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/machine/pgmprot_igs025_igs012.h b/src/mame/machine/pgmprot_igs025_igs012.h index 1a100809356..ff87c8660f7 100644 --- a/src/mame/machine/pgmprot_igs025_igs012.h +++ b/src/mame/machine/pgmprot_igs025_igs012.h @@ -23,6 +23,5 @@ public: DECLARE_DRIVER_INIT(drgw2hk); DECLARE_MACHINE_RESET(drgw2); + void pgm_012_025_drgw2(machine_config &config); }; - -MACHINE_CONFIG_EXTERN( pgm_012_025_drgw2 ); diff --git a/src/mame/machine/pgmprot_igs025_igs022.cpp b/src/mame/machine/pgmprot_igs025_igs022.cpp index fad7d6a4c0e..fa6ccedb8f6 100644 --- a/src/mame/machine/pgmprot_igs025_igs022.cpp +++ b/src/mame/machine/pgmprot_igs025_igs022.cpp @@ -374,7 +374,7 @@ static ADDRESS_MAP_START( killbld_mem, AS_PROGRAM, 16, pgm_022_025_state ) ADDRESS_MAP_END -MACHINE_CONFIG_START( pgm_022_025 ) +MACHINE_CONFIG_START(pgm_022_025_state::pgm_022_025) MCFG_FRAGMENT_ADD(pgmbase) MCFG_CPU_MODIFY("maincpu") @@ -387,11 +387,11 @@ MACHINE_CONFIG_START( pgm_022_025 ) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(pgm_022_025_dw3, pgm_022_025) +MACHINE_CONFIG_DERIVED(pgm_022_025_state::pgm_022_025_dw3, pgm_022_025) MCFG_MACHINE_RESET_OVERRIDE(pgm_022_025_state, dw3) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(pgm_022_025_killbld, pgm_022_025) +MACHINE_CONFIG_DERIVED(pgm_022_025_state::pgm_022_025_killbld, pgm_022_025) MCFG_MACHINE_RESET_OVERRIDE(pgm_022_025_state, killbld) MACHINE_CONFIG_END diff --git a/src/mame/machine/pgmprot_igs025_igs022.h b/src/mame/machine/pgmprot_igs025_igs022.h index 09540446c19..018734984af 100644 --- a/src/mame/machine/pgmprot_igs025_igs022.h +++ b/src/mame/machine/pgmprot_igs025_igs022.h @@ -26,11 +26,11 @@ public: required_device m_igs025; required_device m_igs022; + void pgm_022_025(machine_config &config); + void pgm_022_025_dw3(machine_config &config); + void pgm_022_025_killbld(machine_config &config); }; -MACHINE_CONFIG_EXTERN(pgm_022_025_dw3); -MACHINE_CONFIG_EXTERN(pgm_022_025_killbld); - INPUT_PORTS_EXTERN( killbld ); INPUT_PORTS_EXTERN( dw3 ); INPUT_PORTS_EXTERN( dw3j ); diff --git a/src/mame/machine/pgmprot_igs025_igs028.cpp b/src/mame/machine/pgmprot_igs025_igs028.cpp index 1f679289299..a6abd6fd8f5 100644 --- a/src/mame/machine/pgmprot_igs025_igs028.cpp +++ b/src/mame/machine/pgmprot_igs025_igs028.cpp @@ -185,7 +185,7 @@ void pgm_028_025_state::igs025_to_igs028_callback( void ) } -MACHINE_CONFIG_START( pgm_028_025_ol ) +MACHINE_CONFIG_START(pgm_028_025_state::pgm_028_025_ol) MCFG_FRAGMENT_ADD(pgmbase) MCFG_CPU_MODIFY("maincpu") diff --git a/src/mame/machine/pgmprot_igs025_igs028.h b/src/mame/machine/pgmprot_igs025_igs028.h index 3e7ce244517..d0ff024cb5f 100644 --- a/src/mame/machine/pgmprot_igs025_igs028.h +++ b/src/mame/machine/pgmprot_igs025_igs028.h @@ -21,7 +21,7 @@ public: DECLARE_DRIVER_INIT(olds); DECLARE_MACHINE_RESET(olds); + void pgm_028_025_ol(machine_config &config); }; -MACHINE_CONFIG_EXTERN( pgm_028_025_ol ); INPUT_PORTS_EXTERN( olds ); diff --git a/src/mame/machine/pgmprot_igs027a_type1.cpp b/src/mame/machine/pgmprot_igs027a_type1.cpp index b7d2f9163c7..37edcd4136b 100644 --- a/src/mame/machine/pgmprot_igs027a_type1.cpp +++ b/src/mame/machine/pgmprot_igs027a_type1.cpp @@ -211,7 +211,7 @@ MACHINE_START_MEMBER(pgm_arm_type1_state,pgm_arm_type1) save_item(NAME(m_slots)); } -MACHINE_CONFIG_START( pgm_arm_type1_cave ) +MACHINE_CONFIG_START(pgm_arm_type1_state::pgm_arm_type1_cave) MCFG_FRAGMENT_ADD(pgmbase) MCFG_CPU_MODIFY("maincpu") @@ -223,7 +223,7 @@ MACHINE_CONFIG_START( pgm_arm_type1_cave ) MCFG_SCREEN_REFRESH_RATE(59.17) // verified on pcb MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( pgm_arm_type1_sim, pgm_arm_type1_cave ) +MACHINE_CONFIG_DERIVED(pgm_arm_type1_state::pgm_arm_type1_sim, pgm_arm_type1_cave) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(kov_sim_map) @@ -233,7 +233,7 @@ MACHINE_CONFIG_DERIVED( pgm_arm_type1_sim, pgm_arm_type1_cave ) MCFG_DEVICE_DISABLE() MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( pgm_arm_type1, pgm_arm_type1_cave ) +MACHINE_CONFIG_DERIVED(pgm_arm_type1_state::pgm_arm_type1, pgm_arm_type1_cave) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(kov_map) diff --git a/src/mame/machine/pgmprot_igs027a_type1.h b/src/mame/machine/pgmprot_igs027a_type1.h index 91dcf4ca761..3d6069e141a 100644 --- a/src/mame/machine/pgmprot_igs027a_type1.h +++ b/src/mame/machine/pgmprot_igs027a_type1.h @@ -126,12 +126,11 @@ public: int puzzli2_take_leveldata_value(uint8_t datvalue); + void pgm_arm_type1_sim(machine_config &config); + void pgm_arm_type1_cave(machine_config &config); + void pgm_arm_type1(machine_config &config); }; -MACHINE_CONFIG_EXTERN( pgm_arm_type1 ); -MACHINE_CONFIG_EXTERN( pgm_arm_type1_sim ); -MACHINE_CONFIG_EXTERN( pgm_arm_type1_cave ); - INPUT_PORTS_EXTERN( sango ); INPUT_PORTS_EXTERN( sango_ch ); INPUT_PORTS_EXTERN( photoy2k ); diff --git a/src/mame/machine/pgmprot_igs027a_type2.cpp b/src/mame/machine/pgmprot_igs027a_type2.cpp index b172cf07eaa..222444bff8e 100644 --- a/src/mame/machine/pgmprot_igs027a_type2.cpp +++ b/src/mame/machine/pgmprot_igs027a_type2.cpp @@ -130,7 +130,7 @@ MACHINE_START_MEMBER(pgm_arm_type2_state,pgm_arm_type2) /******* ARM 55857F *******/ -MACHINE_CONFIG_START( pgm_arm_type2 ) +MACHINE_CONFIG_START(pgm_arm_type2_state::pgm_arm_type2) MCFG_FRAGMENT_ADD(pgmbase) MCFG_MACHINE_START_OVERRIDE(pgm_arm_type2_state, pgm_arm_type2 ) diff --git a/src/mame/machine/pgmprot_igs027a_type2.h b/src/mame/machine/pgmprot_igs027a_type2.h index 0985b9f495a..b1679790d92 100644 --- a/src/mame/machine/pgmprot_igs027a_type2.h +++ b/src/mame/machine/pgmprot_igs027a_type2.h @@ -40,11 +40,9 @@ public: DECLARE_WRITE32_MEMBER( kov2p_arm_region_w ); DECLARE_READ32_MEMBER( ddp2_speedup_r ); DECLARE_READ16_MEMBER( ddp2_main_speedup_r ); + void pgm_arm_type2(machine_config &config); }; -/* emulations */ -MACHINE_CONFIG_EXTERN( pgm_arm_type2 ); - /* simulations (or missing) */ INPUT_PORTS_EXTERN( ddp2 ); INPUT_PORTS_EXTERN( kov2 ); diff --git a/src/mame/machine/pgmprot_igs027a_type3.cpp b/src/mame/machine/pgmprot_igs027a_type3.cpp index 8a63b8fcfda..70681d25856 100644 --- a/src/mame/machine/pgmprot_igs027a_type3.cpp +++ b/src/mame/machine/pgmprot_igs027a_type3.cpp @@ -188,7 +188,7 @@ MACHINE_START_MEMBER(pgm_arm_type3_state,pgm_arm_type3) /******* ARM 55857G *******/ -MACHINE_CONFIG_START( pgm_arm_type3 ) +MACHINE_CONFIG_START(pgm_arm_type3_state::pgm_arm_type3) MCFG_FRAGMENT_ADD(pgmbase) MCFG_MACHINE_START_OVERRIDE(pgm_arm_type3_state, pgm_arm_type3 ) diff --git a/src/mame/machine/pgmprot_igs027a_type3.h b/src/mame/machine/pgmprot_igs027a_type3.h index 5cb3a6d647f..9b2594e6231 100644 --- a/src/mame/machine/pgmprot_igs027a_type3.h +++ b/src/mame/machine/pgmprot_igs027a_type3.h @@ -57,9 +57,9 @@ public: DECLARE_READ32_MEMBER( svg_speedup_r ); DECLARE_READ32_MEMBER( svgpcb_speedup_r ); DECLARE_MACHINE_RESET(pgm_arm_type3_reset); + void pgm_arm_type3(machine_config &config); }; -MACHINE_CONFIG_EXTERN( pgm_arm_type3 ); INPUT_PORTS_EXTERN(theglad); INPUT_PORTS_EXTERN(happy6); INPUT_PORTS_EXTERN(svg); diff --git a/src/mame/machine/pgmprot_orlegend.cpp b/src/mame/machine/pgmprot_orlegend.cpp index b412bea2689..740c33baa65 100644 --- a/src/mame/machine/pgmprot_orlegend.cpp +++ b/src/mame/machine/pgmprot_orlegend.cpp @@ -220,6 +220,6 @@ INPUT_PORTS_START( orlegendk ) INPUT_PORTS_END -MACHINE_CONFIG_START( pgm_asic3 ) +MACHINE_CONFIG_START(pgm_asic3_state::pgm_asic3) MCFG_FRAGMENT_ADD(pgmbase) MACHINE_CONFIG_END diff --git a/src/mame/machine/pgmprot_orlegend.h b/src/mame/machine/pgmprot_orlegend.h index 92d511343a6..f1a2271c54f 100644 --- a/src/mame/machine/pgmprot_orlegend.h +++ b/src/mame/machine/pgmprot_orlegend.h @@ -20,9 +20,9 @@ public: void asic3_compute_hold(int,int); DECLARE_READ16_MEMBER( pgm_asic3_r ); DECLARE_WRITE16_MEMBER( pgm_asic3_w ); + void pgm_asic3(machine_config &config); }; INPUT_PORTS_EXTERN( orlegend ); INPUT_PORTS_EXTERN( orlegendt ); INPUT_PORTS_EXTERN( orlegendk ); -MACHINE_CONFIG_EXTERN( pgm_asic3 ); diff --git a/src/mame/machine/rx01.cpp b/src/mame/machine/rx01.cpp index 7ce941a73bf..06f74f56b02 100644 --- a/src/mame/machine/rx01.cpp +++ b/src/mame/machine/rx01.cpp @@ -53,7 +53,7 @@ rx01_device::rx01_device(const machine_config &mconfig, const char *tag, device_ // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( rx01_device::device_add_mconfig ) +MACHINE_CONFIG_START(rx01_device::device_add_mconfig) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(rx01_floppy_interface) MACHINE_CONFIG_END diff --git a/src/mame/machine/s32comm.cpp b/src/mame/machine/s32comm.cpp index b8fb8df5151..5512c9f24ff 100644 --- a/src/mame/machine/s32comm.cpp +++ b/src/mame/machine/s32comm.cpp @@ -84,7 +84,7 @@ DEFINE_DEVICE_TYPE(S32COMM, s32comm_device, "s32comm", "System 32 Communication // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( s32comm_device::device_add_mconfig ) +MACHINE_CONFIG_START(s32comm_device::device_add_mconfig) MACHINE_CONFIG_END //************************************************************************** diff --git a/src/mame/machine/saturn_cdb.cpp b/src/mame/machine/saturn_cdb.cpp index a70af29624a..8155186578d 100644 --- a/src/mame/machine/saturn_cdb.cpp +++ b/src/mame/machine/saturn_cdb.cpp @@ -34,7 +34,7 @@ static ADDRESS_MAP_START( saturn_cdb_map, AS_PROGRAM, 32, saturn_cdb_device ) AM_RANGE(0x07000000, 0x07000fff) AM_RAM // unknown, internal RAM? ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( saturn_cdb_device::device_add_mconfig ) +MACHINE_CONFIG_START(saturn_cdb_device::device_add_mconfig) MCFG_CPU_ADD("cdbcpu", SH1, DERIVED_CLOCK(1, 1)) MCFG_CPU_PROGRAM_MAP(saturn_cdb_map) MCFG_DEVICE_DISABLE() // we're not actually using the CD Block ROM for now diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp index 967ecf09415..7dbd738e0ae 100644 --- a/src/mame/machine/st0016.cpp +++ b/src/mame/machine/st0016.cpp @@ -115,7 +115,7 @@ READ8_MEMBER(st0016_cpu_device::soundram_read) } /* CPU interface */ -MACHINE_CONFIG_MEMBER( st0016_cpu_device::device_add_mconfig ) +MACHINE_CONFIG_START(st0016_cpu_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_PALETTE_ADD("palette", 16*16*4+1) diff --git a/src/mame/machine/st0016.h b/src/mame/machine/st0016.h index 322734dc44d..20511c0b865 100644 --- a/src/mame/machine/st0016.h +++ b/src/mame/machine/st0016.h @@ -15,7 +15,7 @@ typedef device_delegate st0016_dma_offs_delegate; #define ST0016_DMA_OFFS_CB(name) uint8_t name(void) #define MCFG_ST0016_DMA_OFFS_CB(_class, _method) \ - st0016_cpu_device::set_dma_offs_callback(*device, st0016_dma_offs_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + st0016_cpu_device::set_dma_offs_callback(*device, st0016_dma_offs_delegate(&_class::_method, #_class "::" #_method, this)); class st0016_cpu_device : public z80_device, public device_gfx_interface diff --git a/src/mame/machine/taito68705interface.cpp b/src/mame/machine/taito68705interface.cpp index 8cbb2e65f5d..8c95feafead 100644 --- a/src/mame/machine/taito68705interface.cpp +++ b/src/mame/machine/taito68705interface.cpp @@ -189,7 +189,7 @@ taito68705_mcu_device::taito68705_mcu_device(const machine_config &mconfig, devi { } -MACHINE_CONFIG_MEMBER(taito68705_mcu_device::device_add_mconfig) +MACHINE_CONFIG_START(taito68705_mcu_device::device_add_mconfig) MCFG_CPU_ADD("mcu", M68705P5, DERIVED_CLOCK(1, 1)) MCFG_M68705_PORTC_R_CB(READ8(taito68705_mcu_device, mcu_portc_r)) MCFG_M68705_PORTA_W_CB(WRITE8(taito68705_mcu_device, mcu_pa_w)) @@ -321,7 +321,7 @@ arkanoid_68705p3_device::arkanoid_68705p3_device( { } -MACHINE_CONFIG_MEMBER(arkanoid_68705p3_device::device_add_mconfig) +MACHINE_CONFIG_START(arkanoid_68705p3_device::device_add_mconfig) MCFG_CPU_ADD("mcu", M68705P3, DERIVED_CLOCK(1, 1)) MCFG_M68705_PORTB_R_CB(READ8(arkanoid_68705p3_device, mcu_pb_r)) MCFG_M68705_PORTC_R_CB(READ8(arkanoid_68705p3_device, mcu_pc_r)) @@ -339,7 +339,7 @@ arkanoid_68705p5_device::arkanoid_68705p5_device( { } -MACHINE_CONFIG_MEMBER(arkanoid_68705p5_device::device_add_mconfig) +MACHINE_CONFIG_START(arkanoid_68705p5_device::device_add_mconfig) MCFG_CPU_ADD("mcu", M68705P5, DERIVED_CLOCK(1, 1)) MCFG_M68705_PORTB_R_CB(READ8(arkanoid_68705p5_device, mcu_pb_r)) MCFG_M68705_PORTC_R_CB(READ8(arkanoid_68705p5_device, mcu_pc_r)) diff --git a/src/mame/machine/taitocchip.cpp b/src/mame/machine/taitocchip.cpp index 8b91b163508..8bc2c75328d 100644 --- a/src/mame/machine/taitocchip.cpp +++ b/src/mame/machine/taitocchip.cpp @@ -160,7 +160,7 @@ static ADDRESS_MAP_START( cchip_map, AS_PROGRAM, 8, taito_cchip_device ) AM_RANGE(0x2000, 0x3fff) AM_ROM AM_REGION("cchip_eprom", 0) // might not map here ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( taito_cchip_device::device_add_mconfig ) +MACHINE_CONFIG_START(taito_cchip_device::device_add_mconfig) MCFG_CPU_ADD("upd7811", UPD7811, DERIVED_CLOCK(1,1)) MCFG_CPU_PROGRAM_MAP(cchip_map) diff --git a/src/mame/machine/taitoio.cpp b/src/mame/machine/taitoio.cpp index fabf2d6252c..200ad1a8a98 100644 --- a/src/mame/machine/taitoio.cpp +++ b/src/mame/machine/taitoio.cpp @@ -112,7 +112,7 @@ void tc0040ioc_device::device_reset() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( tc0040ioc_device::device_add_mconfig ) +MACHINE_CONFIG_START(tc0040ioc_device::device_add_mconfig) MCFG_WATCHDOG_ADD("watchdog") MACHINE_CONFIG_END @@ -255,7 +255,7 @@ void tc0220ioc_device::device_reset() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( tc0220ioc_device::device_add_mconfig ) +MACHINE_CONFIG_START(tc0220ioc_device::device_add_mconfig) MCFG_WATCHDOG_ADD("watchdog") // MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(3200)) MACHINE_CONFIG_END @@ -372,7 +372,7 @@ void tc0510nio_device::device_reset() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( tc0510nio_device::device_add_mconfig ) +MACHINE_CONFIG_START(tc0510nio_device::device_add_mconfig) MCFG_WATCHDOG_ADD("watchdog") MACHINE_CONFIG_END @@ -511,7 +511,7 @@ void tc0640fio_device::device_reset() // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( tc0640fio_device::device_add_mconfig ) +MACHINE_CONFIG_START(tc0640fio_device::device_add_mconfig) MCFG_WATCHDOG_ADD("watchdog") MACHINE_CONFIG_END diff --git a/src/mame/machine/taitosjsec.cpp b/src/mame/machine/taitosjsec.cpp index c2dbd5b0ae0..e0561dae527 100644 --- a/src/mame/machine/taitosjsec.cpp +++ b/src/mame/machine/taitosjsec.cpp @@ -121,7 +121,7 @@ void taito_sj_security_mcu_device::device_reset() m_mcu->set_input_line(M68705_IRQ_LINE, CLEAR_LINE); } -MACHINE_CONFIG_MEMBER(taito_sj_security_mcu_device::device_add_mconfig) +MACHINE_CONFIG_START(taito_sj_security_mcu_device::device_add_mconfig) MCFG_CPU_ADD("mcu", M68705P5, DERIVED_CLOCK(1, 1)) MCFG_M68705_PORTA_R_CB(READ8(taito_sj_security_mcu_device, mcu_pa_r)) MCFG_M68705_PORTC_R_CB(READ8(taito_sj_security_mcu_device, mcu_pc_r)) diff --git a/src/mame/machine/tandy2kb.cpp b/src/mame/machine/tandy2kb.cpp index bd788bcc472..6ec4ed4a6de 100644 --- a/src/mame/machine/tandy2kb.cpp +++ b/src/mame/machine/tandy2kb.cpp @@ -51,7 +51,7 @@ const tiny_rom_entry *tandy2k_keyboard_device::device_rom_region() const // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( tandy2k_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(tandy2k_keyboard_device::device_add_mconfig) MCFG_CPU_ADD(I8048_TAG, I8048, 1000000) // ? MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(tandy2k_keyboard_device, kb_p1_w)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(tandy2k_keyboard_device, kb_p2_w)) diff --git a/src/mame/machine/teleprinter.cpp b/src/mame/machine/teleprinter.cpp index 0bdb7b9faa1..2604e527924 100644 --- a/src/mame/machine/teleprinter.cpp +++ b/src/mame/machine/teleprinter.cpp @@ -211,7 +211,7 @@ uint32_t teleprinter_device::tp_update(screen_device &device, bitmap_rgb32 &bitm /*************************************************************************** VIDEO HARDWARE ***************************************************************************/ -MACHINE_CONFIG_MEMBER( teleprinter_device::device_add_mconfig ) +MACHINE_CONFIG_START(teleprinter_device::device_add_mconfig) MCFG_SCREEN_ADD(TELEPRINTER_SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp index a5c958f1eb6..c0be07f7644 100644 --- a/src/mame/machine/thomson.cpp +++ b/src/mame/machine/thomson.cpp @@ -520,7 +520,7 @@ to7_io_line_device::to7_io_line_device(const machine_config &mconfig, const char { } -MACHINE_CONFIG_MEMBER( to7_io_line_device::device_add_mconfig ) +MACHINE_CONFIG_START(to7_io_line_device::device_add_mconfig) /// THIS PIO is part of CC 90-232 expansion MCFG_DEVICE_ADD(THOM_PIA_IO, PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(to7_io_line_device, porta_in)) diff --git a/src/mame/machine/trs80m2kb.cpp b/src/mame/machine/trs80m2kb.cpp index ada8391cf58..53b8e8d0bf4 100644 --- a/src/mame/machine/trs80m2kb.cpp +++ b/src/mame/machine/trs80m2kb.cpp @@ -51,7 +51,7 @@ const tiny_rom_entry *trs80m2_keyboard_device::device_rom_region() const // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( trs80m2_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(trs80m2_keyboard_device::device_add_mconfig) MCFG_CPU_ADD(I8021_TAG, I8021, 3000000) // 1000uH inductor connected across the XTAL inputs MCFG_MCS48_PORT_T1_IN_CB(READLINE(trs80m2_keyboard_device, kb_t1_r)) MCFG_MCS48_PORT_BUS_IN_CB(READ8(trs80m2_keyboard_device, kb_p0_r)) diff --git a/src/mame/machine/upd65031.h b/src/mame/machine/upd65031.h index 4c5127727fa..c588922898f 100644 --- a/src/mame/machine/upd65031.h +++ b/src/mame/machine/upd65031.h @@ -30,10 +30,10 @@ devcb = &upd65031_device::set_spkr_wr_callback(*device, DEVCB_##_write); #define MCFG_UPD65031_SCR_UPDATE_CB(_class, _method) \ - upd65031_device::set_screen_update_callback(*device, upd65031_screen_update_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + upd65031_device::set_screen_update_callback(*device, upd65031_screen_update_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_UPD65031_MEM_UPDATE_CB(_class, _method) \ - upd65031_device::set_memory_update_callback(*device, upd65031_memory_update_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + upd65031_device::set_memory_update_callback(*device, upd65031_memory_update_delegate(&_class::_method, #_class "::" #_method, this)); //************************************************************************** diff --git a/src/mame/machine/v1050kb.cpp b/src/mame/machine/v1050kb.cpp index 7314c0707f4..4f082e7afcd 100644 --- a/src/mame/machine/v1050kb.cpp +++ b/src/mame/machine/v1050kb.cpp @@ -72,7 +72,7 @@ DISCRETE_SOUND_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( v1050_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(v1050_keyboard_device::device_add_mconfig) MCFG_CPU_ADD(I8049_TAG, I8049, XTAL_4_608MHz) MCFG_MCS48_PORT_P1_IN_CB(READ8(v1050_keyboard_device, kb_p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(v1050_keyboard_device, kb_p1_w)) diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp index ca31fa42300..51616732043 100644 --- a/src/mame/machine/victor9k_fdc.cpp +++ b/src/mame/machine/victor9k_fdc.cpp @@ -158,7 +158,7 @@ FLOPPY_FORMATS_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( victor_9000_fdc_device::device_add_mconfig ) +MACHINE_CONFIG_START(victor_9000_fdc_device::device_add_mconfig) MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_30MHz/6) MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_fdc_device, floppy_p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(victor_9000_fdc_device, floppy_p1_w)) diff --git a/src/mame/machine/victor9k_kb.cpp b/src/mame/machine/victor9k_kb.cpp index 329b265ff62..836ade989ec 100644 --- a/src/mame/machine/victor9k_kb.cpp +++ b/src/mame/machine/victor9k_kb.cpp @@ -380,7 +380,7 @@ const tiny_rom_entry *victor_9000_keyboard_device::device_rom_region() const // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( victor_9000_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(victor_9000_keyboard_device::device_add_mconfig) MCFG_CPU_ADD(I8021_TAG, I8021, XTAL_3_579545MHz) // P0 is unconnected on pcb MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_keyboard_device, kb_p1_r)) diff --git a/src/mame/machine/vt100_kbd.cpp b/src/mame/machine/vt100_kbd.cpp index 4c165350815..d9882423fb0 100644 --- a/src/mame/machine/vt100_kbd.cpp +++ b/src/mame/machine/vt100_kbd.cpp @@ -170,7 +170,7 @@ vt100_keyboard_device::vt100_keyboard_device(const machine_config &mconfig, cons // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER(vt100_keyboard_device::device_add_mconfig) +MACHINE_CONFIG_START(vt100_keyboard_device::device_add_mconfig) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("beeper", BEEP, 786) // 7.945us per serial clock = ~125865.324hz, / 160 clocks per char = ~ 786 hz MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp index d93988a479c..2199745dc6b 100644 --- a/src/mame/machine/wangpckb.cpp +++ b/src/mame/machine/wangpckb.cpp @@ -112,7 +112,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( wangpc_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(wangpc_keyboard_device::device_add_mconfig) MCFG_CPU_ADD(I8051_TAG, I8051, XTAL_4MHz) MCFG_CPU_IO_MAP(wangpc_keyboard_io) MCFG_MCS51_SERIAL_TX_CB(WRITE8(wangpc_keyboard_device, mcs51_tx_callback)) diff --git a/src/mame/machine/x820kb.cpp b/src/mame/machine/x820kb.cpp index 4d960d8c5e7..61ddee37ef5 100644 --- a/src/mame/machine/x820kb.cpp +++ b/src/mame/machine/x820kb.cpp @@ -84,7 +84,7 @@ const tiny_rom_entry *xerox_820_keyboard_device::device_rom_region() const // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( xerox_820_keyboard_device::device_add_mconfig ) +MACHINE_CONFIG_START(xerox_820_keyboard_device::device_add_mconfig) MCFG_CPU_ADD(I8748_TAG, I8048, XTAL_6MHz) MCFG_MCS48_PORT_P1_IN_CB(READ8(xerox_820_keyboard_device, kb_p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(xerox_820_keyboard_device, kb_p1_w)) diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp index e9e2db9a630..f75437d15d9 100644 --- a/src/mame/machine/xbox.cpp +++ b/src/mame/machine/xbox.cpp @@ -858,7 +858,7 @@ ADDRESS_MAP_START(xbox_base_map_io, AS_IO, 32, xbox_base_state) #endif ADDRESS_MAP_END -MACHINE_CONFIG_START(xbox_base) +MACHINE_CONFIG_START(xbox_base_state::xbox_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", PENTIUM3, 733333333) /* Wrong! family 6 model 8 stepping 10 */ MCFG_CPU_PROGRAM_MAP(xbox_base_map) diff --git a/src/mame/machine/xbox_pci.cpp b/src/mame/machine/xbox_pci.cpp index 4a746443665..0952b993097 100644 --- a/src/mame/machine/xbox_pci.cpp +++ b/src/mame/machine/xbox_pci.cpp @@ -701,7 +701,7 @@ void mcpx_ide_device::device_reset() pci_device::device_reset(); } -MACHINE_CONFIG_MEMBER(mcpx_ide_device::device_add_mconfig) +MACHINE_CONFIG_START(mcpx_ide_device::device_add_mconfig) MCFG_DEVICE_ADD("ide", BUS_MASTER_IDE_CONTROLLER, 0) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(mcpx_ide_device, ide_interrupt)) MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE("maincpu", AS_PROGRAM) diff --git a/src/mame/machine/zorbakbd.cpp b/src/mame/machine/zorbakbd.cpp index 92e1e0ee0c9..51d0e9bef9d 100644 --- a/src/mame/machine/zorbakbd.cpp +++ b/src/mame/machine/zorbakbd.cpp @@ -309,7 +309,7 @@ void zorba_keyboard_device::device_start() } -MACHINE_CONFIG_MEMBER(zorba_keyboard_device::device_add_mconfig) +MACHINE_CONFIG_START(zorba_keyboard_device::device_add_mconfig) // MC68705P3S MCFG_CPU_ADD("mcu", M68705P3, XTAL_3_579545MHz) MCFG_M68705_PORTA_R_CB(READ8(zorba_keyboard_device, mcu_pa_r)); diff --git a/src/mame/video/20pacgal.cpp b/src/mame/video/20pacgal.cpp index d0c0f6b50c0..48d9db0e33f 100644 --- a/src/mame/video/20pacgal.cpp +++ b/src/mame/video/20pacgal.cpp @@ -428,7 +428,7 @@ uint32_t _20pacgal_state::screen_update_20pacgal(screen_device &screen, bitmap_r * *************************************/ -MACHINE_CONFIG_START( 20pacgal_video ) +MACHINE_CONFIG_START(_20pacgal_state::_20pacgal_video) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) diff --git a/src/mame/video/733_asr.cpp b/src/mame/video/733_asr.cpp index d3c76bea0ca..af2f2c4e6ca 100644 --- a/src/mame/video/733_asr.cpp +++ b/src/mame/video/733_asr.cpp @@ -784,7 +784,7 @@ ioport_constructor asr733_device::device_input_ports() const //------------------------------------------------- -MACHINE_CONFIG_MEMBER( asr733_device::device_add_mconfig ) +MACHINE_CONFIG_START(asr733_device::device_add_mconfig) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(asr733_device, asr733) diff --git a/src/mame/video/911_vdt.cpp b/src/mame/video/911_vdt.cpp index 7b2ccb27280..5632d04b1c4 100644 --- a/src/mame/video/911_vdt.cpp +++ b/src/mame/video/911_vdt.cpp @@ -802,7 +802,7 @@ INPUT_PORTS_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( vdt911_device::device_add_mconfig ) +MACHINE_CONFIG_START(vdt911_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ diff --git a/src/mame/video/abc1600.cpp b/src/mame/video/abc1600.cpp index c8cd30fd5f5..6fed2fda971 100644 --- a/src/mame/video/abc1600.cpp +++ b/src/mame/video/abc1600.cpp @@ -193,7 +193,7 @@ MC6845_ON_UPDATE_ADDR_CHANGED( abc1600_mover_device::crtc_update ) // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( abc1600_mover_device::device_add_mconfig ) +MACHINE_CONFIG_START(abc1600_mover_device::device_add_mconfig) MCFG_DEFAULT_LAYOUT(layout_abc1600) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) diff --git a/src/mame/video/abc80.cpp b/src/mame/video/abc80.cpp index e84ca90c5cf..293f0ae9f19 100644 --- a/src/mame/video/abc80.cpp +++ b/src/mame/video/abc80.cpp @@ -192,7 +192,7 @@ uint32_t abc80_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, // MACHINE_CONFIG_START( abc80_video ) //------------------------------------------------- -MACHINE_CONFIG_START( abc80_video ) +MACHINE_CONFIG_START(abc80_state::abc80_video) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(abc80_state, screen_update) diff --git a/src/mame/video/abc800.cpp b/src/mame/video/abc800.cpp index 71b77531a3a..439bb132e62 100644 --- a/src/mame/video/abc800.cpp +++ b/src/mame/video/abc800.cpp @@ -174,7 +174,7 @@ PALETTE_INIT_MEMBER( abc800c_state, abc800c ) // MACHINE_CONFIG_START( abc800c_video ) //------------------------------------------------- -MACHINE_CONFIG_START( abc800c_video ) +MACHINE_CONFIG_START(abc800c_state::abc800c_video) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(abc800c_state, screen_update) MCFG_SCREEN_REFRESH_RATE(50) @@ -295,7 +295,7 @@ uint32_t abc800m_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma // MACHINE_CONFIG_START( abc800m_video ) //------------------------------------------------- -MACHINE_CONFIG_START( abc800m_video ) +MACHINE_CONFIG_START(abc800m_state::abc800m_video) MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, ABC800_CCLK) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(ABC800_CHAR_WIDTH) diff --git a/src/mame/video/abc800.h b/src/mame/video/abc800.h deleted file mode 100644 index 5f536a91437..00000000000 --- a/src/mame/video/abc800.h +++ /dev/null @@ -1,11 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Curt Coder -#pragma once - -#ifndef __VIDEO_ABC800__ -#define __VIDEO_ABC800__ - -MACHINE_CONFIG_EXTERN(abc800m_video); -MACHINE_CONFIG_EXTERN(abc800c_video); - -#endif diff --git a/src/mame/video/abc802.cpp b/src/mame/video/abc802.cpp index 146eae30db6..a189f8036dc 100644 --- a/src/mame/video/abc802.cpp +++ b/src/mame/video/abc802.cpp @@ -203,7 +203,7 @@ uint32_t abc802_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap // MACHINE_CONFIG_START( abc802_video ) //------------------------------------------------- -MACHINE_CONFIG_START( abc802_video ) +MACHINE_CONFIG_START(abc802_state::abc802_video) MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, ABC800_CCLK) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(ABC800_CHAR_WIDTH) diff --git a/src/mame/video/abc802.h b/src/mame/video/abc802.h deleted file mode 100644 index 6fe7e476419..00000000000 --- a/src/mame/video/abc802.h +++ /dev/null @@ -1,10 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Curt Coder -#pragma once - -#ifndef __VIDEO_ABC802__ -#define __VIDEO_ABC802__ - -MACHINE_CONFIG_EXTERN(abc802_video); - -#endif diff --git a/src/mame/video/abc806.cpp b/src/mame/video/abc806.cpp index 266fbd70562..9093fb7496e 100644 --- a/src/mame/video/abc806.cpp +++ b/src/mame/video/abc806.cpp @@ -489,7 +489,7 @@ PALETTE_INIT_MEMBER( abc806_state, abc806 ) // MACHINE_CONFIG_START( abc806_video ) //------------------------------------------------- -MACHINE_CONFIG_START( abc806_video ) +MACHINE_CONFIG_START(abc806_state::abc806_video) MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, ABC800_CCLK) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(ABC800_CHAR_WIDTH) diff --git a/src/mame/video/abc806.h b/src/mame/video/abc806.h deleted file mode 100644 index a26ba638f81..00000000000 --- a/src/mame/video/abc806.h +++ /dev/null @@ -1,10 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Curt Coder -#pragma once - -#ifndef __VIDEO_ABC806__ -#define __VIDEO_ABC806__ - -MACHINE_CONFIG_EXTERN(abc806_video); - -#endif diff --git a/src/mame/video/agat7.cpp b/src/mame/video/agat7.cpp index 05480951821..58394684e30 100644 --- a/src/mame/video/agat7.cpp +++ b/src/mame/video/agat7.cpp @@ -39,7 +39,7 @@ DEFINE_DEVICE_TYPE(AGAT7VIDEO, agat7video_device, "agat7video", "Agat-7 Video") // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER(agat7video_device::device_add_mconfig) +MACHINE_CONFIG_START(agat7video_device::device_add_mconfig) MCFG_SCREEN_ADD("a7screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_10_5MHz, 672, 0, 512, 312, 0, 256) MCFG_SCREEN_UPDATE_DRIVER(agat7video_device, screen_update) diff --git a/src/mame/video/airraid_dev.cpp b/src/mame/video/airraid_dev.cpp index eb75a4ed9a6..ec591372908 100644 --- a/src/mame/video/airraid_dev.cpp +++ b/src/mame/video/airraid_dev.cpp @@ -58,7 +58,7 @@ static GFXDECODE_START( cshooter ) GFXDECODE_ENTRY( "fg_gfx", 0, char16layout, 0, 16 ) GFXDECODE_END -MACHINE_CONFIG_MEMBER( airraid_video_device::device_add_mconfig ) +MACHINE_CONFIG_START(airraid_video_device::device_add_mconfig) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/video/amiga.cpp b/src/mame/video/amiga.cpp index eeeeb3b6c7f..15aa9319a7d 100644 --- a/src/mame/video/amiga.cpp +++ b/src/mame/video/amiga.cpp @@ -1096,7 +1096,7 @@ void amiga_state::update_screenmode() // MACHINE DRIVER FRAGMENTS //************************************************************************** -MACHINE_CONFIG_START( pal_video ) +MACHINE_CONFIG_START(amiga_state::pal_video) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS ( @@ -1108,7 +1108,7 @@ MACHINE_CONFIG_START( pal_video ) MCFG_SCREEN_PALETTE("palette") MACHINE_CONFIG_END -MACHINE_CONFIG_START( ntsc_video ) +MACHINE_CONFIG_START(amiga_state::ntsc_video) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS ( diff --git a/src/mame/video/apollo.cpp b/src/mame/video/apollo.cpp index 313feee0c24..b95ecf02559 100644 --- a/src/mame/video/apollo.cpp +++ b/src/mame/video/apollo.cpp @@ -1712,7 +1712,7 @@ void apollo_graphics_15i::register_vblank_callback() MACHINE DRIVERS ***************************************************************************/ -MACHINE_CONFIG_START( apollo_graphics ) +MACHINE_CONFIG_START(apollo_state::apollo_graphics) MCFG_DEFAULT_LAYOUT( layout_apollo_15i ) MCFG_SCREEN_ADD(VIDEO_SCREEN_TAG, RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) @@ -1882,7 +1882,7 @@ void apollo_graphics_15i::device_reset() //------------------------------------------------- -MACHINE_CONFIG_START( apollo_mono19i ) +MACHINE_CONFIG_START(apollo_state::apollo_mono19i) MCFG_DEFAULT_LAYOUT( layout_apollo ) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_SCREEN_ADD(VIDEO_SCREEN_TAG, RASTER) diff --git a/src/mame/video/bfm_adr2.cpp b/src/mame/video/bfm_adr2.cpp index 4c49dbbff72..52ee9c35516 100644 --- a/src/mame/video/bfm_adr2.cpp +++ b/src/mame/video/bfm_adr2.cpp @@ -545,7 +545,7 @@ ADDRESS_MAP_END // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( bfm_adder2_device::device_add_mconfig ) +MACHINE_CONFIG_START(bfm_adder2_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_SIZE( 400, 280) MCFG_SCREEN_VISIBLE_AREA( 0, 400-1, 0, 280-1) diff --git a/src/mame/video/bfm_dm01.cpp b/src/mame/video/bfm_dm01.cpp index f5fb0759844..414613a44a6 100644 --- a/src/mame/video/bfm_dm01.cpp +++ b/src/mame/video/bfm_dm01.cpp @@ -287,7 +287,7 @@ INTERRUPT_GEN_MEMBER( bfm_dm01_device::nmi_line_assert ) m_matrixcpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } -MACHINE_CONFIG_MEMBER( bfm_dm01_device::device_add_mconfig ) +MACHINE_CONFIG_START(bfm_dm01_device::device_add_mconfig) MCFG_CPU_ADD("matrix", M6809, 2000000 ) /* matrix board 6809 CPU at 2 Mhz ?? I don't know the exact freq.*/ MCFG_CPU_PROGRAM_MAP(bfm_dm01_memmap) MCFG_CPU_PERIODIC_INT_DRIVER(bfm_dm01_device, nmi_line_assert, 1500 ) /* generate 1500 NMI's per second ?? what is the exact freq?? */ diff --git a/src/mame/video/cgc7900.cpp b/src/mame/video/cgc7900.cpp index 3f07d9bae9c..13527dc1d3f 100644 --- a/src/mame/video/cgc7900.cpp +++ b/src/mame/video/cgc7900.cpp @@ -227,7 +227,7 @@ GFXDECODE_END MACHINE_DRIVER( cgc7900_video ) -------------------------------------------------*/ -MACHINE_CONFIG_START( cgc7900_video ) +MACHINE_CONFIG_START(cgc7900_state::cgc7900_video) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ diff --git a/src/mame/video/cidelsa.cpp b/src/mame/video/cidelsa.cpp index e06d7221999..8a212ec739a 100644 --- a/src/mame/video/cidelsa.cpp +++ b/src/mame/video/cidelsa.cpp @@ -148,7 +148,7 @@ WRITE8_MEMBER( draco_state::psg_pb_w ) /* Machine Drivers */ -MACHINE_CONFIG_START( destryer_video ) +MACHINE_CONFIG_START(cidelsa_state::destryer_video) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, DESTRYER_CHR2) MCFG_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044) @@ -162,7 +162,7 @@ MACHINE_CONFIG_START( destryer_video ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_START( altair_video ) +MACHINE_CONFIG_START(cidelsa_state::altair_video) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, ALTAIR_CHR2) MCFG_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044) @@ -176,7 +176,7 @@ MACHINE_CONFIG_START( altair_video ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_START( draco_video ) +MACHINE_CONFIG_START(draco_state::draco_video) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, DRACO_CHR2) MCFG_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.360, 0.024) diff --git a/src/mame/video/comx35.cpp b/src/mame/video/comx35.cpp index be553a3f401..4c544f4fae1 100644 --- a/src/mame/video/comx35.cpp +++ b/src/mame/video/comx35.cpp @@ -88,7 +88,7 @@ void comx35_state::video_start() /* Machine Drivers */ -MACHINE_CONFIG_START( comx35_pal_video ) +MACHINE_CONFIG_START(comx35_state::comx35_pal_video) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL) /* sound hardware */ @@ -108,7 +108,7 @@ MACHINE_CONFIG_START( comx35_pal_video ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_START( comx35_ntsc_video ) +MACHINE_CONFIG_START(comx35_state::comx35_ntsc_video) MCFG_CDP1869_SCREEN_NTSC_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_NTSC) /* sound hardware */ diff --git a/src/mame/video/deco16ic.h b/src/mame/video/deco16ic.h index b1e6794410a..d3740530335 100644 --- a/src/mame/video/deco16ic.h +++ b/src/mame/video/deco16ic.h @@ -167,10 +167,10 @@ DECLARE_DEVICE_TYPE(DECO16IC, deco16ic_device) #define MCFG_DECO16IC_SET_SCREEN MCFG_VIDEO_SET_SCREEN #define MCFG_DECO16IC_BANK1_CB(_class, _method) \ - deco16ic_device::set_bank1_callback(*device, deco16_bank_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + deco16ic_device::set_bank1_callback(*device, deco16_bank_cb_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_DECO16IC_BANK2_CB(_class, _method) \ - deco16ic_device::set_bank2_callback(*device, deco16_bank_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + deco16ic_device::set_bank2_callback(*device, deco16_bank_cb_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_DECO16IC_SPLIT(_split) \ deco16ic_device::set_split(*device, _split); diff --git a/src/mame/video/decodmd1.cpp b/src/mame/video/decodmd1.cpp index 01fed13a686..9b96eed22b0 100644 --- a/src/mame/video/decodmd1.cpp +++ b/src/mame/video/decodmd1.cpp @@ -199,7 +199,7 @@ static ADDRESS_MAP_START( decodmd1_io_map, AS_IO, 8, decodmd_type1_device ) AM_RANGE(0x00, 0xff) AM_READWRITE(dmd_port_r, dmd_port_w) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( decodmd_type1_device::device_add_mconfig ) +MACHINE_CONFIG_START(decodmd_type1_device::device_add_mconfig) /* basic machine hardware */ MCFG_CPU_ADD("dmdcpu", Z80, XTAL_8MHz / 2) MCFG_CPU_PROGRAM_MAP(decodmd1_map) diff --git a/src/mame/video/decodmd2.cpp b/src/mame/video/decodmd2.cpp index 32310a4f9fd..a80dde312b5 100644 --- a/src/mame/video/decodmd2.cpp +++ b/src/mame/video/decodmd2.cpp @@ -128,7 +128,7 @@ static ADDRESS_MAP_START( decodmd2_map, AS_PROGRAM, 8, decodmd_type2_device ) AM_RANGE(0x8000, 0xffff) AM_ROMBANK("dmdbank2") // last 32k of ROM ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( decodmd_type2_device::device_add_mconfig ) +MACHINE_CONFIG_START(decodmd_type2_device::device_add_mconfig) /* basic machine hardware */ MCFG_CPU_ADD("dmdcpu", MC6809E, XTAL_8MHz / 4) MCFG_CPU_PROGRAM_MAP(decodmd2_map) diff --git a/src/mame/video/decodmd3.cpp b/src/mame/video/decodmd3.cpp index eb9fcb04eee..f990ce564a3 100644 --- a/src/mame/video/decodmd3.cpp +++ b/src/mame/video/decodmd3.cpp @@ -130,7 +130,7 @@ static ADDRESS_MAP_START( decodmd3_map, AS_PROGRAM, 16, decodmd_type3_device ) AM_RANGE(0x00c00020, 0x00c00021) AM_READWRITE(latch_r,status_w) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( decodmd_type3_device::device_add_mconfig ) +MACHINE_CONFIG_START(decodmd_type3_device::device_add_mconfig) /* basic machine hardware */ MCFG_CPU_ADD("dmdcpu", M68000, XTAL_12MHz) MCFG_CPU_PROGRAM_MAP(decodmd3_map) diff --git a/src/mame/video/decospr.h b/src/mame/video/decospr.h index 883ad675b55..d1a067260c6 100644 --- a/src/mame/video/decospr.h +++ b/src/mame/video/decospr.h @@ -77,10 +77,10 @@ DECLARE_DEVICE_TYPE(DECO_SPRITE, decospr_device) decospr_device::set_gfx_region(*device, _region); #define MCFG_DECO_SPRITE_PRIORITY_CB(_class, _method) \ - decospr_device::set_pri_callback(*device, decospr_pri_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + decospr_device::set_pri_callback(*device, decospr_pri_cb_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_DECO_SPRITE_COLOUR_CB(_class, _method) \ - decospr_device::set_col_callback(*device, decospr_col_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + decospr_device::set_col_callback(*device, decospr_col_cb_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_DECO_SPRITE_ISBOOTLEG(_boot) \ decospr_device::set_is_bootleg(*device, _boot); diff --git a/src/mame/video/decrmc3.h b/src/mame/video/decrmc3.h index f7d5e30078e..45ae8cc12f1 100644 --- a/src/mame/video/decrmc3.h +++ b/src/mame/video/decrmc3.h @@ -44,7 +44,7 @@ deco_rmc3_device::static_set_init(*device, deco_rmc3_palette_init_delegate(FUNC(deco_rmc3_device::palette_init_proms), downcast(device))); //#define MCFG_DECO_RMC3_INIT_OWNER(_class, _method) -// deco_rmc3_device::static_set_init(*device, deco_rmc3_palette_init_delegate(&_class::PALETTE_INIT_NAME(_method), #_class "::palette_init_" #_method, downcast<_class *>(owner))); +// deco_rmc3_device::static_set_init(*device, deco_rmc3_palette_init_delegate(&_class::PALETTE_INIT_NAME(_method), #_class "::palette_init_" #_method, this)); //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mame/video/exidy440.cpp b/src/mame/video/exidy440.cpp index b02b8c4cc4a..84f6fa7d063 100644 --- a/src/mame/video/exidy440.cpp +++ b/src/mame/video/exidy440.cpp @@ -457,7 +457,7 @@ uint32_t exidy440_state::screen_update_topsecex(screen_device &screen, bitmap_in * *************************************/ -MACHINE_CONFIG_START( exidy440_video ) +MACHINE_CONFIG_START(exidy440_state::exidy440_video) MCFG_VIDEO_START_OVERRIDE(exidy440_state,exidy440) MCFG_PALETTE_ADD("palette", 256) @@ -469,7 +469,7 @@ MACHINE_CONFIG_START( exidy440_video ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( topsecex_video ) +MACHINE_CONFIG_START(exidy440_state::topsecex_video) MCFG_VIDEO_START_OVERRIDE(exidy440_state,topsecex) MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/video/gamate.cpp b/src/mame/video/gamate.cpp index 02d82ab6b98..f19b3f72289 100644 --- a/src/mame/video/gamate.cpp +++ b/src/mame/video/gamate.cpp @@ -304,7 +304,7 @@ PALETTE_INIT_MEMBER(gamate_video_device, gamate) frame rate is 60.8093Hz. */ -MACHINE_CONFIG_MEMBER( gamate_video_device::device_add_mconfig ) +MACHINE_CONFIG_START(gamate_video_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", LCD) MCFG_SCREEN_REFRESH_RATE(60.8093) MCFG_SCREEN_SIZE(160, 150) diff --git a/src/mame/video/gameplan.cpp b/src/mame/video/gameplan.cpp index 5ad2ae90136..d12aa3bceba 100644 --- a/src/mame/video/gameplan.cpp +++ b/src/mame/video/gameplan.cpp @@ -315,7 +315,7 @@ VIDEO_RESET_MEMBER(gameplan_state,gameplan) * *************************************/ -MACHINE_CONFIG_START( gameplan_video ) +MACHINE_CONFIG_START(gameplan_state::gameplan_video) MCFG_VIDEO_START_OVERRIDE(gameplan_state,gameplan) MCFG_VIDEO_RESET_OVERRIDE(gameplan_state,gameplan) @@ -325,14 +325,14 @@ MACHINE_CONFIG_START( gameplan_video ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( leprechn_video ) +MACHINE_CONFIG_START(gameplan_state::leprechn_video) MCFG_VIDEO_START_OVERRIDE(gameplan_state,leprechn) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(gameplan_state, screen_update_leprechn) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( trvquest_video, gameplan_video ) +MACHINE_CONFIG_DERIVED(gameplan_state::trvquest_video, gameplan_video) MCFG_VIDEO_START_OVERRIDE(gameplan_state,trvquest) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(gameplan_state, screen_update_gameplan) diff --git a/src/mame/video/jedi.cpp b/src/mame/video/jedi.cpp index f1bf6f6e138..ee65d9bb36a 100644 --- a/src/mame/video/jedi.cpp +++ b/src/mame/video/jedi.cpp @@ -361,7 +361,7 @@ uint32_t jedi_state::screen_update_jedi(screen_device &screen, bitmap_rgb32 &bit * *************************************/ -MACHINE_CONFIG_START( jedi_video ) +MACHINE_CONFIG_START(jedi_state::jedi_video) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(64*8, 262) /* verify vert size */ diff --git a/src/mame/video/k007342.h b/src/mame/video/k007342.h index a25e16f244d..4e1c1193ff3 100644 --- a/src/mame/video/k007342.h +++ b/src/mame/video/k007342.h @@ -67,7 +67,7 @@ DECLARE_DEVICE_TYPE(K007342, k007342_device) k007342_device::static_set_gfxnum(*device, _gfxnum); #define MCFG_K007342_CALLBACK_OWNER(_class, _method) \ - k007342_device::static_set_callback(*device, k007342_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + k007342_device::static_set_callback(*device, k007342_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_K007342_CALLBACK_DEVICE(_tag, _class, _method) \ k007342_device::static_set_callback(*device, k007342_delegate(&_class::_method, #_class "::" #_method, _tag)); diff --git a/src/mame/video/k007420.h b/src/mame/video/k007420.h index c4bb9a318c6..a7e49059dd7 100644 --- a/src/mame/video/k007420.h +++ b/src/mame/video/k007420.h @@ -48,7 +48,7 @@ DECLARE_DEVICE_TYPE(K007420, k007420_device) k007420_device::static_set_bank_limit(*device, _limit); #define MCFG_K007420_CALLBACK_OWNER(_class, _method) \ - k007420_device::static_set_callback(*device, k007420_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + k007420_device::static_set_callback(*device, k007420_delegate(&_class::_method, #_class "::" #_method, this)); // function definition for a callback #define K007420_CALLBACK_MEMBER(_name) void _name(int *code, int *color) diff --git a/src/mame/video/k051316.h b/src/mame/video/k051316.h index dcf0a380973..fec501fc981 100644 --- a/src/mame/video/k051316.h +++ b/src/mame/video/k051316.h @@ -11,7 +11,7 @@ typedef device_delegate k051316_cb_del #define MCFG_K051316_CB(_class, _method) \ - k051316_device::set_k051316_callback(*device, k051316_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + k051316_device::set_k051316_callback(*device, k051316_cb_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_K051316_OFFSETS(_xoffs, _yoffs) \ k051316_device::set_offsets(*device, _xoffs, _yoffs); diff --git a/src/mame/video/k051960.h b/src/mame/video/k051960.h index 5f7d7f6b51f..160d5a70cf3 100644 --- a/src/mame/video/k051960.h +++ b/src/mame/video/k051960.h @@ -19,7 +19,7 @@ typedef device_delegate(owner))); + k051960_device::set_k051960_callback(*device, k051960_cb_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_K051960_PLANEORDER(_order) \ k051960_device::set_plane_order(*device, _order); diff --git a/src/mame/video/k052109.h b/src/mame/video/k052109.h index 0deacf9b467..1ee5b162ead 100644 --- a/src/mame/video/k052109.h +++ b/src/mame/video/k052109.h @@ -11,7 +11,7 @@ typedef device_delegate(owner))); + k052109_device::set_k052109_callback(*device, k052109_cb_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_K052109_CHARRAM(_ram) \ k052109_device::set_ram(*device, _ram); diff --git a/src/mame/video/k053244_k053245.h b/src/mame/video/k053244_k053245.h index e0176b39079..22838b386db 100644 --- a/src/mame/video/k053244_k053245.h +++ b/src/mame/video/k053244_k053245.h @@ -14,7 +14,7 @@ typedef device_delegate k05324x_cb_ k05324x_device::set_bpp(*device, _bpp); #define MCFG_K05324X_CB(_class, _method) \ - k05324x_device::set_k05324x_callback(*device, k05324x_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + k05324x_device::set_k05324x_callback(*device, k05324x_cb_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_K05324X_OFFSETS(_xoffs, _yoffs) \ k05324x_device::set_offsets(*device, _xoffs, _yoffs); diff --git a/src/mame/video/k053246_k053247_k055673.h b/src/mame/video/k053246_k053247_k055673.h index fddb2376e39..087966b6692 100644 --- a/src/mame/video/k053246_k053247_k055673.h +++ b/src/mame/video/k053246_k053247_k055673.h @@ -17,13 +17,13 @@ typedef device_delegate k05324 #define K055673_CB_MEMBER(_name) void _name(int *code, int *color, int *priority_mask) #define MCFG_K053246_CB(_class, _method) \ - k053247_device::set_k053247_callback(*device, k053247_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + k053247_device::set_k053247_callback(*device, k053247_cb_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_K053246_CONFIG(_gfx_reg, _order, _dx, _dy) \ k053247_device::set_config(*device, _gfx_reg, _order, _dx, _dy); #define MCFG_K055673_CB(_class, _method) \ - k053247_device::set_k053247_callback(*device, k053247_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + k053247_device::set_k053247_callback(*device, k053247_cb_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_K055673_CONFIG(_gfx_reg, _order, _dx, _dy) \ k053247_device::set_config(*device, _gfx_reg, _order, _dx, _dy); diff --git a/src/mame/video/k054156_k054157_k056832.h b/src/mame/video/k054156_k054157_k056832.h index 410306b070a..9c05c17ca5c 100644 --- a/src/mame/video/k054156_k054157_k056832.h +++ b/src/mame/video/k054156_k054157_k056832.h @@ -10,7 +10,7 @@ typedef device_delegate k05 #define K056832_CB_MEMBER(_name) void _name(int layer, int *code, int *color, int *flags) #define MCFG_K056832_CB(_class, _method) \ - k056832_device::set_k056832_callback(*device, k056832_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + k056832_device::set_k056832_callback(*device, k056832_cb_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_K056832_CONFIG(_gfx_reg, _bpp, _big, _djmain_hack, _k055555) \ k056832_device::set_config(*device, "^" _gfx_reg, _bpp, _big, _djmain_hack, _k055555); diff --git a/src/mame/video/k1ge.cpp b/src/mame/video/k1ge.cpp index 80623a2fdb8..b70ded9bbd2 100644 --- a/src/mame/video/k1ge.cpp +++ b/src/mame/video/k1ge.cpp @@ -882,7 +882,7 @@ k1ge_device::k1ge_device(const machine_config &mconfig, device_type type, const // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( k1ge_device::device_add_mconfig ) +MACHINE_CONFIG_START(k1ge_device::device_add_mconfig) MCFG_PALETTE_ADD("palette", 8 ) MCFG_PALETTE_INIT_OWNER(k1ge_device, k1ge) MACHINE_CONFIG_END @@ -899,7 +899,7 @@ k2ge_device::k2ge_device(const machine_config &mconfig, const char *tag, device_ // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( k2ge_device::device_add_mconfig ) +MACHINE_CONFIG_START(k2ge_device::device_add_mconfig) MCFG_PALETTE_ADD("palette", 4096 ) MCFG_PALETTE_INIT_OWNER(k2ge_device, k2ge) MACHINE_CONFIG_END diff --git a/src/mame/video/kyocera.cpp b/src/mame/video/kyocera.cpp index a29e8de1eea..c0d413b5481 100644 --- a/src/mame/video/kyocera.cpp +++ b/src/mame/video/kyocera.cpp @@ -47,7 +47,7 @@ static ADDRESS_MAP_START( tandy200_lcdc, 0, 8, tandy200_state ) AM_RANGE(0x0000, 0x1fff) AM_RAM ADDRESS_MAP_END -MACHINE_CONFIG_START( kc85_video ) +MACHINE_CONFIG_START(kc85_state::kc85_video) MCFG_SCREEN_ADD(SCREEN_TAG, LCD) MCFG_SCREEN_REFRESH_RATE(44) MCFG_SCREEN_UPDATE_DRIVER(kc85_state, screen_update) @@ -75,7 +75,7 @@ MACHINE_CONFIG_START( kc85_video ) // MCFG_HD44103_SLAVE_ADD( "m12", "m11", SCREEN_TAG, HD44103_FS_HIGH, HD44103_DUTY_1_32) MACHINE_CONFIG_END -MACHINE_CONFIG_START( tandy200_video ) +MACHINE_CONFIG_START(tandy200_state::tandy200_video) MCFG_SCREEN_ADD(SCREEN_TAG, LCD) MCFG_SCREEN_REFRESH_RATE(80) MCFG_SCREEN_UPDATE_DRIVER(tandy200_state, screen_update) diff --git a/src/mame/video/leland.cpp b/src/mame/video/leland.cpp index f96c00dfa70..7141d9a94a2 100644 --- a/src/mame/video/leland.cpp +++ b/src/mame/video/leland.cpp @@ -530,7 +530,7 @@ uint32_t leland_state::screen_update_ataxx(screen_device &screen, bitmap_ind16 & * *************************************/ -MACHINE_CONFIG_START( leland_video ) +MACHINE_CONFIG_START(leland_state::leland_video) MCFG_VIDEO_START_OVERRIDE(leland_state,leland) @@ -546,7 +546,7 @@ MACHINE_CONFIG_START( leland_video ) MCFG_SCREEN_PALETTE("palette") MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED( ataxx_video, leland_video ) +MACHINE_CONFIG_DERIVED(leland_state::ataxx_video, leland_video) MCFG_VIDEO_START_OVERRIDE(leland_state,ataxx) MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/video/madalien.cpp b/src/mame/video/madalien.cpp index 3505d18a0eb..d4b1a1af312 100644 --- a/src/mame/video/madalien.cpp +++ b/src/mame/video/madalien.cpp @@ -368,7 +368,7 @@ static GFXDECODE_START( madalien ) GFXDECODE_END -MACHINE_CONFIG_START( madalien_video ) +MACHINE_CONFIG_START(madalien_state::madalien_video) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 336, 0, 256, 288, 0, 256) MCFG_SCREEN_UPDATE_DRIVER(madalien_state, screen_update_madalien) diff --git a/src/mame/video/mikromik.cpp b/src/mame/video/mikromik.cpp index e41c8d62537..214a9727413 100644 --- a/src/mame/video/mikromik.cpp +++ b/src/mame/video/mikromik.cpp @@ -128,7 +128,7 @@ PALETTE_INIT_MEMBER( mm1_state, mm1 ) // MACHINE_CONFIG_START( mm1m6_video ) //------------------------------------------------- -MACHINE_CONFIG_START( mm1m6_video ) +MACHINE_CONFIG_START(mm1_state::mm1m6_video) MCFG_SCREEN_ADD( SCREEN_TAG, RASTER ) MCFG_SCREEN_REFRESH_RATE( 50 ) MCFG_SCREEN_UPDATE_DRIVER(mm1_state, screen_update) diff --git a/src/mame/video/mystston.cpp b/src/mame/video/mystston.cpp index f802cf64ab4..8a1b0dfea61 100644 --- a/src/mame/video/mystston.cpp +++ b/src/mame/video/mystston.cpp @@ -310,7 +310,7 @@ GFXDECODE_END * *************************************/ -MACHINE_CONFIG_START( mystston_video ) +MACHINE_CONFIG_START(mystston_state::mystston_video) MCFG_VIDEO_START_OVERRIDE(mystston_state,mystston) MCFG_VIDEO_RESET_OVERRIDE(mystston_state,mystston) diff --git a/src/mame/video/newbrain.cpp b/src/mame/video/newbrain.cpp index 42cbfd3d4cc..a491be10577 100644 --- a/src/mame/video/newbrain.cpp +++ b/src/mame/video/newbrain.cpp @@ -186,7 +186,7 @@ GFXDECODE_END /* Machine Drivers */ -MACHINE_CONFIG_START( newbrain_video ) +MACHINE_CONFIG_START(newbrain_state::newbrain_video) MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DRIVER(newbrain_state, screen_update) MCFG_SCREEN_REFRESH_RATE(50) diff --git a/src/mame/video/osi.cpp b/src/mame/video/osi.cpp index a8d3f791a70..827c93dc859 100644 --- a/src/mame/video/osi.cpp +++ b/src/mame/video/osi.cpp @@ -146,7 +146,7 @@ uint32_t uk101_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, /* Machine Drivers */ -MACHINE_CONFIG_START( osi600_video ) +MACHINE_CONFIG_START(sb2m600_state::osi600_video) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(X1/256/256) // 60 Hz MCFG_SCREEN_UPDATE_DRIVER(sb2m600_state, screen_update) @@ -157,7 +157,7 @@ MACHINE_CONFIG_START( osi600_video ) MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END -MACHINE_CONFIG_START( uk101_video ) +MACHINE_CONFIG_START(uk101_state::uk101_video) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_UPDATE_DRIVER(uk101_state, screen_update) @@ -168,7 +168,7 @@ MACHINE_CONFIG_START( uk101_video ) MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END -MACHINE_CONFIG_START( osi630_video ) +MACHINE_CONFIG_START(sb2m600_state::osi630_video) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_REFRESH_RATE(X1/256/256) // 60 Hz MCFG_SCREEN_UPDATE_DRIVER(sb2m600_state, screen_update) diff --git a/src/mame/video/pc1512.cpp b/src/mame/video/pc1512.cpp index c8df887616e..7cd301b1f95 100644 --- a/src/mame/video/pc1512.cpp +++ b/src/mame/video/pc1512.cpp @@ -593,7 +593,7 @@ uint32_t pc1512_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap // MACHINE_CONFIG( pc1512 ) //------------------------------------------------- -MACHINE_CONFIG_START( pc1512_video ) +MACHINE_CONFIG_START(pc1512_state::pc1512_video) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(pc1512_state, screen_update) MCFG_SCREEN_SIZE(80*8, 24*8) diff --git a/src/mame/video/pc8401a.cpp b/src/mame/video/pc8401a.cpp index 18560896c99..aae1743451f 100644 --- a/src/mame/video/pc8401a.cpp +++ b/src/mame/video/pc8401a.cpp @@ -56,7 +56,7 @@ ADDRESS_MAP_END /* Machine Drivers */ -MACHINE_CONFIG_START( pc8401a_video ) +MACHINE_CONFIG_START(pc8401a_state::pc8401a_video) // MCFG_DEFAULT_LAYOUT(layout_pc8401a) MCFG_PALETTE_ADD("palette", 2) @@ -73,7 +73,7 @@ MACHINE_CONFIG_START( pc8401a_video ) MCFG_SED1330_ADD(SED1330_TAG, 0, SCREEN_TAG, pc8401a_lcdc) MACHINE_CONFIG_END -MACHINE_CONFIG_START( pc8500_video ) +MACHINE_CONFIG_START(pc8500_state::pc8500_video) MCFG_DEFAULT_LAYOUT(layout_pc8500) MCFG_PALETTE_ADD("palette", 2+8) diff --git a/src/mame/video/pc_t1t.cpp b/src/mame/video/pc_t1t.cpp index 1a646c54a80..0f5b3e56fa9 100644 --- a/src/mame/video/pc_t1t.cpp +++ b/src/mame/video/pc_t1t.cpp @@ -115,7 +115,7 @@ static ADDRESS_MAP_START(vram_map, 0, 8, pcvideo_t1000_device) AM_RANGE(0x20000, 0x3ffff) AM_NOP ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( pcvideo_t1000_device::device_add_mconfig ) +MACHINE_CONFIG_START(pcvideo_t1000_device::device_add_mconfig) MCFG_SCREEN_ADD(T1000_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz,912,0,640,262,0,200) MCFG_SCREEN_UPDATE_DEVICE( T1000_MC6845_NAME, mc6845_device, screen_update ) @@ -139,7 +139,7 @@ MACHINE_CONFIG_MEMBER( pcvideo_t1000_device::device_add_mconfig ) MACHINE_CONFIG_END -MACHINE_CONFIG_MEMBER( pcvideo_pcjr_device::device_add_mconfig ) +MACHINE_CONFIG_START(pcvideo_pcjr_device::device_add_mconfig) MCFG_SCREEN_ADD(T1000_SCREEN_NAME, RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz, 912, 0, 640, 262, 0, 200) MCFG_SCREEN_UPDATE_DEVICE( T1000_MC6845_NAME, mc6845_device, screen_update ) diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp index 19ad4b1a907..28e9c4ee482 100644 --- a/src/mame/video/pcd.cpp +++ b/src/mame/video/pcd.cpp @@ -99,7 +99,7 @@ ioport_constructor pcd_video_device::device_input_ports() const return INPUT_PORTS_NAME(pcd_mouse); } -MACHINE_CONFIG_MEMBER( pcd_video_device::device_add_mconfig ) +MACHINE_CONFIG_START(pcd_video_device::device_add_mconfig) MCFG_CPU_ADD("graphics", I8741, XTAL_16MHz/2) MCFG_MCS48_PORT_P1_IN_CB(READ8(pcd_video_device, p1_r)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(pcd_video_device, p2_w)) @@ -140,7 +140,7 @@ static ADDRESS_MAP_START( pcx_vram, 0, 8, pcx_video_device ) AM_RANGE(0x0000, 0x07ff) AM_READWRITE(vram_r, vram_w) ADDRESS_MAP_END -MACHINE_CONFIG_MEMBER( pcx_video_device::device_add_mconfig ) +MACHINE_CONFIG_START(pcx_video_device::device_add_mconfig) MCFG_CPU_ADD("graphics", I8031, XTAL_24MHz/2) MCFG_CPU_PROGRAM_MAP(pcx_vid_map) MCFG_CPU_IO_MAP(pcx_vid_io) diff --git a/src/mame/video/pecom.cpp b/src/mame/video/pecom.cpp index a5503662384..ab097c9d3d7 100644 --- a/src/mame/video/pecom.cpp +++ b/src/mame/video/pecom.cpp @@ -90,7 +90,7 @@ VIDEO_START_MEMBER(pecom_state,pecom) save_pointer(NAME(m_charram.get()), PECOM_CHAR_RAM_SIZE); } -MACHINE_CONFIG_START( pecom_video ) +MACHINE_CONFIG_START(pecom_state::pecom_video) MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL) MCFG_VIDEO_START_OVERRIDE(pecom_state,pecom) diff --git a/src/mame/video/qix.cpp b/src/mame/video/qix.cpp index c23022245a4..f3e9bc7b4a8 100644 --- a/src/mame/video/qix.cpp +++ b/src/mame/video/qix.cpp @@ -376,7 +376,7 @@ ADDRESS_MAP_END * *************************************/ -MACHINE_CONFIG_START( qix_video ) +MACHINE_CONFIG_START(qix_state::qix_video) MCFG_CPU_ADD("videocpu", MC6809E, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */ MCFG_CPU_PROGRAM_MAP(qix_video_map) @@ -396,20 +396,20 @@ MACHINE_CONFIG_START( qix_video ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( kram3_video ) +MACHINE_CONFIG_START(qix_state::kram3_video) MCFG_CPU_MODIFY("videocpu") MCFG_CPU_PROGRAM_MAP(kram3_video_map) MCFG_MC6809E_LIC_CB(WRITELINE(qix_state, kram3_lic_videocpu_changed)) MACHINE_CONFIG_END -MACHINE_CONFIG_START( zookeep_video ) +MACHINE_CONFIG_START(qix_state::zookeep_video) MCFG_CPU_MODIFY("videocpu") MCFG_CPU_PROGRAM_MAP(zookeep_video_map) MACHINE_CONFIG_END -MACHINE_CONFIG_START( slither_video ) +MACHINE_CONFIG_START(qix_state::slither_video) MCFG_CPU_MODIFY("videocpu") MCFG_CPU_CLOCK(SLITHER_CLOCK_OSC/4/4) /* 1.34 MHz */ MCFG_CPU_PROGRAM_MAP(slither_video_map) diff --git a/src/mame/video/redalert.cpp b/src/mame/video/redalert.cpp index e5c3d671b47..14024870246 100644 --- a/src/mame/video/redalert.cpp +++ b/src/mame/video/redalert.cpp @@ -402,7 +402,7 @@ uint32_t redalert_state::screen_update_panther(screen_device &screen, bitmap_rgb * *************************************/ -static MACHINE_CONFIG_START( redalert_video_common ) +MACHINE_CONFIG_START(redalert_state::redalert_video_common) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -411,14 +411,14 @@ static MACHINE_CONFIG_START( redalert_video_common ) MCFG_SCREEN_UPDATE_DRIVER(redalert_state, screen_update_redalert) MACHINE_CONFIG_END -MACHINE_CONFIG_START( redalert_video ) +MACHINE_CONFIG_START(redalert_state::redalert_video) MCFG_VIDEO_START_OVERRIDE(redalert_state,redalert) MCFG_FRAGMENT_ADD( redalert_video_common ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( ww3_video ) +MACHINE_CONFIG_START(redalert_state::ww3_video) MCFG_VIDEO_START_OVERRIDE(redalert_state, ww3 ) MCFG_FRAGMENT_ADD( redalert_video_common ) @@ -432,7 +432,7 @@ MACHINE_CONFIG_END * *************************************/ -MACHINE_CONFIG_START( demoneye_video ) +MACHINE_CONFIG_START(redalert_state::demoneye_video) MCFG_VIDEO_START_OVERRIDE(redalert_state,redalert) MCFG_SCREEN_ADD("screen", RASTER) @@ -444,7 +444,7 @@ MACHINE_CONFIG_START( demoneye_video ) MACHINE_CONFIG_END -MACHINE_CONFIG_START( panther_video ) +MACHINE_CONFIG_START(redalert_state::panther_video) MCFG_VIDEO_START_OVERRIDE(redalert_state,ww3) diff --git a/src/mame/video/seta001.h b/src/mame/video/seta001.h index 2deab65033c..38045a0b32a 100644 --- a/src/mame/video/seta001.h +++ b/src/mame/video/seta001.h @@ -10,7 +10,7 @@ typedef device_delegate gfxbank_cb_delegate; #define SETA001_SPRITE_GFXBANK_CB_MEMBER(_name) int _name(uint16_t code, uint8_t color) #define MCFG_SETA001_SPRITE_GFXBANK_CB(_class, _method) \ - seta001_device::set_gfxbank_callback(*device, gfxbank_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + seta001_device::set_gfxbank_callback(*device, gfxbank_cb_delegate(&_class::_method, #_class "::" #_method, this)); class seta001_device : public device_t { diff --git a/src/mame/video/stactics.cpp b/src/mame/video/stactics.cpp index 8424bc02ce8..61971414392 100644 --- a/src/mame/video/stactics.cpp +++ b/src/mame/video/stactics.cpp @@ -447,7 +447,7 @@ uint32_t stactics_state::screen_update(screen_device &screen, bitmap_ind16 &bitm * *************************************/ -MACHINE_CONFIG_START( stactics_video ) +MACHINE_CONFIG_START(stactics_state::stactics_video) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/video/stfight_dev.cpp b/src/mame/video/stfight_dev.cpp index 192021015de..c4aa3273952 100644 --- a/src/mame/video/stfight_dev.cpp +++ b/src/mame/video/stfight_dev.cpp @@ -109,7 +109,7 @@ static GFXDECODE_START( stfight ) GFXDECODE_ENTRY( "spr_gfx", 0x0000, spritelayout, 0, 32 ) GFXDECODE_END -MACHINE_CONFIG_MEMBER(stfight_video_device::device_add_mconfig) +MACHINE_CONFIG_START(stfight_video_device::device_add_mconfig) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/video/tia.cpp b/src/mame/video/tia.cpp index 5164c6f0073..52090e14d2d 100644 --- a/src/mame/video/tia.cpp +++ b/src/mame/video/tia.cpp @@ -377,7 +377,7 @@ tia_pal_video_device::tia_pal_video_device(const machine_config &mconfig, const // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( tia_pal_video_device::device_add_mconfig ) +MACHINE_CONFIG_START(tia_pal_video_device::device_add_mconfig) MCFG_PALETTE_ADD("palette", TIA_PALETTE_LENGTH) MCFG_PALETTE_INIT_OWNER(tia_pal_video_device, tia_pal) MACHINE_CONFIG_END @@ -398,7 +398,7 @@ tia_ntsc_video_device::tia_ntsc_video_device(const machine_config &mconfig, cons // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER( tia_ntsc_video_device::device_add_mconfig ) +MACHINE_CONFIG_START(tia_ntsc_video_device::device_add_mconfig) MCFG_PALETTE_ADD("palette", TIA_PALETTE_LENGTH) MCFG_PALETTE_INIT_OWNER(tia_ntsc_video_device, tia_ntsc) MACHINE_CONFIG_END diff --git a/src/mame/video/tmc1800.cpp b/src/mame/video/tmc1800.cpp index 4e2e55b8186..28a6aa5646b 100644 --- a/src/mame/video/tmc1800.cpp +++ b/src/mame/video/tmc1800.cpp @@ -36,7 +36,7 @@ uint32_t osc1000b_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm /* Machine Drivers */ -MACHINE_CONFIG_START( tmc1800_video ) +MACHINE_CONFIG_START(tmc1800_state::tmc1800_video) MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL_1_75MHz) MCFG_CDP1861_IRQ_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT)) MCFG_CDP1861_DMA_OUT_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT)) @@ -44,7 +44,7 @@ MACHINE_CONFIG_START( tmc1800_video ) MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL_1_75MHz) MACHINE_CONFIG_END -MACHINE_CONFIG_START( osc1000b_video ) +MACHINE_CONFIG_START(osc1000b_state::osc1000b_video) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DRIVER(osc1000b_state, screen_update) MCFG_SCREEN_REFRESH_RATE(50) @@ -52,7 +52,7 @@ MACHINE_CONFIG_START( osc1000b_video ) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 199) MACHINE_CONFIG_END -MACHINE_CONFIG_START( tmc2000_video ) +MACHINE_CONFIG_START(tmc2000_state::tmc2000_video) MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL_1_75MHz) MCFG_SCREEN_UPDATE_DEVICE(CDP1864_TAG, cdp1864_device, screen_update) @@ -62,7 +62,7 @@ MACHINE_CONFIG_START( tmc2000_video ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_START( nano_video ) +MACHINE_CONFIG_START(nano_state::nano_video) MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL_1_75MHz) MCFG_SCREEN_UPDATE_DEVICE(CDP1864_TAG, cdp1864_device, screen_update) diff --git a/src/mame/video/tmc600.cpp b/src/mame/video/tmc600.cpp index 98d57b6eec9..2992c6b6709 100644 --- a/src/mame/video/tmc600.cpp +++ b/src/mame/video/tmc600.cpp @@ -115,7 +115,7 @@ static GFXDECODE_START( tmc600 ) GFXDECODE_ENTRY( "chargen", 0x0000, tmc600_charlayout, 0, 36 ) GFXDECODE_END -MACHINE_CONFIG_START( tmc600_video ) +MACHINE_CONFIG_START(tmc600_state::tmc600_video) // video hardware MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL) diff --git a/src/mame/video/v1050.cpp b/src/mame/video/v1050.cpp index 1b2fa821be9..12bdd6e15f6 100644 --- a/src/mame/video/v1050.cpp +++ b/src/mame/video/v1050.cpp @@ -109,7 +109,7 @@ void v1050_state::video_start() /* Machine Drivers */ -MACHINE_CONFIG_START( v1050_video ) +MACHINE_CONFIG_START(v1050_state::v1050_video) MCFG_MC6845_ADD(H46505_TAG, H46505, SCREEN_TAG, XTAL_15_36MHz/8) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) diff --git a/src/mame/video/vtvideo.cpp b/src/mame/video/vtvideo.cpp index 034020c2d0f..937d2580ec0 100644 --- a/src/mame/video/vtvideo.cpp +++ b/src/mame/video/vtvideo.cpp @@ -888,10 +888,10 @@ TIMER_CALLBACK_MEMBER(vt100_video_device::lba7_change) // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_MEMBER(vt100_video_device::device_add_mconfig) +MACHINE_CONFIG_START(vt100_video_device::device_add_mconfig) MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END -MACHINE_CONFIG_MEMBER(rainbow_video_device::device_add_mconfig) +MACHINE_CONFIG_START(rainbow_video_device::device_add_mconfig) MCFG_PALETTE_ADD("palette", 4) MACHINE_CONFIG_END diff --git a/src/mame/video/wpc_dmd.cpp b/src/mame/video/wpc_dmd.cpp index 03fe63efb14..441cbccab62 100644 --- a/src/mame/video/wpc_dmd.cpp +++ b/src/mame/video/wpc_dmd.cpp @@ -35,7 +35,7 @@ wpc_dmd_device::~wpc_dmd_device() { } -MACHINE_CONFIG_MEMBER( wpc_dmd_device::device_add_mconfig ) +MACHINE_CONFIG_START(wpc_dmd_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", LCD) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) diff --git a/src/mame/video/wswan.h b/src/mame/video/wswan.h index e6735ba768f..40c17e71c9c 100644 --- a/src/mame/video/wswan.h +++ b/src/mame/video/wswan.h @@ -35,10 +35,10 @@ typedef device_delegate wswan_video_dmasnd_cb_delegate; #define WSWAN_VIDEO_DMASND_CB_MEMBER(_name) void _name(void) #define MCFG_WSWAN_VIDEO_IRQ_CB(_class, _method) \ - wswan_video_device::set_irq_callback(*device, wswan_video_irq_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + wswan_video_device::set_irq_callback(*device, wswan_video_irq_cb_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_WSWAN_VIDEO_DMASND_CB(_class, _method) \ - wswan_video_device::set_dmasnd_callback(*device, wswan_video_dmasnd_cb_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner))); + wswan_video_device::set_dmasnd_callback(*device, wswan_video_dmasnd_cb_delegate(&_class::_method, #_class "::" #_method, this)); #define MCFG_WSWAN_VIDEO_TYPE( _type) \ wswan_video_device::set_vdp_type(*device, _type); -- cgit v1.2.3