summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2011-04-27 05:11:18 +0000
committer Aaron Giles <aaron@aarongiles.com>2011-04-27 05:11:18 +0000
commit919913f118760c0ca41ab63512bd5c106f6fd840 (patch)
treecd6c115c8e9c5280ac4bd16eabfe69c7341151c2 /src/mame/includes
parent84f2c31f7d6f6c667427b1d60c83e6dc9f420d60 (diff)
Collapsed device_config and device_t into one class. Updated all
existing modern devices and the legacy wrappers to work in this environment. This in general greatly simplifies writing a modern device. [Aaron Giles] General notes: * some more cleanup probably needs to happen behind this change, but I needed to get it in before the next device modernization or import from MESS :) * new template function device_creator which automatically defines the static function that creates the device; use this instead of creating a static_alloc_device_config function * added device_stop() method which is called at around the time the previous device_t's destructor was called; if you auto_free anything, do it here because the machine is gone when the destructor is called * changed the static_set_* calls to pass a device_t & instead of a device_config * * for many devices, the static config structure member names over- lapped the device's names for devcb_* functions; in these cases the members in the interface were renamed to have a _cb suffix * changed the driver_enumerator to only cache 100 machine_configs because caching them all took a ton of memory; fortunately this implementation detail is completely hidden behind the driver_enumerator interface * got rid of the macros for creating derived classes; doing it manually is now clean enough that it isn't worth hiding the details in a macro
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/1942.h4
-rw-r--r--src/mame/includes/1943.h4
-rw-r--r--src/mame/includes/20pacgal.h4
-rw-r--r--src/mame/includes/40love.h4
-rw-r--r--src/mame/includes/4enraya.h4
-rw-r--r--src/mame/includes/8080bw.h4
-rw-r--r--src/mame/includes/88games.h4
-rw-r--r--src/mame/includes/actfancr.h4
-rw-r--r--src/mame/includes/aeroboto.h4
-rw-r--r--src/mame/includes/aerofgt.h4
-rw-r--r--src/mame/includes/airbustr.h4
-rw-r--r--src/mame/includes/ajax.h4
-rw-r--r--src/mame/includes/aliens.h4
-rw-r--r--src/mame/includes/alpha68k.h4
-rw-r--r--src/mame/includes/ambush.h4
-rw-r--r--src/mame/includes/amiga.h4
-rw-r--r--src/mame/includes/ampoker2.h4
-rw-r--r--src/mame/includes/amspdwy.h4
-rw-r--r--src/mame/includes/angelkds.h4
-rw-r--r--src/mame/includes/appoooh.h4
-rw-r--r--src/mame/includes/aquarium.h4
-rw-r--r--src/mame/includes/arabian.h4
-rw-r--r--src/mame/includes/arcadecl.h4
-rw-r--r--src/mame/includes/argus.h4
-rw-r--r--src/mame/includes/arkanoid.h4
-rw-r--r--src/mame/includes/armedf.h8
-rw-r--r--src/mame/includes/artmagic.h4
-rw-r--r--src/mame/includes/ashnojoe.h4
-rw-r--r--src/mame/includes/asterix.h4
-rw-r--r--src/mame/includes/asteroid.h4
-rw-r--r--src/mame/includes/astrocde.h4
-rw-r--r--src/mame/includes/astrof.h4
-rw-r--r--src/mame/includes/asuka.h4
-rw-r--r--src/mame/includes/atarifb.h4
-rw-r--r--src/mame/includes/atarig1.h4
-rw-r--r--src/mame/includes/atarig42.h4
-rw-r--r--src/mame/includes/atarigt.h4
-rw-r--r--src/mame/includes/atarigx2.h4
-rw-r--r--src/mame/includes/atarisy1.h4
-rw-r--r--src/mame/includes/atarisy2.h4
-rw-r--r--src/mame/includes/atetris.h4
-rw-r--r--src/mame/includes/avalnche.h4
-rw-r--r--src/mame/includes/aztarac.h4
-rw-r--r--src/mame/includes/badlands.h4
-rw-r--r--src/mame/includes/bagman.h4
-rw-r--r--src/mame/includes/balsente.h4
-rw-r--r--src/mame/includes/bankp.h4
-rw-r--r--src/mame/includes/baraduke.h4
-rw-r--r--src/mame/includes/batman.h4
-rw-r--r--src/mame/includes/battlane.h4
-rw-r--r--src/mame/includes/battlera.h4
-rw-r--r--src/mame/includes/battlex.h4
-rw-r--r--src/mame/includes/battlnts.h4
-rw-r--r--src/mame/includes/bbusters.h4
-rw-r--r--src/mame/includes/beathead.h4
-rw-r--r--src/mame/includes/beezer.h4
-rw-r--r--src/mame/includes/bigevglf.h4
-rw-r--r--src/mame/includes/bigstrkb.h4
-rw-r--r--src/mame/includes/bionicc.h4
-rw-r--r--src/mame/includes/bishi.h4
-rw-r--r--src/mame/includes/bking.h4
-rw-r--r--src/mame/includes/bladestl.h4
-rw-r--r--src/mame/includes/blktiger.h4
-rw-r--r--src/mame/includes/blmbycar.h4
-rw-r--r--src/mame/includes/blockade.h4
-rw-r--r--src/mame/includes/blockhl.h4
-rw-r--r--src/mame/includes/blockout.h4
-rw-r--r--src/mame/includes/bloodbro.h4
-rw-r--r--src/mame/includes/blstroid.h4
-rw-r--r--src/mame/includes/blueprnt.h4
-rw-r--r--src/mame/includes/bogeyman.h4
-rw-r--r--src/mame/includes/bombjack.h4
-rw-r--r--src/mame/includes/boogwing.h4
-rw-r--r--src/mame/includes/bottom9.h4
-rw-r--r--src/mame/includes/brkthru.h4
-rw-r--r--src/mame/includes/bsktball.h4
-rw-r--r--src/mame/includes/btime.h4
-rw-r--r--src/mame/includes/btoads.h4
-rw-r--r--src/mame/includes/bublbobl.h4
-rw-r--r--src/mame/includes/buggychl.h4
-rw-r--r--src/mame/includes/bwing.h4
-rw-r--r--src/mame/includes/bzone.h4
-rw-r--r--src/mame/includes/cabal.h4
-rw-r--r--src/mame/includes/calomega.h4
-rw-r--r--src/mame/includes/canyon.h4
-rw-r--r--src/mame/includes/capbowl.h4
-rw-r--r--src/mame/includes/carjmbre.h4
-rw-r--r--src/mame/includes/carpolo.h4
-rw-r--r--src/mame/includes/cave.h4
-rw-r--r--src/mame/includes/cbasebal.h4
-rw-r--r--src/mame/includes/cbuster.h4
-rw-r--r--src/mame/includes/ccastles.h4
-rw-r--r--src/mame/includes/cchasm.h4
-rw-r--r--src/mame/includes/cclimber.h4
-rw-r--r--src/mame/includes/cd32.h4
-rw-r--r--src/mame/includes/cdi.h4
-rw-r--r--src/mame/includes/centiped.h4
-rw-r--r--src/mame/includes/chaknpop.h4
-rw-r--r--src/mame/includes/champbas.h4
-rw-r--r--src/mame/includes/changela.h4
-rw-r--r--src/mame/includes/cheekyms.h4
-rw-r--r--src/mame/includes/chqflag.h4
-rw-r--r--src/mame/includes/cidelsa.h8
-rw-r--r--src/mame/includes/cinemat.h4
-rw-r--r--src/mame/includes/circus.h4
-rw-r--r--src/mame/includes/circusc.h4
-rw-r--r--src/mame/includes/cischeat.h4
-rw-r--r--src/mame/includes/citycon.h4
-rw-r--r--src/mame/includes/cloak.h4
-rw-r--r--src/mame/includes/cloud9.h4
-rw-r--r--src/mame/includes/clshroad.h4
-rw-r--r--src/mame/includes/cninja.h4
-rw-r--r--src/mame/includes/combatsc.h4
-rw-r--r--src/mame/includes/commando.h4
-rw-r--r--src/mame/includes/compgolf.h4
-rw-r--r--src/mame/includes/contra.h4
-rw-r--r--src/mame/includes/coolpool.h4
-rw-r--r--src/mame/includes/cop01.h4
-rw-r--r--src/mame/includes/copsnrob.h4
-rw-r--r--src/mame/includes/cosmic.h4
-rw-r--r--src/mame/includes/cps1.h4
-rw-r--r--src/mame/includes/cps3.h4
-rw-r--r--src/mame/includes/crbaloon.h4
-rw-r--r--src/mame/includes/crgolf.h4
-rw-r--r--src/mame/includes/crimfght.h4
-rw-r--r--src/mame/includes/crospang.h4
-rw-r--r--src/mame/includes/crshrace.h4
-rw-r--r--src/mame/includes/cvs.h8
-rw-r--r--src/mame/includes/cyberbal.h4
-rw-r--r--src/mame/includes/darius.h4
-rw-r--r--src/mame/includes/darkmist.h4
-rw-r--r--src/mame/includes/darkseal.h4
-rw-r--r--src/mame/includes/dassault.h4
-rw-r--r--src/mame/includes/dbz.h4
-rw-r--r--src/mame/includes/dcheese.h4
-rw-r--r--src/mame/includes/dcon.h4
-rw-r--r--src/mame/includes/dday.h4
-rw-r--r--src/mame/includes/ddragon.h4
-rw-r--r--src/mame/includes/ddragon3.h4
-rw-r--r--src/mame/includes/ddribble.h4
-rw-r--r--src/mame/includes/deadang.h4
-rw-r--r--src/mame/includes/dec0.h4
-rw-r--r--src/mame/includes/dec8.h4
-rw-r--r--src/mame/includes/deco32.h8
-rw-r--r--src/mame/includes/deco_mlc.h4
-rw-r--r--src/mame/includes/deniam.h4
-rw-r--r--src/mame/includes/dietgo.h4
-rw-r--r--src/mame/includes/djboy.h4
-rw-r--r--src/mame/includes/djmain.h4
-rw-r--r--src/mame/includes/dkong.h4
-rw-r--r--src/mame/includes/docastle.h4
-rw-r--r--src/mame/includes/dogfgt.h4
-rw-r--r--src/mame/includes/dooyong.h4
-rw-r--r--src/mame/includes/dragrace.h4
-rw-r--r--src/mame/includes/drgnmst.h4
-rw-r--r--src/mame/includes/dribling.h4
-rw-r--r--src/mame/includes/drmicro.h4
-rw-r--r--src/mame/includes/dynax.h4
-rw-r--r--src/mame/includes/dynduke.h4
-rw-r--r--src/mame/includes/eolith.h4
-rw-r--r--src/mame/includes/epos.h4
-rw-r--r--src/mame/includes/eprom.h4
-rw-r--r--src/mame/includes/equites.h4
-rw-r--r--src/mame/includes/esd16.h4
-rw-r--r--src/mame/includes/espial.h4
-rw-r--r--src/mame/includes/esripsys.h4
-rw-r--r--src/mame/includes/exedexes.h4
-rw-r--r--src/mame/includes/exerion.h4
-rw-r--r--src/mame/includes/exidy.h4
-rw-r--r--src/mame/includes/exidy440.h4
-rw-r--r--src/mame/includes/exprraid.h4
-rw-r--r--src/mame/includes/exterm.h4
-rw-r--r--src/mame/includes/exzisus.h4
-rw-r--r--src/mame/includes/f1gp.h4
-rw-r--r--src/mame/includes/fantland.h4
-rw-r--r--src/mame/includes/fastfred.h4
-rw-r--r--src/mame/includes/fastlane.h4
-rw-r--r--src/mame/includes/fcombat.h4
-rw-r--r--src/mame/includes/fgoal.h4
-rw-r--r--src/mame/includes/finalizr.h4
-rw-r--r--src/mame/includes/firetrap.h4
-rw-r--r--src/mame/includes/firetrk.h4
-rw-r--r--src/mame/includes/fitfight.h4
-rw-r--r--src/mame/includes/flkatck.h4
-rw-r--r--src/mame/includes/flower.h4
-rw-r--r--src/mame/includes/flstory.h4
-rw-r--r--src/mame/includes/foodf.h4
-rw-r--r--src/mame/includes/freekick.h4
-rw-r--r--src/mame/includes/fromanc2.h4
-rw-r--r--src/mame/includes/fromance.h4
-rw-r--r--src/mame/includes/funkybee.h4
-rw-r--r--src/mame/includes/funkyjet.h4
-rw-r--r--src/mame/includes/funworld.h4
-rw-r--r--src/mame/includes/funybubl.h4
-rw-r--r--src/mame/includes/fuukifg2.h4
-rw-r--r--src/mame/includes/fuukifg3.h4
-rw-r--r--src/mame/includes/gaelco.h4
-rw-r--r--src/mame/includes/gaelco2.h4
-rw-r--r--src/mame/includes/gaelco3d.h4
-rw-r--r--src/mame/includes/gaiden.h4
-rw-r--r--src/mame/includes/galaga.h16
-rw-r--r--src/mame/includes/galastrm.h4
-rw-r--r--src/mame/includes/galaxian.h4
-rw-r--r--src/mame/includes/galaxold.h4
-rw-r--r--src/mame/includes/galivan.h4
-rw-r--r--src/mame/includes/galpani2.h4
-rw-r--r--src/mame/includes/galpanic.h4
-rw-r--r--src/mame/includes/galspnbl.h4
-rw-r--r--src/mame/includes/gameplan.h4
-rw-r--r--src/mame/includes/gaplus.h4
-rw-r--r--src/mame/includes/gatron.h4
-rw-r--r--src/mame/includes/gauntlet.h4
-rw-r--r--src/mame/includes/gberet.h4
-rw-r--r--src/mame/includes/gbusters.h4
-rw-r--r--src/mame/includes/gcpinbal.h4
-rw-r--r--src/mame/includes/gijoe.h4
-rw-r--r--src/mame/includes/ginganin.h4
-rw-r--r--src/mame/includes/gladiatr.h4
-rw-r--r--src/mame/includes/glass.h4
-rw-r--r--src/mame/includes/gng.h4
-rw-r--r--src/mame/includes/goal92.h4
-rw-r--r--src/mame/includes/goindol.h4
-rw-r--r--src/mame/includes/goldstar.h4
-rw-r--r--src/mame/includes/gomoku.h4
-rw-r--r--src/mame/includes/gotcha.h4
-rw-r--r--src/mame/includes/gottlieb.h4
-rw-r--r--src/mame/includes/gotya.h4
-rw-r--r--src/mame/includes/gradius3.h4
-rw-r--r--src/mame/includes/grchamp.h4
-rw-r--r--src/mame/includes/gridlee.h4
-rw-r--r--src/mame/includes/groundfx.h4
-rw-r--r--src/mame/includes/gstriker.h4
-rw-r--r--src/mame/includes/gsword.h4
-rw-r--r--src/mame/includes/gumbo.h4
-rw-r--r--src/mame/includes/gunbustr.h4
-rw-r--r--src/mame/includes/gundealr.h4
-rw-r--r--src/mame/includes/gunsmoke.h4
-rw-r--r--src/mame/includes/gyruss.h4
-rw-r--r--src/mame/includes/hanaawas.h4
-rw-r--r--src/mame/includes/harddriv.h4
-rw-r--r--src/mame/includes/hcastle.h4
-rw-r--r--src/mame/includes/hexion.h4
-rw-r--r--src/mame/includes/higemaru.h4
-rw-r--r--src/mame/includes/himesiki.h4
-rw-r--r--src/mame/includes/hitme.h4
-rw-r--r--src/mame/includes/hnayayoi.h4
-rw-r--r--src/mame/includes/hng64.h4
-rw-r--r--src/mame/includes/holeland.h4
-rw-r--r--src/mame/includes/homedata.h4
-rw-r--r--src/mame/includes/homerun.h4
-rw-r--r--src/mame/includes/hyhoo.h4
-rw-r--r--src/mame/includes/hyperspt.h4
-rw-r--r--src/mame/includes/hyprduel.h4
-rw-r--r--src/mame/includes/ikki.h4
-rw-r--r--src/mame/includes/inufuku.h4
-rw-r--r--src/mame/includes/iqblock.h4
-rw-r--r--src/mame/includes/irobot.h4
-rw-r--r--src/mame/includes/ironhors.h4
-rw-r--r--src/mame/includes/itech32.h4
-rw-r--r--src/mame/includes/itech8.h4
-rw-r--r--src/mame/includes/jack.h4
-rw-r--r--src/mame/includes/jackal.h4
-rw-r--r--src/mame/includes/jailbrek.h4
-rw-r--r--src/mame/includes/jedi.h4
-rw-r--r--src/mame/includes/jpmimpct.h4
-rw-r--r--src/mame/includes/kaneko16.h4
-rw-r--r--src/mame/includes/kangaroo.h4
-rw-r--r--src/mame/includes/karnov.h4
-rw-r--r--src/mame/includes/kchamp.h4
-rw-r--r--src/mame/includes/kickgoal.h4
-rw-r--r--src/mame/includes/kingobox.h4
-rw-r--r--src/mame/includes/klax.h4
-rw-r--r--src/mame/includes/kncljoe.h4
-rw-r--r--src/mame/includes/kopunch.h4
-rw-r--r--src/mame/includes/ksayakyu.h4
-rw-r--r--src/mame/includes/kyugo.h4
-rw-r--r--src/mame/includes/labyrunr.h4
-rw-r--r--src/mame/includes/ladybug.h4
-rw-r--r--src/mame/includes/ladyfrog.h4
-rw-r--r--src/mame/includes/laserbat.h4
-rw-r--r--src/mame/includes/lasso.h4
-rw-r--r--src/mame/includes/lastduel.h4
-rw-r--r--src/mame/includes/lazercmd.h4
-rw-r--r--src/mame/includes/legionna.h4
-rw-r--r--src/mame/includes/leland.h4
-rw-r--r--src/mame/includes/lemmings.h4
-rw-r--r--src/mame/includes/lethal.h4
-rw-r--r--src/mame/includes/lethalj.h4
-rw-r--r--src/mame/includes/liberate.h4
-rw-r--r--src/mame/includes/liberatr.h4
-rw-r--r--src/mame/includes/lkage.h4
-rw-r--r--src/mame/includes/lockon.h4
-rw-r--r--src/mame/includes/lordgun.h4
-rw-r--r--src/mame/includes/lsasquad.h4
-rw-r--r--src/mame/includes/lucky74.h4
-rw-r--r--src/mame/includes/lvcards.h4
-rw-r--r--src/mame/includes/lwings.h4
-rw-r--r--src/mame/includes/m10.h4
-rw-r--r--src/mame/includes/m107.h4
-rw-r--r--src/mame/includes/m52.h4
-rw-r--r--src/mame/includes/m57.h4
-rw-r--r--src/mame/includes/m58.h4
-rw-r--r--src/mame/includes/m62.h4
-rw-r--r--src/mame/includes/m72.h4
-rw-r--r--src/mame/includes/m90.h4
-rw-r--r--src/mame/includes/m92.h4
-rw-r--r--src/mame/includes/macrossp.h4
-rw-r--r--src/mame/includes/madalien.h4
-rw-r--r--src/mame/includes/madmotor.h4
-rw-r--r--src/mame/includes/magmax.h4
-rw-r--r--src/mame/includes/mainevt.h4
-rw-r--r--src/mame/includes/mainsnk.h4
-rw-r--r--src/mame/includes/malzak.h4
-rw-r--r--src/mame/includes/mappy.h4
-rw-r--r--src/mame/includes/marineb.h4
-rw-r--r--src/mame/includes/mario.h4
-rw-r--r--src/mame/includes/markham.h4
-rw-r--r--src/mame/includes/matmania.h4
-rw-r--r--src/mame/includes/mcatadv.h4
-rw-r--r--src/mame/includes/mcr.h4
-rw-r--r--src/mame/includes/mcr3.h4
-rw-r--r--src/mame/includes/mcr68.h4
-rw-r--r--src/mame/includes/meadows.h4
-rw-r--r--src/mame/includes/megadriv.h40
-rw-r--r--src/mame/includes/megasys1.h4
-rw-r--r--src/mame/includes/megazone.h4
-rw-r--r--src/mame/includes/mermaid.h4
-rw-r--r--src/mame/includes/metalmx.h4
-rw-r--r--src/mame/includes/metlclsh.h4
-rw-r--r--src/mame/includes/metro.h4
-rw-r--r--src/mame/includes/mexico86.h4
-rw-r--r--src/mame/includes/mhavoc.h4
-rw-r--r--src/mame/includes/micro3d.h4
-rw-r--r--src/mame/includes/midtunit.h4
-rw-r--r--src/mame/includes/midvunit.h4
-rw-r--r--src/mame/includes/midwunit.h4
-rw-r--r--src/mame/includes/midxunit.h4
-rw-r--r--src/mame/includes/midyunit.h4
-rw-r--r--src/mame/includes/midzeus.h4
-rw-r--r--src/mame/includes/mikie.h4
-rw-r--r--src/mame/includes/mitchell.h4
-rw-r--r--src/mame/includes/mjkjidai.h4
-rw-r--r--src/mame/includes/model1.h4
-rw-r--r--src/mame/includes/model2.h4
-rw-r--r--src/mame/includes/model3.h4
-rw-r--r--src/mame/includes/momoko.h4
-rw-r--r--src/mame/includes/moo.h4
-rw-r--r--src/mame/includes/mosaic.h4
-rw-r--r--src/mame/includes/mouser.h4
-rw-r--r--src/mame/includes/mrdo.h4
-rw-r--r--src/mame/includes/mrflea.h4
-rw-r--r--src/mame/includes/mrjong.h4
-rw-r--r--src/mame/includes/ms32.h4
-rw-r--r--src/mame/includes/msisaac.h4
-rw-r--r--src/mame/includes/mugsmash.h4
-rw-r--r--src/mame/includes/multfish.h4
-rw-r--r--src/mame/includes/munchmo.h4
-rw-r--r--src/mame/includes/mustache.h4
-rw-r--r--src/mame/includes/mw8080bw.h4
-rw-r--r--src/mame/includes/mystston.h4
-rw-r--r--src/mame/includes/mystwarr.h4
-rw-r--r--src/mame/includes/n64.h4
-rw-r--r--src/mame/includes/n8080.h4
-rw-r--r--src/mame/includes/namcofl.h4
-rw-r--r--src/mame/includes/namcona1.h4
-rw-r--r--src/mame/includes/namconb1.h4
-rw-r--r--src/mame/includes/namcond1.h4
-rw-r--r--src/mame/includes/namcos1.h4
-rw-r--r--src/mame/includes/namcos21.h4
-rw-r--r--src/mame/includes/namcos22.h4
-rw-r--r--src/mame/includes/namcos86.h4
-rw-r--r--src/mame/includes/naughtyb.h4
-rw-r--r--src/mame/includes/nbmj8688.h4
-rw-r--r--src/mame/includes/nbmj8891.h4
-rw-r--r--src/mame/includes/nbmj8900.h4
-rw-r--r--src/mame/includes/nbmj8991.h4
-rw-r--r--src/mame/includes/nbmj9195.h4
-rw-r--r--src/mame/includes/nemesis.h4
-rw-r--r--src/mame/includes/neogeo.h4
-rw-r--r--src/mame/includes/news.h4
-rw-r--r--src/mame/includes/ninjakd2.h4
-rw-r--r--src/mame/includes/ninjaw.h4
-rw-r--r--src/mame/includes/nitedrvr.h4
-rw-r--r--src/mame/includes/niyanpai.h4
-rw-r--r--src/mame/includes/nmk16.h4
-rw-r--r--src/mame/includes/norautp.h4
-rw-r--r--src/mame/includes/nova2001.h4
-rw-r--r--src/mame/includes/nycaptor.h4
-rw-r--r--src/mame/includes/offtwall.h4
-rw-r--r--src/mame/includes/ohmygod.h4
-rw-r--r--src/mame/includes/ojankohs.h4
-rw-r--r--src/mame/includes/oneshot.h4
-rw-r--r--src/mame/includes/opwolf.h4
-rw-r--r--src/mame/includes/orbit.h4
-rw-r--r--src/mame/includes/othldrby.h4
-rw-r--r--src/mame/includes/othunder.h4
-rw-r--r--src/mame/includes/overdriv.h4
-rw-r--r--src/mame/includes/pacland.h4
-rw-r--r--src/mame/includes/pacman.h4
-rw-r--r--src/mame/includes/pandoras.h4
-rw-r--r--src/mame/includes/paradise.h4
-rw-r--r--src/mame/includes/parodius.h4
-rw-r--r--src/mame/includes/pass.h4
-rw-r--r--src/mame/includes/pastelg.h4
-rw-r--r--src/mame/includes/pbaction.h4
-rw-r--r--src/mame/includes/pcktgal.h4
-rw-r--r--src/mame/includes/pgm.h4
-rw-r--r--src/mame/includes/phoenix.h4
-rw-r--r--src/mame/includes/pingpong.h4
-rw-r--r--src/mame/includes/pirates.h4
-rw-r--r--src/mame/includes/pitnrun.h4
-rw-r--r--src/mame/includes/pktgaldx.h4
-rw-r--r--src/mame/includes/playch10.h4
-rw-r--r--src/mame/includes/playmark.h4
-rw-r--r--src/mame/includes/plygonet.h4
-rw-r--r--src/mame/includes/pokechmp.h4
-rw-r--r--src/mame/includes/polepos.h4
-rw-r--r--src/mame/includes/policetr.h4
-rw-r--r--src/mame/includes/polyplay.h4
-rw-r--r--src/mame/includes/poolshrk.h4
-rw-r--r--src/mame/includes/pooyan.h4
-rw-r--r--src/mame/includes/popeye.h4
-rw-r--r--src/mame/includes/popper.h4
-rw-r--r--src/mame/includes/portrait.h4
-rw-r--r--src/mame/includes/powerins.h4
-rw-r--r--src/mame/includes/prehisle.h4
-rw-r--r--src/mame/includes/psikyo.h4
-rw-r--r--src/mame/includes/psikyo4.h4
-rw-r--r--src/mame/includes/psikyosh.h4
-rw-r--r--src/mame/includes/psx.h4
-rw-r--r--src/mame/includes/psychic5.h4
-rw-r--r--src/mame/includes/punchout.h4
-rw-r--r--src/mame/includes/pushman.h4
-rw-r--r--src/mame/includes/qdrmfgp.h4
-rw-r--r--src/mame/includes/qix.h4
-rw-r--r--src/mame/includes/quizdna.h4
-rw-r--r--src/mame/includes/quizpani.h4
-rw-r--r--src/mame/includes/raiden.h4
-rw-r--r--src/mame/includes/raiden2.h4
-rw-r--r--src/mame/includes/rainbow.h4
-rw-r--r--src/mame/includes/rallyx.h4
-rw-r--r--src/mame/includes/rampart.h4
-rw-r--r--src/mame/includes/rastan.h4
-rw-r--r--src/mame/includes/realbrk.h4
-rw-r--r--src/mame/includes/redalert.h4
-rw-r--r--src/mame/includes/relief.h4
-rw-r--r--src/mame/includes/renegade.h4
-rw-r--r--src/mame/includes/retofinv.h4
-rw-r--r--src/mame/includes/rockrage.h4
-rw-r--r--src/mame/includes/rocnrope.h4
-rw-r--r--src/mame/includes/rohga.h4
-rw-r--r--src/mame/includes/rollerg.h4
-rw-r--r--src/mame/includes/rollrace.h4
-rw-r--r--src/mame/includes/route16.h4
-rw-r--r--src/mame/includes/rpunch.h4
-rw-r--r--src/mame/includes/runaway.h4
-rw-r--r--src/mame/includes/rungun.h4
-rw-r--r--src/mame/includes/sauro.h4
-rw-r--r--src/mame/includes/sbasketb.h4
-rw-r--r--src/mame/includes/sbugger.h4
-rw-r--r--src/mame/includes/scotrsht.h4
-rw-r--r--src/mame/includes/scramble.h4
-rw-r--r--src/mame/includes/sderby.h4
-rw-r--r--src/mame/includes/segag80r.h4
-rw-r--r--src/mame/includes/segag80v.h4
-rw-r--r--src/mame/includes/segas16.h4
-rw-r--r--src/mame/includes/segas24.h4
-rw-r--r--src/mame/includes/segas32.h4
-rw-r--r--src/mame/includes/seibuspi.h4
-rw-r--r--src/mame/includes/seicross.h4
-rw-r--r--src/mame/includes/senjyo.h4
-rw-r--r--src/mame/includes/seta.h4
-rw-r--r--src/mame/includes/seta2.h4
-rw-r--r--src/mame/includes/sf.h4
-rw-r--r--src/mame/includes/shadfrce.h4
-rw-r--r--src/mame/includes/shangha3.h4
-rw-r--r--src/mame/includes/shangkid.h4
-rw-r--r--src/mame/includes/shaolins.h4
-rw-r--r--src/mame/includes/shisen.h4
-rw-r--r--src/mame/includes/shootout.h4
-rw-r--r--src/mame/includes/shuuz.h4
-rw-r--r--src/mame/includes/sidearms.h4
-rw-r--r--src/mame/includes/sidepckt.h4
-rw-r--r--src/mame/includes/silkroad.h4
-rw-r--r--src/mame/includes/simpl156.h4
-rw-r--r--src/mame/includes/simpsons.h4
-rw-r--r--src/mame/includes/skullxbo.h4
-rw-r--r--src/mame/includes/skydiver.h4
-rw-r--r--src/mame/includes/skyfox.h4
-rw-r--r--src/mame/includes/skykid.h4
-rw-r--r--src/mame/includes/skyraid.h4
-rw-r--r--src/mame/includes/slapfght.h4
-rw-r--r--src/mame/includes/slapshot.h4
-rw-r--r--src/mame/includes/snes.h4
-rw-r--r--src/mame/includes/snk.h4
-rw-r--r--src/mame/includes/snk6502.h4
-rw-r--r--src/mame/includes/snk68.h4
-rw-r--r--src/mame/includes/snookr10.h4
-rw-r--r--src/mame/includes/snowbros.h4
-rw-r--r--src/mame/includes/solomon.h4
-rw-r--r--src/mame/includes/sonson.h4
-rw-r--r--src/mame/includes/spacefb.h4
-rw-r--r--src/mame/includes/spbactn.h4
-rw-r--r--src/mame/includes/spcforce.h4
-rw-r--r--src/mame/includes/spdodgeb.h4
-rw-r--r--src/mame/includes/speedatk.h4
-rw-r--r--src/mame/includes/speedbal.h4
-rw-r--r--src/mame/includes/speedspn.h4
-rw-r--r--src/mame/includes/spiders.h4
-rw-r--r--src/mame/includes/splash.h4
-rw-r--r--src/mame/includes/sprcros2.h4
-rw-r--r--src/mame/includes/sprint2.h4
-rw-r--r--src/mame/includes/sprint4.h4
-rw-r--r--src/mame/includes/sprint8.h4
-rw-r--r--src/mame/includes/spy.h4
-rw-r--r--src/mame/includes/srmp2.h4
-rw-r--r--src/mame/includes/srumbler.h4
-rw-r--r--src/mame/includes/sshangha.h4
-rw-r--r--src/mame/includes/sslam.h4
-rw-r--r--src/mame/includes/ssozumo.h4
-rw-r--r--src/mame/includes/sspeedr.h4
-rw-r--r--src/mame/includes/ssrj.h4
-rw-r--r--src/mame/includes/ssv.h4
-rw-r--r--src/mame/includes/stactics.h4
-rw-r--r--src/mame/includes/stadhero.h4
-rw-r--r--src/mame/includes/starcrus.h4
-rw-r--r--src/mame/includes/starfire.h4
-rw-r--r--src/mame/includes/starshp1.h4
-rw-r--r--src/mame/includes/starwars.h4
-rw-r--r--src/mame/includes/stfight.h4
-rw-r--r--src/mame/includes/stlforce.h4
-rw-r--r--src/mame/includes/strnskil.h4
-rw-r--r--src/mame/includes/subs.h4
-rw-r--r--src/mame/includes/suna16.h4
-rw-r--r--src/mame/includes/suna8.h4
-rw-r--r--src/mame/includes/supbtime.h4
-rw-r--r--src/mame/includes/superchs.h4
-rw-r--r--src/mame/includes/superqix.h4
-rw-r--r--src/mame/includes/suprloco.h4
-rw-r--r--src/mame/includes/suprnova.h4
-rw-r--r--src/mame/includes/suprridr.h4
-rw-r--r--src/mame/includes/suprslam.h4
-rw-r--r--src/mame/includes/surpratk.h4
-rw-r--r--src/mame/includes/system1.h4
-rw-r--r--src/mame/includes/system16.h4
-rw-r--r--src/mame/includes/tagteam.h4
-rw-r--r--src/mame/includes/tail2nos.h4
-rw-r--r--src/mame/includes/taito_b.h4
-rw-r--r--src/mame/includes/taito_f2.h4
-rw-r--r--src/mame/includes/taito_f3.h4
-rw-r--r--src/mame/includes/taito_h.h4
-rw-r--r--src/mame/includes/taito_l.h4
-rw-r--r--src/mame/includes/taito_o.h4
-rw-r--r--src/mame/includes/taito_z.h4
-rw-r--r--src/mame/includes/taitoair.h4
-rw-r--r--src/mame/includes/taitojc.h4
-rw-r--r--src/mame/includes/taitosj.h4
-rw-r--r--src/mame/includes/tank8.h4
-rw-r--r--src/mame/includes/tankbatt.h4
-rw-r--r--src/mame/includes/tankbust.h4
-rw-r--r--src/mame/includes/taotaido.h4
-rw-r--r--src/mame/includes/targeth.h4
-rw-r--r--src/mame/includes/tatsumi.h4
-rw-r--r--src/mame/includes/taxidrvr.h4
-rw-r--r--src/mame/includes/tbowl.h4
-rw-r--r--src/mame/includes/tceptor.h4
-rw-r--r--src/mame/includes/tecmo.h4
-rw-r--r--src/mame/includes/tecmo16.h4
-rw-r--r--src/mame/includes/tecmosys.h4
-rw-r--r--src/mame/includes/tehkanwc.h4
-rw-r--r--src/mame/includes/terracre.h4
-rw-r--r--src/mame/includes/tetrisp2.h4
-rw-r--r--src/mame/includes/thedeep.h4
-rw-r--r--src/mame/includes/thepit.h4
-rw-r--r--src/mame/includes/thief.h4
-rw-r--r--src/mame/includes/thoop2.h4
-rw-r--r--src/mame/includes/thunderj.h4
-rw-r--r--src/mame/includes/thunderx.h4
-rw-r--r--src/mame/includes/tiamc1.h4
-rw-r--r--src/mame/includes/tigeroad.h4
-rw-r--r--src/mame/includes/timelimt.h4
-rw-r--r--src/mame/includes/timeplt.h4
-rw-r--r--src/mame/includes/tmnt.h4
-rw-r--r--src/mame/includes/tnzs.h4
-rw-r--r--src/mame/includes/toaplan1.h4
-rw-r--r--src/mame/includes/toaplan2.h4
-rw-r--r--src/mame/includes/toki.h4
-rw-r--r--src/mame/includes/toobin.h4
-rw-r--r--src/mame/includes/topspeed.h4
-rw-r--r--src/mame/includes/toypop.h4
-rw-r--r--src/mame/includes/tp84.h4
-rw-r--r--src/mame/includes/trackfld.h4
-rw-r--r--src/mame/includes/travrusa.h4
-rw-r--r--src/mame/includes/triplhnt.h4
-rw-r--r--src/mame/includes/truco.h4
-rw-r--r--src/mame/includes/trucocl.h4
-rw-r--r--src/mame/includes/tryout.h4
-rw-r--r--src/mame/includes/tsamurai.h4
-rw-r--r--src/mame/includes/tubep.h4
-rw-r--r--src/mame/includes/tumbleb.h4
-rw-r--r--src/mame/includes/tumblep.h4
-rw-r--r--src/mame/includes/tunhunt.h4
-rw-r--r--src/mame/includes/turbo.h4
-rw-r--r--src/mame/includes/tutankhm.h4
-rw-r--r--src/mame/includes/twin16.h4
-rw-r--r--src/mame/includes/twincobr.h4
-rw-r--r--src/mame/includes/tx1.h4
-rw-r--r--src/mame/includes/ultraman.h4
-rw-r--r--src/mame/includes/ultratnk.h4
-rw-r--r--src/mame/includes/undrfire.h4
-rw-r--r--src/mame/includes/unico.h4
-rw-r--r--src/mame/includes/usgames.h4
-rw-r--r--src/mame/includes/vaportra.h4
-rw-r--r--src/mame/includes/vastar.h4
-rw-r--r--src/mame/includes/vball.h4
-rw-r--r--src/mame/includes/vendetta.h4
-rw-r--r--src/mame/includes/vertigo.h13
-rw-r--r--src/mame/includes/vicdual.h4
-rw-r--r--src/mame/includes/victory.h4
-rw-r--r--src/mame/includes/videopin.h4
-rw-r--r--src/mame/includes/vigilant.h4
-rw-r--r--src/mame/includes/vindictr.h4
-rw-r--r--src/mame/includes/volfied.h4
-rw-r--r--src/mame/includes/vsnes.h4
-rw-r--r--src/mame/includes/vulgus.h4
-rw-r--r--src/mame/includes/warpwarp.h4
-rw-r--r--src/mame/includes/warriorb.h4
-rw-r--r--src/mame/includes/wc90.h4
-rw-r--r--src/mame/includes/wc90b.h4
-rw-r--r--src/mame/includes/wecleman.h4
-rw-r--r--src/mame/includes/welltris.h4
-rw-r--r--src/mame/includes/wgp.h4
-rw-r--r--src/mame/includes/williams.h4
-rw-r--r--src/mame/includes/wiping.h4
-rw-r--r--src/mame/includes/wiz.h4
-rw-r--r--src/mame/includes/wolfpack.h4
-rw-r--r--src/mame/includes/wrally.h4
-rw-r--r--src/mame/includes/wwfsstar.h4
-rw-r--r--src/mame/includes/wwfwfest.h4
-rw-r--r--src/mame/includes/xain.h4
-rw-r--r--src/mame/includes/xexex.h4
-rw-r--r--src/mame/includes/xmen.h4
-rw-r--r--src/mame/includes/xorworld.h4
-rw-r--r--src/mame/includes/xxmissio.h4
-rw-r--r--src/mame/includes/xybots.h4
-rw-r--r--src/mame/includes/xyonix.h4
-rw-r--r--src/mame/includes/yiear.h4
-rw-r--r--src/mame/includes/yunsun16.h4
-rw-r--r--src/mame/includes/yunsung8.h4
-rw-r--r--src/mame/includes/zac2650.h4
-rw-r--r--src/mame/includes/zaccaria.h4
-rw-r--r--src/mame/includes/zaxxon.h4
-rw-r--r--src/mame/includes/zerozone.h4
-rw-r--r--src/mame/includes/zodiack.h4
654 files changed, 1343 insertions, 1346 deletions
diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h
index b146f1d8e05..bfd3b40c2b8 100644
--- a/src/mame/includes/1942.h
+++ b/src/mame/includes/1942.h
@@ -7,8 +7,8 @@
class _1942_state : public driver_device
{
public:
- _1942_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ _1942_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_fg_videoram;
diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h
index 6988726c630..b59e5df0eb5 100644
--- a/src/mame/includes/1943.h
+++ b/src/mame/includes/1943.h
@@ -7,8 +7,8 @@
class _1943_state : public driver_device
{
public:
- _1943_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ _1943_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/20pacgal.h b/src/mame/includes/20pacgal.h
index ffb8e294ed4..a9b775e122e 100644
--- a/src/mame/includes/20pacgal.h
+++ b/src/mame/includes/20pacgal.h
@@ -10,8 +10,8 @@
class _20pacgal_state : public driver_device
{
public:
- _20pacgal_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ _20pacgal_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 *m_char_gfx_ram;
diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h
index 0ac4986d9c2..0a4a3ed4565 100644
--- a/src/mame/includes/40love.h
+++ b/src/mame/includes/40love.h
@@ -1,8 +1,8 @@
class fortyl_state : public driver_device
{
public:
- fortyl_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ fortyl_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h
index e85fda6e67a..80443d68d4e 100644
--- a/src/mame/includes/4enraya.h
+++ b/src/mame/includes/4enraya.h
@@ -7,8 +7,8 @@
class _4enraya_state : public driver_device
{
public:
- _4enraya_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ _4enraya_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 m_videoram[0x1000];
diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h
index 07ae3f9eff0..e75099bccc6 100644
--- a/src/mame/includes/8080bw.h
+++ b/src/mame/includes/8080bw.h
@@ -13,8 +13,8 @@
class _8080bw_state : public mw8080bw_state
{
public:
- _8080bw_state(running_machine &machine, const driver_device_config_base &config)
- : mw8080bw_state(machine, config) { }
+ _8080bw_state(const machine_config &mconfig, device_type type, const char *tag)
+ : mw8080bw_state(mconfig, type, tag) { }
/* misc game specific */
emu_timer *m_schaser_effect_555_timer;
diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h
index 039451ffb46..adf3ef8b12c 100644
--- a/src/mame/includes/88games.h
+++ b/src/mame/includes/88games.h
@@ -7,8 +7,8 @@
class _88games_state : public driver_device
{
public:
- _88games_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ _88games_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_ram;
diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h
index 5b5b7a49b10..066d05736a3 100644
--- a/src/mame/includes/actfancr.h
+++ b/src/mame/includes/actfancr.h
@@ -7,8 +7,8 @@
class actfancr_state : public driver_device
{
public:
- actfancr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ actfancr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_main_ram;
diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h
index 7b9dbe09173..cf08f9a7146 100644
--- a/src/mame/includes/aeroboto.h
+++ b/src/mame/includes/aeroboto.h
@@ -7,8 +7,8 @@
class aeroboto_state : public driver_device
{
public:
- aeroboto_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ aeroboto_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_mainram;
diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h
index 3c40658afa0..ef3df6c8929 100644
--- a/src/mame/includes/aerofgt.h
+++ b/src/mame/includes/aerofgt.h
@@ -2,8 +2,8 @@
class aerofgt_state : public driver_device
{
public:
- aerofgt_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ aerofgt_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_bg1videoram;
diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h
index 2d4bd18335d..a8e3538392c 100644
--- a/src/mame/includes/airbustr.h
+++ b/src/mame/includes/airbustr.h
@@ -7,8 +7,8 @@
class airbustr_state : public driver_device
{
public:
- airbustr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ airbustr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h
index a26cfd29a4f..f9e6fd08a56 100644
--- a/src/mame/includes/ajax.h
+++ b/src/mame/includes/ajax.h
@@ -2,8 +2,8 @@
class ajax_state : public driver_device
{
public:
- ajax_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ajax_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT8 * m_paletteram; // currently this uses generic palette handling
diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h
index 3767a38faee..2180af2f237 100644
--- a/src/mame/includes/aliens.h
+++ b/src/mame/includes/aliens.h
@@ -7,8 +7,8 @@
class aliens_state : public driver_device
{
public:
- aliens_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ aliens_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_ram;
diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h
index 1aa7a58cb54..b104fbe4e18 100644
--- a/src/mame/includes/alpha68k.h
+++ b/src/mame/includes/alpha68k.h
@@ -7,8 +7,8 @@
class alpha68k_state : public driver_device
{
public:
- alpha68k_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ alpha68k_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram;
diff --git a/src/mame/includes/ambush.h b/src/mame/includes/ambush.h
index fc369e3fdf7..212c864de0d 100644
--- a/src/mame/includes/ambush.h
+++ b/src/mame/includes/ambush.h
@@ -7,8 +7,8 @@
class ambush_state : public driver_device
{
public:
- ambush_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ambush_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h
index 24a98b5fe69..c11bb725361 100644
--- a/src/mame/includes/amiga.h
+++ b/src/mame/includes/amiga.h
@@ -375,8 +375,8 @@ struct _autoconfig_device
class amiga_state : public driver_device
{
public:
- amiga_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ amiga_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_chip_ram;
size_t m_chip_ram_size;
diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h
index 114a47a9c25..5c2284c8874 100644
--- a/src/mame/includes/ampoker2.h
+++ b/src/mame/includes/ampoker2.h
@@ -1,8 +1,8 @@
class ampoker2_state : public driver_device
{
public:
- ampoker2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ampoker2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
tilemap_t *m_bg_tilemap;
diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h
index 41ecb4b7caa..46ac2027bb1 100644
--- a/src/mame/includes/amspdwy.h
+++ b/src/mame/includes/amspdwy.h
@@ -7,8 +7,8 @@
class amspdwy_state : public driver_device
{
public:
- amspdwy_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ amspdwy_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h
index dd9530540c2..5c4d0f8bd07 100644
--- a/src/mame/includes/angelkds.h
+++ b/src/mame/includes/angelkds.h
@@ -7,8 +7,8 @@
class angelkds_state : public driver_device
{
public:
- angelkds_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ angelkds_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_paletteram;
diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h
index 7fae09c0273..769e7d78ed4 100644
--- a/src/mame/includes/appoooh.h
+++ b/src/mame/includes/appoooh.h
@@ -3,8 +3,8 @@
class appoooh_state : public driver_device
{
public:
- appoooh_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ appoooh_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bg_videoram;
diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h
index aafdce7a669..578e9a1e660 100644
--- a/src/mame/includes/aquarium.h
+++ b/src/mame/includes/aquarium.h
@@ -4,8 +4,8 @@
class aquarium_state : public driver_device
{
public:
- aquarium_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ aquarium_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_scroll;
diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h
index 6691e672dd6..d160b8812c1 100644
--- a/src/mame/includes/arabian.h
+++ b/src/mame/includes/arabian.h
@@ -9,8 +9,8 @@
class arabian_state : public driver_device
{
public:
- arabian_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ arabian_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_blitter;
diff --git a/src/mame/includes/arcadecl.h b/src/mame/includes/arcadecl.h
index fd54696f44d..c139b91c191 100644
--- a/src/mame/includes/arcadecl.h
+++ b/src/mame/includes/arcadecl.h
@@ -10,8 +10,8 @@
class arcadecl_state : public atarigen_state
{
public:
- arcadecl_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ arcadecl_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT16 * m_bitmap;
UINT8 m_has_mo;
diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h
index 35a10f783e9..43a8b4c66b9 100644
--- a/src/mame/includes/argus.h
+++ b/src/mame/includes/argus.h
@@ -1,8 +1,8 @@
class argus_state : public driver_device
{
public:
- argus_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ argus_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_paletteram;
UINT8 *m_txram;
diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h
index ac83ae91c90..b12fe8595e0 100644
--- a/src/mame/includes/arkanoid.h
+++ b/src/mame/includes/arkanoid.h
@@ -13,8 +13,8 @@ enum {
class arkanoid_state : public driver_device
{
public:
- arkanoid_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ arkanoid_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h
index 3b73a732b8c..725e28f786c 100644
--- a/src/mame/includes/armedf.h
+++ b/src/mame/includes/armedf.h
@@ -2,8 +2,8 @@
class armedf_state : public driver_device
{
public:
- armedf_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ armedf_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_text_videoram;
@@ -33,8 +33,8 @@ public:
class bigfghtr_state : public armedf_state
{
public:
- bigfghtr_state(running_machine &machine, const driver_device_config_base &config)
- : armedf_state(machine, config) { }
+ bigfghtr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : armedf_state(mconfig, type, tag) { }
UINT16 * m_sharedram;
diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h
index d05e8c66fbd..0b2ab227b81 100644
--- a/src/mame/includes/artmagic.h
+++ b/src/mame/includes/artmagic.h
@@ -7,8 +7,8 @@
class artmagic_state : public driver_device
{
public:
- artmagic_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ artmagic_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_control;
UINT8 m_tms_irq;
diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h
index ed589e92a5d..661b5fcb69f 100644
--- a/src/mame/includes/ashnojoe.h
+++ b/src/mame/includes/ashnojoe.h
@@ -7,8 +7,8 @@
class ashnojoe_state : public driver_device
{
public:
- ashnojoe_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ashnojoe_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_tileram;
diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h
index edb9e686149..fcac032cfd2 100644
--- a/src/mame/includes/asterix.h
+++ b/src/mame/includes/asterix.h
@@ -7,8 +7,8 @@
class asterix_state : public driver_device
{
public:
- asterix_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ asterix_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT16 * m_paletteram; // currently this uses generic palette handling
diff --git a/src/mame/includes/asteroid.h b/src/mame/includes/asteroid.h
index 159096392e0..61d96b9f959 100644
--- a/src/mame/includes/asteroid.h
+++ b/src/mame/includes/asteroid.h
@@ -9,8 +9,8 @@
class asteroid_state : public driver_device
{
public:
- asteroid_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ asteroid_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_ram1;
UINT8 *m_ram2;
diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h
index dd6e54f5cf4..5357f85b35c 100644
--- a/src/mame/includes/astrocde.h
+++ b/src/mame/includes/astrocde.h
@@ -15,8 +15,8 @@
class astrocde_state : public driver_device
{
public:
- astrocde_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ astrocde_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 m_video_config;
diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h
index 4a077716cac..246cad2598f 100644
--- a/src/mame/includes/astrof.h
+++ b/src/mame/includes/astrof.h
@@ -7,8 +7,8 @@
class astrof_state : public driver_device
{
public:
- astrof_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ astrof_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* video-related */
UINT8 * m_videoram;
diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h
index 04f77809e70..d022ccfead8 100644
--- a/src/mame/includes/asuka.h
+++ b/src/mame/includes/asuka.h
@@ -7,8 +7,8 @@
class asuka_state : public driver_device
{
public:
- asuka_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ asuka_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT16 * paletteram; // this currently uses generic palette handlers
diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h
index eb39a2007ec..47ecdbd01a8 100644
--- a/src/mame/includes/atarifb.h
+++ b/src/mame/includes/atarifb.h
@@ -18,8 +18,8 @@
class atarifb_state : public driver_device
{
public:
- atarifb_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ atarifb_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* video-related */
UINT8 * m_alphap1_videoram;
diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h
index 3382d5051f2..68621a68610 100644
--- a/src/mame/includes/atarig1.h
+++ b/src/mame/includes/atarig1.h
@@ -9,8 +9,8 @@
class atarig1_state : public atarigen_state
{
public:
- atarig1_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ atarig1_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT8 m_is_pitfight;
diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h
index 218237deaa2..735775246b5 100644
--- a/src/mame/includes/atarig42.h
+++ b/src/mame/includes/atarig42.h
@@ -9,8 +9,8 @@
class atarig42_state : public atarigen_state
{
public:
- atarig42_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ atarig42_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT16 m_playfield_base;
diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h
index 746ad541dd4..9e04721d894 100644
--- a/src/mame/includes/atarigt.h
+++ b/src/mame/includes/atarigt.h
@@ -16,8 +16,8 @@
class atarigt_state : public atarigen_state
{
public:
- atarigt_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ atarigt_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT8 m_is_primrage;
UINT16 * m_colorram;
diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h
index 3197a8c26bc..81e92b9c8f4 100644
--- a/src/mame/includes/atarigx2.h
+++ b/src/mame/includes/atarigx2.h
@@ -9,8 +9,8 @@
class atarigx2_state : public atarigen_state
{
public:
- atarigx2_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ atarigx2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT16 m_playfield_base;
diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h
index 6b3fb2f3b21..69adad05bde 100644
--- a/src/mame/includes/atarisy1.h
+++ b/src/mame/includes/atarisy1.h
@@ -9,8 +9,8 @@
class atarisy1_state : public atarigen_state
{
public:
- atarisy1_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config),
+ atarisy1_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag),
m_joystick_timer(*this, "joystick_timer"),
m_yscroll_reset_timer(*this, "yreset_timer"),
m_scanline_timer(*this, "scan_timer"),
diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h
index 68be7cc0006..8ee7ddb914b 100644
--- a/src/mame/includes/atarisy2.h
+++ b/src/mame/includes/atarisy2.h
@@ -9,8 +9,8 @@
class atarisy2_state : public atarigen_state
{
public:
- atarisy2_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ atarisy2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT16 * m_slapstic_base;
diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h
index c655c193c74..2e1bd165730 100644
--- a/src/mame/includes/atetris.h
+++ b/src/mame/includes/atetris.h
@@ -7,8 +7,8 @@
class atetris_state : public driver_device
{
public:
- atetris_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ atetris_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT8> m_nvram;
diff --git a/src/mame/includes/avalnche.h b/src/mame/includes/avalnche.h
index d92097e4487..cd51c34fd4a 100644
--- a/src/mame/includes/avalnche.h
+++ b/src/mame/includes/avalnche.h
@@ -10,8 +10,8 @@
class avalnche_state : public driver_device
{
public:
- avalnche_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ avalnche_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* video-related */
UINT8 * m_videoram;
diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h
index 6d03394b6ac..0a21f2dd297 100644
--- a/src/mame/includes/aztarac.h
+++ b/src/mame/includes/aztarac.h
@@ -7,8 +7,8 @@
class aztarac_state : public driver_device
{
public:
- aztarac_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ aztarac_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT16> m_nvram;
diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h
index 46f6958076f..ed8b84e4765 100644
--- a/src/mame/includes/badlands.h
+++ b/src/mame/includes/badlands.h
@@ -9,8 +9,8 @@
class badlands_state : public atarigen_state
{
public:
- badlands_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ badlands_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT8 m_pedal_value[2];
diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h
index 73d21aaed3b..c24b888a11e 100644
--- a/src/mame/includes/bagman.h
+++ b/src/mame/includes/bagman.h
@@ -2,8 +2,8 @@
class bagman_state : public driver_device
{
public:
- bagman_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bagman_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_ls259_buf[8];
UINT8 m_p1_res;
diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h
index 01cf6787fe3..09156d7c961 100644
--- a/src/mame/includes/balsente.h
+++ b/src/mame/includes/balsente.h
@@ -29,8 +29,8 @@
class balsente_state : public driver_device
{
public:
- balsente_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ balsente_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_scanline_timer(*this, "scan_timer"),
m_counter_0_timer(*this, "8253_0_timer"),
m_cem1(*this, "cem1"),
diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h
index 1fae0ad0e8f..9633b478a33 100644
--- a/src/mame/includes/bankp.h
+++ b/src/mame/includes/bankp.h
@@ -12,8 +12,8 @@
class bankp_state : public driver_device
{
public:
- bankp_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bankp_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h
index 9d3fa0ea161..fea629e3454 100644
--- a/src/mame/includes/baraduke.h
+++ b/src/mame/includes/baraduke.h
@@ -1,8 +1,8 @@
class baraduke_state : public driver_device
{
public:
- baraduke_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ baraduke_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_inputport_selected;
int m_counter;
diff --git a/src/mame/includes/batman.h b/src/mame/includes/batman.h
index 6138845b9d5..291bb1e241c 100644
--- a/src/mame/includes/batman.h
+++ b/src/mame/includes/batman.h
@@ -9,8 +9,8 @@
class batman_state : public atarigen_state
{
public:
- batman_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ batman_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT16 m_latch_data;
diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h
index e5c419abf9a..f5f6ce26c5e 100644
--- a/src/mame/includes/battlane.h
+++ b/src/mame/includes/battlane.h
@@ -7,8 +7,8 @@
class battlane_state : public driver_device
{
public:
- battlane_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ battlane_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_tileram;
diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h
index 1eeac3338fe..011f0b39078 100644
--- a/src/mame/includes/battlera.h
+++ b/src/mame/includes/battlera.h
@@ -1,8 +1,8 @@
class battlera_state : public driver_device
{
public:
- battlera_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ battlera_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_control_port_select;
int m_msm5205next;
diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h
index d76e50736e5..a6d22bdf71e 100644
--- a/src/mame/includes/battlex.h
+++ b/src/mame/includes/battlex.h
@@ -7,8 +7,8 @@
class battlex_state : public driver_device
{
public:
- battlex_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ battlex_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_in0_b4;
diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h
index 32a59c5d851..0a32d23929a 100644
--- a/src/mame/includes/battlnts.h
+++ b/src/mame/includes/battlnts.h
@@ -7,8 +7,8 @@
class battlnts_state : public driver_device
{
public:
- battlnts_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ battlnts_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT8 * paletteram; // this currently uses generic palette handling
diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h
index b6c36a43955..2b93a6c73dd 100644
--- a/src/mame/includes/bbusters.h
+++ b/src/mame/includes/bbusters.h
@@ -1,8 +1,8 @@
class bbusters_state : public driver_device
{
public:
- bbusters_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ bbusters_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_eprom_data(*this, "eeprom") { }
UINT16 *m_videoram;
diff --git a/src/mame/includes/beathead.h b/src/mame/includes/beathead.h
index 68a361ae82b..e5cb9a4455f 100644
--- a/src/mame/includes/beathead.h
+++ b/src/mame/includes/beathead.h
@@ -11,8 +11,8 @@
class beathead_state : public atarigen_state
{
public:
- beathead_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config),
+ beathead_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_nvram(*this, "nvram") { }
diff --git a/src/mame/includes/beezer.h b/src/mame/includes/beezer.h
index cc824fb600b..3c2b3a50117 100644
--- a/src/mame/includes/beezer.h
+++ b/src/mame/includes/beezer.h
@@ -3,8 +3,8 @@
class beezer_state : public driver_device
{
public:
- beezer_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ beezer_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
int m_pbus;
diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h
index 9fb0af6c858..f828f2f62c0 100644
--- a/src/mame/includes/bigevglf.h
+++ b/src/mame/includes/bigevglf.h
@@ -2,8 +2,8 @@
class bigevglf_state : public driver_device
{
public:
- bigevglf_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bigevglf_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_paletteram;
diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h
index c12e209b96e..90f946d02d5 100644
--- a/src/mame/includes/bigstrkb.h
+++ b/src/mame/includes/bigstrkb.h
@@ -1,8 +1,8 @@
class bigstrkb_state : public driver_device
{
public:
- bigstrkb_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bigstrkb_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
tilemap_t *m_tilemap;
tilemap_t *m_tilemap2;
diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h
index 4186df23a15..0d34d023bc2 100644
--- a/src/mame/includes/bionicc.h
+++ b/src/mame/includes/bionicc.h
@@ -7,8 +7,8 @@
class bionicc_state : public driver_device
{
public:
- bionicc_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bionicc_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_bgvideoram;
diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h
index ca16477862a..de6130248df 100644
--- a/src/mame/includes/bishi.h
+++ b/src/mame/includes/bishi.h
@@ -10,8 +10,8 @@
class bishi_state : public driver_device
{
public:
- bishi_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bishi_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_ram;
diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h
index e64ada8c9f4..2d69627df5f 100644
--- a/src/mame/includes/bking.h
+++ b/src/mame/includes/bking.h
@@ -1,8 +1,8 @@
class bking_state : public driver_device
{
public:
- bking_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bking_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_playfield_ram;
diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h
index 1091e8a71ae..cc740ce010c 100644
--- a/src/mame/includes/bladestl.h
+++ b/src/mame/includes/bladestl.h
@@ -7,8 +7,8 @@
class bladestl_state : public driver_device
{
public:
- bladestl_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bladestl_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_paletteram;
diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h
index edfc7fbc7a2..0d9a131f4db 100644
--- a/src/mame/includes/blktiger.h
+++ b/src/mame/includes/blktiger.h
@@ -7,8 +7,8 @@
class blktiger_state : public driver_device
{
public:
- blktiger_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ blktiger_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_txvideoram;
diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h
index f6d13e74e52..6d335960fdb 100644
--- a/src/mame/includes/blmbycar.h
+++ b/src/mame/includes/blmbycar.h
@@ -7,8 +7,8 @@
class blmbycar_state : public driver_device
{
public:
- blmbycar_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ blmbycar_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_vram_0;
diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h
index c9603ef4708..ff776d9f760 100644
--- a/src/mame/includes/blockade.h
+++ b/src/mame/includes/blockade.h
@@ -4,8 +4,8 @@
class blockade_state : public driver_device
{
public:
- blockade_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ blockade_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 * m_videoram;
diff --git a/src/mame/includes/blockhl.h b/src/mame/includes/blockhl.h
index 30ae67c94a3..39e11823b57 100644
--- a/src/mame/includes/blockhl.h
+++ b/src/mame/includes/blockhl.h
@@ -7,8 +7,8 @@
class blockhl_state : public driver_device
{
public:
- blockhl_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ blockhl_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_ram;
diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h
index d4c73f96768..3efb7acdb85 100644
--- a/src/mame/includes/blockout.h
+++ b/src/mame/includes/blockout.h
@@ -7,8 +7,8 @@
class blockout_state : public driver_device
{
public:
- blockout_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ blockout_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram;
diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h
index 3fbdc366451..47611f2171f 100644
--- a/src/mame/includes/bloodbro.h
+++ b/src/mame/includes/bloodbro.h
@@ -1,8 +1,8 @@
class bloodbro_state : public driver_device
{
public:
- bloodbro_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bloodbro_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_bgvideoram;
UINT16 *m_fgvideoram;
diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h
index 9a2937c0ef4..da2c2b01447 100644
--- a/src/mame/includes/blstroid.h
+++ b/src/mame/includes/blstroid.h
@@ -9,8 +9,8 @@
class blstroid_state : public atarigen_state
{
public:
- blstroid_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ blstroid_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT16 * m_priorityram;
};
diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h
index 20ab103a3ad..d1da1019dcc 100644
--- a/src/mame/includes/blueprnt.h
+++ b/src/mame/includes/blueprnt.h
@@ -7,8 +7,8 @@
class blueprnt_state : public driver_device
{
public:
- blueprnt_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ blueprnt_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h
index 265118491f8..19d0e9b9af2 100644
--- a/src/mame/includes/bogeyman.h
+++ b/src/mame/includes/bogeyman.h
@@ -7,8 +7,8 @@
class bogeyman_state : public driver_device
{
public:
- bogeyman_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bogeyman_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h
index 4c2232663a9..597f94cb9e0 100644
--- a/src/mame/includes/bombjack.h
+++ b/src/mame/includes/bombjack.h
@@ -7,8 +7,8 @@
class bombjack_state : public driver_device
{
public:
- bombjack_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bombjack_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h
index 638060127a4..88974ee340f 100644
--- a/src/mame/includes/boogwing.h
+++ b/src/mame/includes/boogwing.h
@@ -11,8 +11,8 @@
class boogwing_state : public driver_device
{
public:
- boogwing_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ boogwing_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_decocomn(*this, "deco_common"),
diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h
index bc84afe5c74..3f57d3f1f35 100644
--- a/src/mame/includes/bottom9.h
+++ b/src/mame/includes/bottom9.h
@@ -7,8 +7,8 @@
class bottom9_state : public driver_device
{
public:
- bottom9_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bottom9_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT8 * m_paletteram; // currently this uses generic palette handling
diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h
index b851ffe12ef..ffac73bd168 100644
--- a/src/mame/includes/brkthru.h
+++ b/src/mame/includes/brkthru.h
@@ -7,8 +7,8 @@
class brkthru_state : public driver_device
{
public:
- brkthru_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ brkthru_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h
index 9976176fba9..4ebb182c84c 100644
--- a/src/mame/includes/bsktball.h
+++ b/src/mame/includes/bsktball.h
@@ -16,8 +16,8 @@
class bsktball_state : public driver_device
{
public:
- bsktball_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bsktball_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h
index 7057a06b2e3..aaee90cf5f6 100644
--- a/src/mame/includes/btime.h
+++ b/src/mame/includes/btime.h
@@ -2,8 +2,8 @@
class btime_state : public driver_device
{
public:
- btime_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ btime_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h
index 05f885977d6..f3f3a0f9009 100644
--- a/src/mame/includes/btoads.h
+++ b/src/mame/includes/btoads.h
@@ -9,8 +9,8 @@
class btoads_state : public driver_device
{
public:
- btoads_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ btoads_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_main_to_sound_data;
UINT8 m_main_to_sound_ready;
diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h
index 7f00dcd4ac2..0e1311e75b9 100644
--- a/src/mame/includes/bublbobl.h
+++ b/src/mame/includes/bublbobl.h
@@ -2,8 +2,8 @@
class bublbobl_state : public driver_device
{
public:
- bublbobl_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bublbobl_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_mcu_sharedram;
diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h
index 8b0e2c18b1a..f42f9623c8f 100644
--- a/src/mame/includes/buggychl.h
+++ b/src/mame/includes/buggychl.h
@@ -5,8 +5,8 @@
class buggychl_state : public driver_device
{
public:
- buggychl_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ buggychl_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h
index 1c749ab2e14..00ac870580d 100644
--- a/src/mame/includes/bwing.h
+++ b/src/mame/includes/bwing.h
@@ -9,8 +9,8 @@
class bwing_state : public driver_device
{
public:
- bwing_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bwing_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h
index 7d06911a4e5..31d16de92ba 100644
--- a/src/mame/includes/bzone.h
+++ b/src/mame/includes/bzone.h
@@ -12,8 +12,8 @@
class bzone_state : public driver_device
{
public:
- bzone_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ bzone_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_analog_data;
UINT8 m_rb_input_select;
diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h
index 76015c97a88..f1e54cadf35 100644
--- a/src/mame/includes/cabal.h
+++ b/src/mame/includes/cabal.h
@@ -1,8 +1,8 @@
class cabal_state : public driver_device
{
public:
- cabal_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cabal_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_spriteram;
UINT16 *m_colorram;
diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h
index 780330a0a02..53432d5e709 100644
--- a/src/mame/includes/calomega.h
+++ b/src/mame/includes/calomega.h
@@ -1,8 +1,8 @@
class calomega_state : public driver_device
{
public:
- calomega_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ calomega_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_tx_line;
UINT8 m_rx_line;
diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h
index 8aa5e832bc1..edd03667471 100644
--- a/src/mame/includes/canyon.h
+++ b/src/mame/includes/canyon.h
@@ -20,8 +20,8 @@
class canyon_state : public driver_device
{
public:
- canyon_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ canyon_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h
index faa10baf663..e32c8e7d267 100644
--- a/src/mame/includes/capbowl.h
+++ b/src/mame/includes/capbowl.h
@@ -9,8 +9,8 @@
class capbowl_state : public driver_device
{
public:
- capbowl_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ capbowl_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
void init_nvram(nvram_device &nvram, void *base, size_t size);
diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h
index 8a5d816e644..2bc73754d71 100644
--- a/src/mame/includes/carjmbre.h
+++ b/src/mame/includes/carjmbre.h
@@ -7,8 +7,8 @@
class carjmbre_state : public driver_device
{
public:
- carjmbre_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ carjmbre_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h
index 0b62973d55f..d50a376c940 100644
--- a/src/mame/includes/carpolo.h
+++ b/src/mame/includes/carpolo.h
@@ -11,8 +11,8 @@
class carpolo_state : public driver_device
{
public:
- carpolo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ carpolo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_alpharam;
UINT8 *m_spriteram;
diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h
index 2562e682fec..46737b4c2e3 100644
--- a/src/mame/includes/cave.h
+++ b/src/mame/includes/cave.h
@@ -24,8 +24,8 @@ struct sprite_cave
class cave_state : public driver_device
{
public:
- cave_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config), m_int_timer(*this, "int_timer") { }
+ cave_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag), m_int_timer(*this, "int_timer") { }
/* memory pointers */
UINT16 * m_videoregs;
diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h
index b5384938ec1..14110a63417 100644
--- a/src/mame/includes/cbasebal.h
+++ b/src/mame/includes/cbasebal.h
@@ -7,8 +7,8 @@
class cbasebal_state : public driver_device
{
public:
- cbasebal_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cbasebal_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_spriteram;
diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h
index 616feabcc1e..c400d1bd75a 100644
--- a/src/mame/includes/cbuster.h
+++ b/src/mame/includes/cbuster.h
@@ -7,8 +7,8 @@
class cbuster_state : public driver_device
{
public:
- cbuster_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cbuster_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_pf1_rowscroll;
diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h
index 56bc7273a0c..ce3e10c692b 100644
--- a/src/mame/includes/ccastles.h
+++ b/src/mame/includes/ccastles.h
@@ -10,8 +10,8 @@
class ccastles_state : public driver_device
{
public:
- ccastles_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ ccastles_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_nvram_4b(*this, "nvram_4b"),
m_nvram_4a(*this, "nvram_4a") { }
diff --git a/src/mame/includes/cchasm.h b/src/mame/includes/cchasm.h
index 95419370336..dd6b48234f5 100644
--- a/src/mame/includes/cchasm.h
+++ b/src/mame/includes/cchasm.h
@@ -9,8 +9,8 @@
class cchasm_state : public driver_device
{
public:
- cchasm_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cchasm_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_sound_flags;
int m_coin_flag;
diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h
index 71bc8d4790c..2f7d4de8300 100644
--- a/src/mame/includes/cclimber.h
+++ b/src/mame/includes/cclimber.h
@@ -1,8 +1,8 @@
class cclimber_state : public driver_device
{
public:
- cclimber_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cclimber_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_colorram;
diff --git a/src/mame/includes/cd32.h b/src/mame/includes/cd32.h
index b7209cb7ae3..615a935e4cd 100644
--- a/src/mame/includes/cd32.h
+++ b/src/mame/includes/cd32.h
@@ -12,8 +12,8 @@ CuboCD32 definitions
class cd32_state : public amiga_state
{
public:
- cd32_state(running_machine &machine, const driver_device_config_base &config)
- : amiga_state(machine, config) { }
+ cd32_state(const machine_config &mconfig, device_type type, const char *tag)
+ : amiga_state(mconfig, type, tag) { }
UINT16 m_potgo_value;
int m_cd32_shifter[2];
diff --git a/src/mame/includes/cdi.h b/src/mame/includes/cdi.h
index 9572918a759..e5e7388af6e 100644
--- a/src/mame/includes/cdi.h
+++ b/src/mame/includes/cdi.h
@@ -15,8 +15,8 @@
class cdi_state : public driver_device
{
public:
- cdi_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cdi_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_planea;
UINT16 *m_planeb;
diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h
index caf381dccd6..11509461458 100644
--- a/src/mame/includes/centiped.h
+++ b/src/mame/includes/centiped.h
@@ -7,8 +7,8 @@
class centiped_state : public driver_device
{
public:
- centiped_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ centiped_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 m_oldpos[4];
diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h
index 60e154af438..86f627c9c72 100644
--- a/src/mame/includes/chaknpop.h
+++ b/src/mame/includes/chaknpop.h
@@ -6,8 +6,8 @@
class chaknpop_state : public driver_device
{
public:
- chaknpop_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ chaknpop_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_mcu_ram;
diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h
index 52cb971e20e..38ab629f0a3 100644
--- a/src/mame/includes/champbas.h
+++ b/src/mame/includes/champbas.h
@@ -11,8 +11,8 @@
class champbas_state : public driver_device
{
public:
- champbas_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ champbas_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bg_videoram;
diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h
index 44ba0d2f537..1a06bb8bdcb 100644
--- a/src/mame/includes/changela.h
+++ b/src/mame/includes/changela.h
@@ -3,8 +3,8 @@
class changela_state : public driver_device
{
public:
- changela_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ changela_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h
index 8a8cb0e585e..a2b76407e47 100644
--- a/src/mame/includes/cheekyms.h
+++ b/src/mame/includes/cheekyms.h
@@ -8,8 +8,8 @@
class cheekyms_state : public driver_device
{
public:
- cheekyms_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cheekyms_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h
index 7598629f372..86f684bdf2e 100644
--- a/src/mame/includes/chqflag.h
+++ b/src/mame/includes/chqflag.h
@@ -7,8 +7,8 @@
class chqflag_state : public driver_device
{
public:
- chqflag_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ chqflag_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_ram;
diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h
index f16175bdc4b..39001ae8243 100644
--- a/src/mame/includes/cidelsa.h
+++ b/src/mame/includes/cidelsa.h
@@ -38,8 +38,8 @@
class cidelsa_state : public driver_device
{
public:
- cidelsa_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ cidelsa_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_maincpu(*this, CDP1802_TAG),
m_vis(*this, CDP1869_TAG)
{ }
@@ -77,8 +77,8 @@ public:
class draco_state : public cidelsa_state
{
public:
- draco_state(running_machine &machine, const driver_device_config_base &config)
- : cidelsa_state(machine, config),
+ draco_state(const machine_config &mconfig, device_type type, const char *tag)
+ : cidelsa_state(mconfig, type, tag),
m_psg(*this, AY8910_TAG)
{ }
diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h
index abe4889a1c2..886103501c8 100644
--- a/src/mame/includes/cinemat.h
+++ b/src/mame/includes/cinemat.h
@@ -8,8 +8,8 @@
class cinemat_state : public driver_device
{
public:
- cinemat_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cinemat_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_sound_control;
void (*m_sound_handler)(running_machine &,UINT8 sound_val, UINT8 bits_changed);
diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h
index 725968a5607..cf3ff4b92c5 100644
--- a/src/mame/includes/circus.h
+++ b/src/mame/includes/circus.h
@@ -3,8 +3,8 @@
class circus_state : public driver_device
{
public:
- circus_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ circus_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h
index 2a191c1a9a5..823082b3649 100644
--- a/src/mame/includes/circusc.h
+++ b/src/mame/includes/circusc.h
@@ -7,8 +7,8 @@
class circusc_state : public driver_device
{
public:
- circusc_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ circusc_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h
index 645655dd182..237a4f0bd36 100644
--- a/src/mame/includes/cischeat.h
+++ b/src/mame/includes/cischeat.h
@@ -1,8 +1,8 @@
class cischeat_state : public driver_device
{
public:
- cischeat_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cischeat_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_scrollram[3];
UINT16 *m_objectram;
diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h
index 59d69461318..ae702ae517f 100644
--- a/src/mame/includes/citycon.h
+++ b/src/mame/includes/citycon.h
@@ -7,8 +7,8 @@
class citycon_state : public driver_device
{
public:
- citycon_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ citycon_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h
index 2febd0851c1..6f9e88e929e 100644
--- a/src/mame/includes/cloak.h
+++ b/src/mame/includes/cloak.h
@@ -7,8 +7,8 @@
class cloak_state : public driver_device
{
public:
- cloak_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cloak_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_spriteram;
diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h
index 56fd5afd34b..91307065362 100644
--- a/src/mame/includes/cloud9.h
+++ b/src/mame/includes/cloud9.h
@@ -10,8 +10,8 @@
class cloud9_state : public driver_device
{
public:
- cloud9_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ cloud9_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_nvram(*this, "nvram") { }
diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h
index 46e604c4b2b..5f0ce83adf1 100644
--- a/src/mame/includes/clshroad.h
+++ b/src/mame/includes/clshroad.h
@@ -1,8 +1,8 @@
class clshroad_state : public driver_device
{
public:
- clshroad_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ clshroad_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_vram_0;
UINT8 *m_vram_1;
diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h
index b58e5b1423c..a245596fa0e 100644
--- a/src/mame/includes/cninja.h
+++ b/src/mame/includes/cninja.h
@@ -11,8 +11,8 @@
class cninja_state : public driver_device
{
public:
- cninja_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ cninja_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_decocomn(*this, "deco_common"),
diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h
index 79149298259..954948082a5 100644
--- a/src/mame/includes/combatsc.h
+++ b/src/mame/includes/combatsc.h
@@ -7,8 +7,8 @@
class combatsc_state : public driver_device
{
public:
- combatsc_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ combatsc_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h
index ce48a8bc629..dc097aa9fba 100644
--- a/src/mame/includes/commando.h
+++ b/src/mame/includes/commando.h
@@ -7,8 +7,8 @@
class commando_state : public driver_device
{
public:
- commando_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ commando_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h
index 9df1cfdbda7..ea76a80fc03 100644
--- a/src/mame/includes/compgolf.h
+++ b/src/mame/includes/compgolf.h
@@ -7,8 +7,8 @@
class compgolf_state : public driver_device
{
public:
- compgolf_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ compgolf_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h
index f8dbb01b603..c0278299ed6 100644
--- a/src/mame/includes/contra.h
+++ b/src/mame/includes/contra.h
@@ -7,8 +7,8 @@
class contra_state : public driver_device
{
public:
- contra_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ contra_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_spriteram;
diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h
index 116fff0d61d..3a1ee040acd 100644
--- a/src/mame/includes/coolpool.h
+++ b/src/mame/includes/coolpool.h
@@ -3,8 +3,8 @@
class coolpool_state : public driver_device
{
public:
- coolpool_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ coolpool_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
UINT16 *m_vram_base;
diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h
index 5e01824ca52..679c0ba306a 100644
--- a/src/mame/includes/cop01.h
+++ b/src/mame/includes/cop01.h
@@ -7,8 +7,8 @@
class cop01_state : public driver_device
{
public:
- cop01_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cop01_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bgvideoram;
diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h
index e76cd39cad5..428007e5398 100644
--- a/src/mame/includes/copsnrob.h
+++ b/src/mame/includes/copsnrob.h
@@ -10,8 +10,8 @@
class copsnrob_state : public driver_device
{
public:
- copsnrob_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ copsnrob_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h
index 379a6c7b57d..13a7f93acde 100644
--- a/src/mame/includes/cosmic.h
+++ b/src/mame/includes/cosmic.h
@@ -11,8 +11,8 @@
class cosmic_state : public driver_device
{
public:
- cosmic_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cosmic_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h
index 720d3f0a550..5253edadd2a 100644
--- a/src/mame/includes/cps1.h
+++ b/src/mame/includes/cps1.h
@@ -62,8 +62,8 @@ struct CPS1config
class cps_state : public driver_device
{
public:
- cps_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cps_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// cps1
diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h
index 0c9ff69fd9e..cec60caefce 100644
--- a/src/mame/includes/cps3.h
+++ b/src/mame/includes/cps3.h
@@ -10,8 +10,8 @@
class cps3_state : public driver_device
{
public:
- cps3_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cps3_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
fujitsu_29f016a_device *m_simm[7][8];
UINT32* m_decrypted_bios;
diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h
index c8a5e3733e3..4d7baf5f91f 100644
--- a/src/mame/includes/crbaloon.h
+++ b/src/mame/includes/crbaloon.h
@@ -11,8 +11,8 @@ Crazy Ballooon
class crbaloon_state : public driver_device
{
public:
- crbaloon_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ crbaloon_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_pc3092_data;
UINT8 *m_videoram;
diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h
index 4faf328099b..568685184fa 100644
--- a/src/mame/includes/crgolf.h
+++ b/src/mame/includes/crgolf.h
@@ -10,8 +10,8 @@
class crgolf_state : public driver_device
{
public:
- crgolf_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ crgolf_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram_a;
diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h
index edc29e27077..04b5c87e546 100644
--- a/src/mame/includes/crimfght.h
+++ b/src/mame/includes/crimfght.h
@@ -7,8 +7,8 @@
class crimfght_state : public driver_device
{
public:
- crimfght_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ crimfght_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT8 * m_paletteram; // currently this uses generic palette handling
diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h
index f93cfdcb089..7e15469a739 100644
--- a/src/mame/includes/crospang.h
+++ b/src/mame/includes/crospang.h
@@ -7,8 +7,8 @@
class crospang_state : public driver_device
{
public:
- crospang_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ crospang_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_bg_videoram;
diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h
index b16665055bc..65cb8bc3bfc 100644
--- a/src/mame/includes/crshrace.h
+++ b/src/mame/includes/crshrace.h
@@ -2,8 +2,8 @@
class crshrace_state : public driver_device
{
public:
- crshrace_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ crshrace_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram1;
diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h
index 63a43c63221..34eee7bb9ee 100644
--- a/src/mame/includes/cvs.h
+++ b/src/mame/includes/cvs.h
@@ -19,8 +19,8 @@ struct cvs_star
class cvs_state : public driver_device
{
public:
- cvs_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ cvs_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_video_ram;
@@ -70,8 +70,8 @@ public:
class quasar_state : public cvs_state
{
public:
- quasar_state(running_machine &machine, const driver_device_config_base &config)
- : cvs_state(machine, config) { }
+ quasar_state(const machine_config &mconfig, device_type type, const char *tag)
+ : cvs_state(mconfig, type, tag) { }
UINT8 * m_effectram;
UINT8 m_effectcontrol;
diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h
index 81b3257d5e4..20b10c9c5d1 100644
--- a/src/mame/includes/cyberbal.h
+++ b/src/mame/includes/cyberbal.h
@@ -9,8 +9,8 @@
class cyberbal_state : public atarigen_state
{
public:
- cyberbal_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ cyberbal_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT16 * m_paletteram_0;
UINT16 * m_paletteram_1;
diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h
index 6f32a882068..20c2a31093e 100644
--- a/src/mame/includes/darius.h
+++ b/src/mame/includes/darius.h
@@ -10,8 +10,8 @@
class darius_state : public driver_device
{
public:
- darius_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ darius_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_spriteram;
diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h
index 409a39afdff..eaed9b55bbd 100644
--- a/src/mame/includes/darkmist.h
+++ b/src/mame/includes/darkmist.h
@@ -1,8 +1,8 @@
class darkmist_state : public driver_device
{
public:
- darkmist_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ darkmist_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_workram;
diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h
index 4c402e0b8dd..f6a04be131f 100644
--- a/src/mame/includes/darkseal.h
+++ b/src/mame/includes/darkseal.h
@@ -3,8 +3,8 @@
class darkseal_state : public driver_device
{
public:
- darkseal_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ darkseal_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_deco_tilegen1(*this, "tilegen1"),
m_deco_tilegen2(*this, "tilegen2") { }
diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h
index bcaf7bdf8b7..f4a5ebeab6f 100644
--- a/src/mame/includes/dassault.h
+++ b/src/mame/includes/dassault.h
@@ -11,8 +11,8 @@
class dassault_state : public driver_device
{
public:
- dassault_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ dassault_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_subcpu(*this, "sub"),
diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h
index 343d7cefbea..db0e4a9a1aa 100644
--- a/src/mame/includes/dbz.h
+++ b/src/mame/includes/dbz.h
@@ -7,8 +7,8 @@
class dbz_state : public driver_device
{
public:
- dbz_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dbz_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_bg1_videoram;
diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h
index a1f0f853ee4..d1b89633ab6 100644
--- a/src/mame/includes/dcheese.h
+++ b/src/mame/includes/dcheese.h
@@ -8,8 +8,8 @@
class dcheese_state : public driver_device
{
public:
- dcheese_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dcheese_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* video-related */
UINT16 m_blitter_color[2];
diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h
index ffae06be7fe..65d65d83a53 100644
--- a/src/mame/includes/dcon.h
+++ b/src/mame/includes/dcon.h
@@ -1,8 +1,8 @@
class dcon_state : public driver_device
{
public:
- dcon_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dcon_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_back_data;
UINT16 *m_fore_data;
diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h
index 4c50ac89323..15d779d1854 100644
--- a/src/mame/includes/dday.h
+++ b/src/mame/includes/dday.h
@@ -8,8 +8,8 @@
class dday_state : public driver_device
{
public:
- dday_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dday_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bgvideoram;
diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h
index d82909fc3a6..c4a48cff9f9 100644
--- a/src/mame/includes/ddragon.h
+++ b/src/mame/includes/ddragon.h
@@ -8,8 +8,8 @@
class ddragon_state : public driver_device
{
public:
- ddragon_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ddragon_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_rambase;
diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h
index 2d8905510b6..a1b2c25c426 100644
--- a/src/mame/includes/ddragon3.h
+++ b/src/mame/includes/ddragon3.h
@@ -8,8 +8,8 @@
class ddragon3_state : public driver_device
{
public:
- ddragon3_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ddragon3_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_bg_videoram;
diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h
index 8f64c8d141c..e684b469267 100644
--- a/src/mame/includes/ddribble.h
+++ b/src/mame/includes/ddribble.h
@@ -7,8 +7,8 @@
class ddribble_state : public driver_device
{
public:
- ddribble_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ddribble_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_sharedram;
diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h
index 3486d589d8e..9dfa747d63c 100644
--- a/src/mame/includes/deadang.h
+++ b/src/mame/includes/deadang.h
@@ -1,8 +1,8 @@
class deadang_state : public driver_device
{
public:
- deadang_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ deadang_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
UINT16 *m_video_data;
diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h
index 2a826dc17a3..49235d981ac 100644
--- a/src/mame/includes/dec0.h
+++ b/src/mame/includes/dec0.h
@@ -1,8 +1,8 @@
class dec0_state : public driver_device
{
public:
- dec0_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dec0_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_automat_adpcm_byte;
int m_automat_msm5205_vclk_toggle;
diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h
index f678cfb2003..974bef7cffd 100644
--- a/src/mame/includes/dec8.h
+++ b/src/mame/includes/dec8.h
@@ -2,8 +2,8 @@
class dec8_state : public driver_device
{
public:
- dec8_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dec8_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h
index ac515941d5f..e8b7a1a7c78 100644
--- a/src/mame/includes/deco32.h
+++ b/src/mame/includes/deco32.h
@@ -1,8 +1,8 @@
class deco32_state : public driver_device
{
public:
- deco32_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ deco32_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT32 *m_ram;
int m_raster_enable;
@@ -50,8 +50,8 @@ public:
class dragngun_state : public deco32_state
{
public:
- dragngun_state(running_machine &machine, const driver_device_config_base &config)
- : deco32_state(machine, config) { }
+ dragngun_state(const machine_config &mconfig, device_type type, const char *tag)
+ : deco32_state(mconfig, type, tag) { }
UINT32 *m_dragngun_sprite_layout_0_ram;
UINT32 *m_dragngun_sprite_layout_1_ram;
diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h
index 8c8cc2e2f2b..0a0fab878eb 100644
--- a/src/mame/includes/deco_mlc.h
+++ b/src/mame/includes/deco_mlc.h
@@ -1,8 +1,8 @@
class deco_mlc_state : public driver_device
{
public:
- deco_mlc_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ deco_mlc_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT32 *m_mlc_ram;
UINT32 *m_irq_ram;
diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h
index 55dc84759f6..23ed74e1a80 100644
--- a/src/mame/includes/deniam.h
+++ b/src/mame/includes/deniam.h
@@ -8,8 +8,8 @@
class deniam_state : public driver_device
{
public:
- deniam_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ deniam_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram;
diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h
index 70319b422ed..e5afaad2da0 100644
--- a/src/mame/includes/dietgo.h
+++ b/src/mame/includes/dietgo.h
@@ -7,8 +7,8 @@
class dietgo_state : public driver_device
{
public:
- dietgo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dietgo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_pf1_rowscroll;
diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h
index 82cf7970b5c..3f88b80f17b 100644
--- a/src/mame/includes/djboy.h
+++ b/src/mame/includes/djboy.h
@@ -9,8 +9,8 @@
class djboy_state : public driver_device
{
public:
- djboy_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ djboy_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 *m_videoram;
diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h
index 3a3179a846b..7350e72b968 100644
--- a/src/mame/includes/djmain.h
+++ b/src/mame/includes/djmain.h
@@ -1,8 +1,8 @@
class djmain_state : public driver_device
{
public:
- djmain_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ djmain_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_sndram_bank;
UINT8 *m_sndram;
diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h
index 5ccd2a2a287..1ef30784c10 100644
--- a/src/mame/includes/dkong.h
+++ b/src/mame/includes/dkong.h
@@ -72,8 +72,8 @@ enum
class dkong_state : public driver_device
{
public:
- dkong_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dkong_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_video_ram;
diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h
index 1b11c7ef607..13ce0111d36 100644
--- a/src/mame/includes/docastle.h
+++ b/src/mame/includes/docastle.h
@@ -3,8 +3,8 @@
class docastle_state : public driver_device
{
public:
- docastle_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ docastle_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h
index 981300d0665..c82cb09d652 100644
--- a/src/mame/includes/dogfgt.h
+++ b/src/mame/includes/dogfgt.h
@@ -6,8 +6,8 @@
class dogfgt_state : public driver_device
{
public:
- dogfgt_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dogfgt_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bgvideoram;
diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h
index ac68e616efc..9014c676ce2 100644
--- a/src/mame/includes/dooyong.h
+++ b/src/mame/includes/dooyong.h
@@ -1,8 +1,8 @@
class dooyong_state : public driver_device
{
public:
- dooyong_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dooyong_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_txvideoram;
UINT8 *m_paletteram_flytiger;
diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h
index b069affd4df..74cdcd021e0 100644
--- a/src/mame/includes/dragrace.h
+++ b/src/mame/includes/dragrace.h
@@ -25,8 +25,8 @@
class dragrace_state : public driver_device
{
public:
- dragrace_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dragrace_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_playfield_ram;
diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h
index fd002471c15..6d2ae07e4e5 100644
--- a/src/mame/includes/drgnmst.h
+++ b/src/mame/includes/drgnmst.h
@@ -4,8 +4,8 @@
class drgnmst_state : public driver_device
{
public:
- drgnmst_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ drgnmst_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_oki_1(*this, "oki1"),
m_oki_2(*this, "oki2") { }
diff --git a/src/mame/includes/dribling.h b/src/mame/includes/dribling.h
index ff0cf9dc43e..b11947e966b 100644
--- a/src/mame/includes/dribling.h
+++ b/src/mame/includes/dribling.h
@@ -9,8 +9,8 @@
class dribling_state : public driver_device
{
public:
- dribling_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dribling_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h
index 71bc6800d35..a05162e23f5 100644
--- a/src/mame/includes/drmicro.h
+++ b/src/mame/includes/drmicro.h
@@ -8,8 +8,8 @@
class drmicro_state : public driver_device
{
public:
- drmicro_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ drmicro_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h
index 44ef2485905..4401cbde0ce 100644
--- a/src/mame/includes/dynax.h
+++ b/src/mame/includes/dynax.h
@@ -9,8 +9,8 @@
class dynax_state : public driver_device
{
public:
- dynax_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dynax_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
// up to 8 layers, 2 images per layer (interleaved on screen)
UINT8 * m_pixmap[8][2];
diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h
index dd8dba352d8..a0ac14081a2 100644
--- a/src/mame/includes/dynduke.h
+++ b/src/mame/includes/dynduke.h
@@ -1,8 +1,8 @@
class dynduke_state : public driver_device
{
public:
- dynduke_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ dynduke_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
UINT16 *m_back_data;
diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h
index de6ef9de3c2..8e6eec31c3d 100644
--- a/src/mame/includes/eolith.h
+++ b/src/mame/includes/eolith.h
@@ -1,8 +1,8 @@
class eolith_state : public driver_device
{
public:
- eolith_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ eolith_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_coin_counter_bit;
int m_buffer;
diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h
index 362d0968caf..2ab02869942 100644
--- a/src/mame/includes/epos.h
+++ b/src/mame/includes/epos.h
@@ -7,8 +7,8 @@
class epos_state : public driver_device
{
public:
- epos_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ epos_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h
index cd07a2d7e0f..71ab7910796 100644
--- a/src/mame/includes/eprom.h
+++ b/src/mame/includes/eprom.h
@@ -9,8 +9,8 @@
class eprom_state : public atarigen_state
{
public:
- eprom_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ eprom_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
int m_screen_intensity;
int m_video_disable;
diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h
index a3cfd9e02bf..7c3b7574127 100644
--- a/src/mame/includes/equites.h
+++ b/src/mame/includes/equites.h
@@ -7,8 +7,8 @@
class equites_state : public driver_device
{
public:
- equites_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ equites_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_bg_videoram;
diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h
index 94dce636444..1caa222dafe 100644
--- a/src/mame/includes/esd16.h
+++ b/src/mame/includes/esd16.h
@@ -7,8 +7,8 @@
class esd16_state : public driver_device
{
public:
- esd16_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ esd16_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_vram_0;
diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h
index 9bf96399564..d03b0cee09c 100644
--- a/src/mame/includes/espial.h
+++ b/src/mame/includes/espial.h
@@ -7,8 +7,8 @@
class espial_state : public driver_device
{
public:
- espial_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ espial_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 * m_videoram;
UINT8 * m_colorram;
diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h
index 7ac1624d3a0..b7579c28cac 100644
--- a/src/mame/includes/esripsys.h
+++ b/src/mame/includes/esripsys.h
@@ -26,8 +26,8 @@ struct line_buffer_t
class esripsys_state : public driver_device
{
public:
- esripsys_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ esripsys_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_g_iodata;
UINT8 m_g_ioaddr;
diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h
index 4df6a244a1e..48e1b3098bf 100644
--- a/src/mame/includes/exedexes.h
+++ b/src/mame/includes/exedexes.h
@@ -8,8 +8,8 @@
class exedexes_state : public driver_device
{
public:
- exedexes_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ exedexes_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h
index 56f21aa9e2c..98a04cfde9c 100644
--- a/src/mame/includes/exerion.h
+++ b/src/mame/includes/exerion.h
@@ -21,8 +21,8 @@
class exerion_state : public driver_device
{
public:
- exerion_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ exerion_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_main_ram;
diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h
index 043b456b753..672a516e9b4 100644
--- a/src/mame/includes/exidy.h
+++ b/src/mame/includes/exidy.h
@@ -22,8 +22,8 @@
class exidy_state : public driver_device
{
public:
- exidy_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ exidy_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_last_dial;
UINT8 *m_videoram;
diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h
index 51631d6000a..c3cec5e2403 100644
--- a/src/mame/includes/exidy440.h
+++ b/src/mame/includes/exidy440.h
@@ -10,8 +10,8 @@
class exidy440_state : public driver_device
{
public:
- exidy440_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ exidy440_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_bank;
const UINT8 *m_showdown_bank_data[2];
diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h
index fe6168b8b36..8beea521e02 100644
--- a/src/mame/includes/exprraid.h
+++ b/src/mame/includes/exprraid.h
@@ -8,8 +8,8 @@
class exprraid_state : public driver_device
{
public:
- exprraid_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ exprraid_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_main_ram;
diff --git a/src/mame/includes/exterm.h b/src/mame/includes/exterm.h
index 84bfa4817cb..b5ea7154ce0 100644
--- a/src/mame/includes/exterm.h
+++ b/src/mame/includes/exterm.h
@@ -7,8 +7,8 @@
class exterm_state : public driver_device
{
public:
- exterm_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ exterm_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_aimpos[2];
UINT8 m_trackball_old[2];
diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h
index 952be3a0bd9..7a40ebbee17 100644
--- a/src/mame/includes/exzisus.h
+++ b/src/mame/includes/exzisus.h
@@ -1,8 +1,8 @@
class exzisus_state : public driver_device
{
public:
- exzisus_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ exzisus_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_sharedram_ab;
UINT8 *m_sharedram_ac;
diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h
index 9635833e308..d557671ba74 100644
--- a/src/mame/includes/f1gp.h
+++ b/src/mame/includes/f1gp.h
@@ -2,8 +2,8 @@
class f1gp_state : public driver_device
{
public:
- f1gp_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ f1gp_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_sharedram;
diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h
index c0212879615..a32aa676d49 100644
--- a/src/mame/includes/fantland.h
+++ b/src/mame/includes/fantland.h
@@ -3,8 +3,8 @@
class fantland_state : public driver_device
{
public:
- fantland_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ fantland_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT8 * m_spriteram; // currently directly used in a 16bit map...
diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h
index 20e05f6e548..110f67423d2 100644
--- a/src/mame/includes/fastfred.h
+++ b/src/mame/includes/fastfred.h
@@ -10,8 +10,8 @@
class fastfred_state : public galaxold_state
{
public:
- fastfred_state(running_machine &machine, const driver_device_config_base &config)
- : galaxold_state(machine, config) { }
+ fastfred_state(const machine_config &mconfig, device_type type, const char *tag)
+ : galaxold_state(mconfig, type, tag) { }
UINT8 m_imago_sprites[0x800*3];
UINT16 m_imago_sprites_address;
diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h
index b76e7296e01..50097491536 100644
--- a/src/mame/includes/fastlane.h
+++ b/src/mame/includes/fastlane.h
@@ -7,8 +7,8 @@
class fastlane_state : public driver_device
{
public:
- fastlane_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ fastlane_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram1;
diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h
index e056d15e82c..1d98b5240a7 100644
--- a/src/mame/includes/fcombat.h
+++ b/src/mame/includes/fcombat.h
@@ -25,8 +25,8 @@
class fcombat_state : public driver_device
{
public:
- fcombat_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ fcombat_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h
index 168cc05870f..163a5f7265b 100644
--- a/src/mame/includes/fgoal.h
+++ b/src/mame/includes/fgoal.h
@@ -3,8 +3,8 @@
class fgoal_state : public driver_device
{
public:
- fgoal_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ fgoal_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_video_ram;
diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h
index 2c761fb6da6..4ea9a51ea6d 100644
--- a/src/mame/includes/finalizr.h
+++ b/src/mame/includes/finalizr.h
@@ -7,8 +7,8 @@
class finalizr_state : public driver_device
{
public:
- finalizr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ finalizr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h
index 1e49fb40c29..4d33516d886 100644
--- a/src/mame/includes/firetrap.h
+++ b/src/mame/includes/firetrap.h
@@ -7,8 +7,8 @@
class firetrap_state : public driver_device
{
public:
- firetrap_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ firetrap_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bg1videoram;
diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h
index c40cf8e3895..c31b811c846 100644
--- a/src/mame/includes/firetrk.h
+++ b/src/mame/includes/firetrk.h
@@ -33,8 +33,8 @@ Atari Fire Truck + Super Bug + Monte Carlo driver
class firetrk_state : public driver_device
{
public:
- firetrk_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ firetrk_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_in_service_mode;
UINT32 m_dial[2];
diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h
index 6e4749315ee..ce619a520a5 100644
--- a/src/mame/includes/fitfight.h
+++ b/src/mame/includes/fitfight.h
@@ -2,8 +2,8 @@
class fitfight_state : public driver_device
{
public:
- fitfight_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ fitfight_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_fof_100000;
diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h
index cdebf1581da..c85ea1d4386 100644
--- a/src/mame/includes/flkatck.h
+++ b/src/mame/includes/flkatck.h
@@ -7,8 +7,8 @@
class flkatck_state : public driver_device
{
public:
- flkatck_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ flkatck_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_k007121_ram;
diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h
index 55b8aeaf396..333e2769e75 100644
--- a/src/mame/includes/flower.h
+++ b/src/mame/includes/flower.h
@@ -3,8 +3,8 @@
class flower_state : public driver_device
{
public:
- flower_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ flower_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_spriteram;
UINT8 *m_sn_irq_enable;
diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h
index e8d134e7c89..23a500f645b 100644
--- a/src/mame/includes/flstory.h
+++ b/src/mame/includes/flstory.h
@@ -2,8 +2,8 @@
class flstory_state : public driver_device
{
public:
- flstory_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ flstory_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h
index 3b7f556291f..ec86619e8ad 100644
--- a/src/mame/includes/foodf.h
+++ b/src/mame/includes/foodf.h
@@ -10,8 +10,8 @@
class foodf_state : public atarigen_state
{
public:
- foodf_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config),
+ foodf_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_device<x2212_device> m_nvram;
diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h
index 956a81fed8e..1a880b103ab 100644
--- a/src/mame/includes/freekick.h
+++ b/src/mame/includes/freekick.h
@@ -3,8 +3,8 @@
class freekick_state : public driver_device
{
public:
- freekick_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ freekick_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h
index f1caf4bd96f..25bb7e4dabe 100644
--- a/src/mame/includes/fromanc2.h
+++ b/src/mame/includes/fromanc2.h
@@ -2,8 +2,8 @@
class fromanc2_state : public driver_device
{
public:
- fromanc2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ fromanc2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 *m_paletteram[2];
diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h
index a95ee62bada..7fd1b8bf700 100644
--- a/src/mame/includes/fromance.h
+++ b/src/mame/includes/fromance.h
@@ -10,8 +10,8 @@
class fromance_state : public driver_device
{
public:
- fromance_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ fromance_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers (used by pipedrm) */
UINT8 * m_videoram;
diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h
index adfacf23a04..998edddebb2 100644
--- a/src/mame/includes/funkybee.h
+++ b/src/mame/includes/funkybee.h
@@ -3,8 +3,8 @@
class funkybee_state : public driver_device
{
public:
- funkybee_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ funkybee_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/funkyjet.h b/src/mame/includes/funkyjet.h
index 25fab8bb58c..4b2498b3f27 100644
--- a/src/mame/includes/funkyjet.h
+++ b/src/mame/includes/funkyjet.h
@@ -7,8 +7,8 @@
class funkyjet_state : public driver_device
{
public:
- funkyjet_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ funkyjet_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_pf1_rowscroll;
diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h
index 4350b32d033..61b27615008 100644
--- a/src/mame/includes/funworld.h
+++ b/src/mame/includes/funworld.h
@@ -1,8 +1,8 @@
class funworld_state : public driver_device
{
public:
- funworld_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ funworld_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8* m_videoram;
UINT8* m_colorram;
diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h
index fc56105f7d5..ea5303f8ac6 100644
--- a/src/mame/includes/funybubl.h
+++ b/src/mame/includes/funybubl.h
@@ -3,8 +3,8 @@
class funybubl_state : public driver_device
{
public:
- funybubl_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ funybubl_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_paletteram;
diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h
index db2389d0fc5..15bfe85500a 100644
--- a/src/mame/includes/fuukifg2.h
+++ b/src/mame/includes/fuukifg2.h
@@ -3,8 +3,8 @@
class fuuki16_state : public driver_device
{
public:
- fuuki16_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ fuuki16_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_vram[4];
diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h
index c94aab99cbf..ec8ac61309e 100644
--- a/src/mame/includes/fuukifg3.h
+++ b/src/mame/includes/fuukifg3.h
@@ -12,8 +12,8 @@
class fuuki32_state : public driver_device
{
public:
- fuuki32_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ fuuki32_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT32 * m_vram[4];
diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h
index aec5c29efb9..5ddbdcf5e45 100644
--- a/src/mame/includes/gaelco.h
+++ b/src/mame/includes/gaelco.h
@@ -7,8 +7,8 @@
class gaelco_state : public driver_device
{
public:
- gaelco_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gaelco_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram;
diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h
index f8bba3daed5..9ee3494d35e 100644
--- a/src/mame/includes/gaelco2.h
+++ b/src/mame/includes/gaelco2.h
@@ -1,8 +1,8 @@
class gaelco2_state : public driver_device
{
public:
- gaelco2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gaelco2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_snowboar_protection;
UINT16 *m_vregs;
diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h
index a9e0694675d..a319a20ca0e 100644
--- a/src/mame/includes/gaelco3d.h
+++ b/src/mame/includes/gaelco3d.h
@@ -14,8 +14,8 @@
class gaelco3d_state : public driver_device
{
public:
- gaelco3d_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gaelco3d_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT32 *m_adsp_ram_base;
UINT16 *m_m68k_ram_base;
diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h
index 6de2885dd52..6a2ebdb9e93 100644
--- a/src/mame/includes/gaiden.h
+++ b/src/mame/includes/gaiden.h
@@ -7,8 +7,8 @@
class gaiden_state : public driver_device
{
public:
- gaiden_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gaiden_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram;
diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h
index 5796ddd0947..2e2edb092e2 100644
--- a/src/mame/includes/galaga.h
+++ b/src/mame/includes/galaga.h
@@ -3,8 +3,8 @@
class galaga_state : public driver_device
{
public:
- galaga_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ galaga_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 *m_galaga_ram1;
@@ -33,8 +33,8 @@ public:
class xevious_state : public galaga_state
{
public:
- xevious_state(running_machine &machine, const driver_device_config_base &config)
- : galaga_state(machine, config) { }
+ xevious_state(const machine_config &mconfig, device_type type, const char *tag)
+ : galaga_state(mconfig, type, tag) { }
UINT8 *m_xevious_fg_videoram;
UINT8 *m_xevious_fg_colorram;
@@ -51,8 +51,8 @@ public:
class bosco_state : public galaga_state
{
public:
- bosco_state(running_machine &machine, const driver_device_config_base &config)
- : galaga_state(machine, config) { }
+ bosco_state(const machine_config &mconfig, device_type type, const char *tag)
+ : galaga_state(mconfig, type, tag) { }
UINT8 *m_bosco_radarattr;
@@ -66,8 +66,8 @@ public:
class digdug_state : public galaga_state
{
public:
- digdug_state(running_machine &machine, const driver_device_config_base &config)
- : galaga_state(machine, config) { }
+ digdug_state(const machine_config &mconfig, device_type type, const char *tag)
+ : galaga_state(mconfig, type, tag) { }
UINT8 *m_digdug_objram;
UINT8 *m_digdug_posram;
diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h
index 4dd6019188d..9fb2ea24d39 100644
--- a/src/mame/includes/galastrm.h
+++ b/src/mame/includes/galastrm.h
@@ -13,8 +13,8 @@ struct tempsprite
class galastrm_state : public driver_device
{
public:
- galastrm_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ galastrm_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 m_coin_word;
UINT16 m_frame_counter;
diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h
index 70db4912c49..ac9baf4a01c 100644
--- a/src/mame/includes/galaxian.h
+++ b/src/mame/includes/galaxian.h
@@ -35,8 +35,8 @@ typedef void (*galaxian_draw_background_func)(running_machine &machine, bitmap_t
class galaxian_state : public driver_device
{
public:
- galaxian_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ galaxian_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
int m_counter_74ls161[2];
diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h
index 31eabe0d9f3..4813fd36f0a 100644
--- a/src/mame/includes/galaxold.h
+++ b/src/mame/includes/galaxold.h
@@ -23,8 +23,8 @@ struct star
class galaxold_state : public driver_device
{
public:
- galaxold_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ galaxold_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_spriteram;
diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h
index 28f86912d1e..1eb6791636f 100644
--- a/src/mame/includes/galivan.h
+++ b/src/mame/includes/galivan.h
@@ -7,8 +7,8 @@
class galivan_state : public driver_device
{
public:
- galivan_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ galivan_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/galpani2.h b/src/mame/includes/galpani2.h
index 0f007db3645..7a1f95f4709 100644
--- a/src/mame/includes/galpani2.h
+++ b/src/mame/includes/galpani2.h
@@ -3,8 +3,8 @@
class galpani2_state : public kaneko16_state
{
public:
- galpani2_state(running_machine &machine, const driver_device_config_base &config)
- : kaneko16_state(machine, config) { }
+ galpani2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : kaneko16_state(mconfig, type, tag) { }
UINT16 *m_bg8[2];
UINT16 *m_palette[2];
diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h
index 26547c74976..c62f7cb5708 100644
--- a/src/mame/includes/galpanic.h
+++ b/src/mame/includes/galpanic.h
@@ -3,8 +3,8 @@
class galpanic_state : public kaneko16_state
{
public:
- galpanic_state(running_machine &machine, const driver_device_config_base &config)
- : kaneko16_state(machine, config) { }
+ galpanic_state(const machine_config &mconfig, device_type type, const char *tag)
+ : kaneko16_state(mconfig, type, tag) { }
UINT16 *m_bgvideoram;
UINT16 *m_fgvideoram;
diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h
index c7eef830f87..650999ece20 100644
--- a/src/mame/includes/galspnbl.h
+++ b/src/mame/includes/galspnbl.h
@@ -8,8 +8,8 @@
class galspnbl_state : public driver_device
{
public:
- galspnbl_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ galspnbl_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram;
diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h
index 59fd5e9bed1..4dfd825e0fe 100644
--- a/src/mame/includes/gameplan.h
+++ b/src/mame/includes/gameplan.h
@@ -24,8 +24,8 @@ driver by Chris Moore
class gameplan_state : public driver_device
{
public:
- gameplan_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ gameplan_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_via_0(*this, "via6522_0"),
m_via_1(*this, "via6522_1"),
m_via_2(*this, "via6522_2") { }
diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h
index f52b288e07b..4b648101df1 100644
--- a/src/mame/includes/gaplus.h
+++ b/src/mame/includes/gaplus.h
@@ -9,8 +9,8 @@ struct star {
class gaplus_state : public driver_device
{
public:
- gaplus_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gaplus_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_customio_3;
UINT8 *m_videoram;
diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h
index f9e3315d67b..ca07c8b8a9e 100644
--- a/src/mame/includes/gatron.h
+++ b/src/mame/includes/gatron.h
@@ -1,8 +1,8 @@
class gatron_state : public driver_device
{
public:
- gatron_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gatron_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
tilemap_t *m_bg_tilemap;
diff --git a/src/mame/includes/gauntlet.h b/src/mame/includes/gauntlet.h
index ea0652e1e54..249139e675b 100644
--- a/src/mame/includes/gauntlet.h
+++ b/src/mame/includes/gauntlet.h
@@ -9,8 +9,8 @@
class gauntlet_state : public atarigen_state
{
public:
- gauntlet_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ gauntlet_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT16 m_sound_reset_val;
UINT8 m_vindctr2_screen_refresh;
diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h
index 0537fb006b5..bf4d5275f94 100644
--- a/src/mame/includes/gberet.h
+++ b/src/mame/includes/gberet.h
@@ -7,8 +7,8 @@
class gberet_state : public driver_device
{
public:
- gberet_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gberet_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/gbusters.h b/src/mame/includes/gbusters.h
index 2c236c6957e..8fc3d4e3f8a 100644
--- a/src/mame/includes/gbusters.h
+++ b/src/mame/includes/gbusters.h
@@ -7,8 +7,8 @@
class gbusters_state : public driver_device
{
public:
- gbusters_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gbusters_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_ram;
diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h
index 202d01ca873..70dc0ff8793 100644
--- a/src/mame/includes/gcpinbal.h
+++ b/src/mame/includes/gcpinbal.h
@@ -5,8 +5,8 @@
class gcpinbal_state : public driver_device
{
public:
- gcpinbal_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ gcpinbal_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_oki(*this, "oki"),
m_msm(*this, "msm") { }
diff --git a/src/mame/includes/gijoe.h b/src/mame/includes/gijoe.h
index 602195f3722..621aa116d42 100644
--- a/src/mame/includes/gijoe.h
+++ b/src/mame/includes/gijoe.h
@@ -7,8 +7,8 @@
class gijoe_state : public driver_device
{
public:
- gijoe_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gijoe_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_workram;
diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h
index 637868912d8..48cb1454a0f 100644
--- a/src/mame/includes/ginganin.h
+++ b/src/mame/includes/ginganin.h
@@ -7,8 +7,8 @@
class ginganin_state : public driver_device
{
public:
- ginganin_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ginganin_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_fgram;
diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h
index 44ff4a1ac81..7f9d41664a8 100644
--- a/src/mame/includes/gladiatr.h
+++ b/src/mame/includes/gladiatr.h
@@ -1,8 +1,8 @@
class gladiatr_state : public driver_device
{
public:
- gladiatr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ gladiatr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT8> m_nvram;
diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h
index 984452fe94d..7e0ac01b4c3 100644
--- a/src/mame/includes/glass.h
+++ b/src/mame/includes/glass.h
@@ -7,8 +7,8 @@
class glass_state : public driver_device
{
public:
- glass_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ glass_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram;
diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h
index 63b3da32461..922dd4b9049 100644
--- a/src/mame/includes/gng.h
+++ b/src/mame/includes/gng.h
@@ -7,8 +7,8 @@
class gng_state : public driver_device
{
public:
- gng_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gng_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bgvideoram;
diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h
index d4c1c21974c..b2de65800c1 100644
--- a/src/mame/includes/goal92.h
+++ b/src/mame/includes/goal92.h
@@ -7,8 +7,8 @@
class goal92_state : public driver_device
{
public:
- goal92_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ goal92_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_bg_data;
diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h
index 99e2b811661..d66a996426b 100644
--- a/src/mame/includes/goindol.h
+++ b/src/mame/includes/goindol.h
@@ -7,8 +7,8 @@
class goindol_state : public driver_device
{
public:
- goindol_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ goindol_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bg_videoram;
diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h
index f6725f745b3..37c5bb25159 100644
--- a/src/mame/includes/goldstar.h
+++ b/src/mame/includes/goldstar.h
@@ -1,8 +1,8 @@
class goldstar_state : public driver_device
{
public:
- goldstar_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ goldstar_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_dataoffset;
diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h
index 4b878ec1a9b..18a5b88b37f 100644
--- a/src/mame/includes/gomoku.h
+++ b/src/mame/includes/gomoku.h
@@ -3,8 +3,8 @@
class gomoku_state : public driver_device
{
public:
- gomoku_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gomoku_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_colorram;
diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h
index 3dc655cc97f..2b66a6b9fcd 100644
--- a/src/mame/includes/gotcha.h
+++ b/src/mame/includes/gotcha.h
@@ -7,8 +7,8 @@
class gotcha_state : public driver_device
{
public:
- gotcha_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gotcha_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_fgvideoram;
diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h
index 222cd81cb4c..4e25f67f868 100644
--- a/src/mame/includes/gottlieb.h
+++ b/src/mame/includes/gottlieb.h
@@ -16,8 +16,8 @@
class gottlieb_state : public driver_device
{
public:
- gottlieb_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gottlieb_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 m_votrax_queue[100];
diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h
index c5a4d41672f..cdaf0dcb63f 100644
--- a/src/mame/includes/gotya.h
+++ b/src/mame/includes/gotya.h
@@ -2,8 +2,8 @@
class gotya_state : public driver_device
{
public:
- gotya_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gotya_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h
index ca57d28ed1a..323de401ca1 100644
--- a/src/mame/includes/gradius3.h
+++ b/src/mame/includes/gradius3.h
@@ -7,8 +7,8 @@
class gradius3_state : public driver_device
{
public:
- gradius3_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gradius3_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_gfxram;
diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h
index 1c825bb85d4..808447a6f57 100644
--- a/src/mame/includes/grchamp.h
+++ b/src/mame/includes/grchamp.h
@@ -9,8 +9,8 @@
class grchamp_state : public driver_device
{
public:
- grchamp_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ grchamp_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_cpu0_out[16];
UINT8 m_cpu1_out[16];
diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h
index 7cdf4c991d7..2df7520adb5 100644
--- a/src/mame/includes/gridlee.h
+++ b/src/mame/includes/gridlee.h
@@ -23,8 +23,8 @@
class gridlee_state : public driver_device
{
public:
- gridlee_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gridlee_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
cpu_device *m_maincpu;
diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h
index ecf5341448c..985fa86f744 100644
--- a/src/mame/includes/groundfx.h
+++ b/src/mame/includes/groundfx.h
@@ -11,8 +11,8 @@ struct tempsprite
class groundfx_state : public driver_device
{
public:
- groundfx_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ groundfx_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 m_coin_word;
UINT16 m_frame_counter;
diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h
index b43bd7577d0..95718a28f3c 100644
--- a/src/mame/includes/gstriker.h
+++ b/src/mame/includes/gstriker.h
@@ -45,8 +45,8 @@ typedef struct
class gstriker_state : public driver_device
{
public:
- gstriker_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gstriker_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 m_dmmy_8f_ret;
int m_pending_command;
diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h
index 55de4d96055..5ce82b92079 100644
--- a/src/mame/includes/gsword.h
+++ b/src/mame/includes/gsword.h
@@ -1,8 +1,8 @@
class gsword_state : public driver_device
{
public:
- gsword_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gsword_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
int m_coins;
diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h
index 080ccf3ec44..11a9ce26065 100644
--- a/src/mame/includes/gumbo.h
+++ b/src/mame/includes/gumbo.h
@@ -7,8 +7,8 @@
class gumbo_state : public driver_device
{
public:
- gumbo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gumbo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_bg_videoram;
diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h
index 661baf21ce4..b6fba6977c4 100644
--- a/src/mame/includes/gunbustr.h
+++ b/src/mame/includes/gunbustr.h
@@ -11,8 +11,8 @@ struct tempsprite
class gunbustr_state : public driver_device
{
public:
- gunbustr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gunbustr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 m_coin_word;
UINT32 *m_ram;
diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h
index 5c7c031fb6e..1939d793862 100644
--- a/src/mame/includes/gundealr.h
+++ b/src/mame/includes/gundealr.h
@@ -7,8 +7,8 @@
class gundealr_state : public driver_device
{
public:
- gundealr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gundealr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bg_videoram;
diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h
index 9e3aa23b25c..eeed81dc719 100644
--- a/src/mame/includes/gunsmoke.h
+++ b/src/mame/includes/gunsmoke.h
@@ -7,8 +7,8 @@
class gunsmoke_state : public driver_device
{
public:
- gunsmoke_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gunsmoke_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h
index eb70ee94cba..9665b65d7f0 100644
--- a/src/mame/includes/gyruss.h
+++ b/src/mame/includes/gyruss.h
@@ -7,8 +7,8 @@
class gyruss_state : public driver_device
{
public:
- gyruss_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ gyruss_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h
index e0e9425b15d..85725912461 100644
--- a/src/mame/includes/hanaawas.h
+++ b/src/mame/includes/hanaawas.h
@@ -7,8 +7,8 @@
class hanaawas_state : public driver_device
{
public:
- hanaawas_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ hanaawas_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h
index 604a04e0545..3e9754ac3ad 100644
--- a/src/mame/includes/harddriv.h
+++ b/src/mame/includes/harddriv.h
@@ -14,8 +14,8 @@
class harddriv_state : public atarigen_state
{
public:
- harddriv_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config),
+ harddriv_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_gsp(*this, "gsp"),
m_msp(*this, "msp"),
diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h
index 61ae2b560c8..ea1fb53525a 100644
--- a/src/mame/includes/hcastle.h
+++ b/src/mame/includes/hcastle.h
@@ -7,8 +7,8 @@
class hcastle_state : public driver_device
{
public:
- hcastle_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ hcastle_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_pf1_videoram;
diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h
index 0dda735fe3d..02e7185704c 100644
--- a/src/mame/includes/hexion.h
+++ b/src/mame/includes/hexion.h
@@ -1,8 +1,8 @@
class hexion_state : public driver_device
{
public:
- hexion_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ hexion_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_vram[2];
UINT8 *m_unkram;
diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h
index e256cdeaba0..2b9dceb70d9 100644
--- a/src/mame/includes/higemaru.h
+++ b/src/mame/includes/higemaru.h
@@ -7,8 +7,8 @@
class higemaru_state : public driver_device
{
public:
- higemaru_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ higemaru_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h
index abe2a05a7dc..c449c93cfb0 100644
--- a/src/mame/includes/himesiki.h
+++ b/src/mame/includes/himesiki.h
@@ -7,8 +7,8 @@
class himesiki_state : public driver_device
{
public:
- himesiki_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ himesiki_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bg_ram;
diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h
index 3c236b42d37..1a1b6138aa1 100644
--- a/src/mame/includes/hitme.h
+++ b/src/mame/includes/hitme.h
@@ -15,8 +15,8 @@
class hitme_state : public driver_device
{
public:
- hitme_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ hitme_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h
index a9a7489db6d..6898ae913c3 100644
--- a/src/mame/includes/hnayayoi.h
+++ b/src/mame/includes/hnayayoi.h
@@ -7,8 +7,8 @@
class hnayayoi_state : public driver_device
{
public:
- hnayayoi_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ hnayayoi_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* video-related */
UINT8 *m_pixmap[8];
diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h
index 84bd6190074..f89b1c8bc8b 100644
--- a/src/mame/includes/hng64.h
+++ b/src/mame/includes/hng64.h
@@ -6,8 +6,8 @@
class hng64_state : public driver_device
{
public:
- hng64_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ hng64_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_mcu_type;
UINT32 *m_mainram;
diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h
index 8d229bd9f3e..3e4c41f2cf7 100644
--- a/src/mame/includes/holeland.h
+++ b/src/mame/includes/holeland.h
@@ -7,8 +7,8 @@
class holeland_state : public driver_device
{
public:
- holeland_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ holeland_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h
index 3e323014586..2ea631c9655 100644
--- a/src/mame/includes/homedata.h
+++ b/src/mame/includes/homedata.h
@@ -2,8 +2,8 @@
class homedata_state : public driver_device
{
public:
- homedata_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ homedata_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_vreg;
diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h
index 754de8e9511..44017718f4c 100644
--- a/src/mame/includes/homerun.h
+++ b/src/mame/includes/homerun.h
@@ -7,8 +7,8 @@
class homerun_state : public driver_device
{
public:
- homerun_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ homerun_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h
index d4b644eb338..90b927d1d0c 100644
--- a/src/mame/includes/hyhoo.h
+++ b/src/mame/includes/hyhoo.h
@@ -1,8 +1,8 @@
class hyhoo_state : public driver_device
{
public:
- hyhoo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ hyhoo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_clut;
int m_blitter_destx;
diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h
index d964e29c8bc..a6639718564 100644
--- a/src/mame/includes/hyperspt.h
+++ b/src/mame/includes/hyperspt.h
@@ -1,8 +1,8 @@
class hyperspt_state : public driver_device
{
public:
- hyperspt_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ hyperspt_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h
index 00b30cc466c..4b05fc5aea5 100644
--- a/src/mame/includes/hyprduel.h
+++ b/src/mame/includes/hyprduel.h
@@ -5,8 +5,8 @@
class hyprduel_state : public driver_device
{
public:
- hyprduel_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ hyprduel_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoregs;
diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h
index 95d88eb0151..616a650eb5b 100644
--- a/src/mame/includes/ikki.h
+++ b/src/mame/includes/ikki.h
@@ -7,8 +7,8 @@
class ikki_state : public driver_device
{
public:
- ikki_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ikki_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h
index 12c8a71c6e4..476a9df126c 100644
--- a/src/mame/includes/inufuku.h
+++ b/src/mame/includes/inufuku.h
@@ -2,8 +2,8 @@
class inufuku_state : public driver_device
{
public:
- inufuku_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ inufuku_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_bg_videoram;
diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h
index 1ff6886c78b..2e58ada783b 100644
--- a/src/mame/includes/iqblock.h
+++ b/src/mame/includes/iqblock.h
@@ -1,8 +1,8 @@
class iqblock_state : public driver_device
{
public:
- iqblock_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ iqblock_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_rambase;
UINT8 *m_bgvideoram;
diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h
index 5980fab1869..41b957ae871 100644
--- a/src/mame/includes/irobot.h
+++ b/src/mame/includes/irobot.h
@@ -24,8 +24,8 @@ typedef struct irmb_ops
class irobot_state : public driver_device
{
public:
- irobot_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ irobot_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT8> m_nvram;
diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h
index 5a3a2726852..f185480ab0a 100644
--- a/src/mame/includes/ironhors.h
+++ b/src/mame/includes/ironhors.h
@@ -7,8 +7,8 @@
class ironhors_state : public driver_device
{
public:
- ironhors_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ironhors_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h
index 7f84dd03da4..94304c2f801 100644
--- a/src/mame/includes/itech32.h
+++ b/src/mame/includes/itech32.h
@@ -17,8 +17,8 @@
class itech32_state : public driver_device
{
public:
- itech32_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ itech32_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
void nvram_init(nvram_device &nvram, void *base, size_t length);
diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h
index 25f7b9ede48..ef4aa79064b 100644
--- a/src/mame/includes/itech8.h
+++ b/src/mame/includes/itech8.h
@@ -12,8 +12,8 @@
class itech8_state : public driver_device
{
public:
- itech8_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ itech8_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_grom_bank;
UINT8 m_blitter_int;
diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h
index f8d677f8a8a..3143ba7461e 100644
--- a/src/mame/includes/jack.h
+++ b/src/mame/includes/jack.h
@@ -7,8 +7,8 @@
class jack_state : public driver_device
{
public:
- jack_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ jack_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h
index b939f3a40a0..9340830d60d 100644
--- a/src/mame/includes/jackal.h
+++ b/src/mame/includes/jackal.h
@@ -7,8 +7,8 @@
class jackal_state : public driver_device
{
public:
- jackal_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ jackal_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoctrl;
diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h
index 8ceaaba486c..e1ca6e5e4af 100644
--- a/src/mame/includes/jailbrek.h
+++ b/src/mame/includes/jailbrek.h
@@ -10,8 +10,8 @@
class jailbrek_state : public driver_device
{
public:
- jailbrek_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ jailbrek_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h
index a32a08bdc87..be02576d6f4 100644
--- a/src/mame/includes/jedi.h
+++ b/src/mame/includes/jedi.h
@@ -17,8 +17,8 @@
class jedi_state : public driver_device
{
public:
- jedi_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ jedi_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT8> m_nvram;
diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h
index 1fe3d2e6ea5..b688413f32d 100644
--- a/src/mame/includes/jpmimpct.h
+++ b/src/mame/includes/jpmimpct.h
@@ -52,8 +52,8 @@ struct bt477_t
class jpmimpct_state : public driver_device
{
public:
- jpmimpct_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ jpmimpct_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_tms_irq;
UINT8 m_duart_1_irq;
diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h
index 2c039306526..bd37b13a043 100644
--- a/src/mame/includes/kaneko16.h
+++ b/src/mame/includes/kaneko16.h
@@ -71,8 +71,8 @@ typedef struct
class kaneko16_state : public driver_device
{
public:
- kaneko16_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ kaneko16_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_mcu_ram;
UINT8 m_nvram_save[128];
diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h
index 572136a344b..0c13419a834 100644
--- a/src/mame/includes/kangaroo.h
+++ b/src/mame/includes/kangaroo.h
@@ -9,8 +9,8 @@
class kangaroo_state : public driver_device
{
public:
- kangaroo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ kangaroo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_video_control;
diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h
index 2fe80088c08..70d651dc7f7 100644
--- a/src/mame/includes/karnov.h
+++ b/src/mame/includes/karnov.h
@@ -7,8 +7,8 @@
class karnov_state : public driver_device
{
public:
- karnov_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ karnov_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram;
diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h
index 3f978551e91..1104b2a1a5f 100644
--- a/src/mame/includes/kchamp.h
+++ b/src/mame/includes/kchamp.h
@@ -7,8 +7,8 @@
class kchamp_state : public driver_device
{
public:
- kchamp_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ kchamp_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h
index 286e1287dd4..e1070c0c741 100644
--- a/src/mame/includes/kickgoal.h
+++ b/src/mame/includes/kickgoal.h
@@ -10,8 +10,8 @@
class kickgoal_state : public driver_device
{
public:
- kickgoal_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ kickgoal_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_adpcm(*this, "oki"),
m_eeprom(*this, "eeprom") { }
diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h
index c9157f540c5..0eaba02f092 100644
--- a/src/mame/includes/kingobox.h
+++ b/src/mame/includes/kingobox.h
@@ -7,8 +7,8 @@
class kingofb_state : public driver_device
{
public:
- kingofb_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ kingofb_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h
index 168436c0094..9b4f591a7dd 100644
--- a/src/mame/includes/klax.h
+++ b/src/mame/includes/klax.h
@@ -9,8 +9,8 @@
class klax_state : public atarigen_state
{
public:
- klax_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ klax_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
};
diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h
index b6893d79fa0..38d8139f4bd 100644
--- a/src/mame/includes/kncljoe.h
+++ b/src/mame/includes/kncljoe.h
@@ -7,8 +7,8 @@
class kncljoe_state : public driver_device
{
public:
- kncljoe_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ kncljoe_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h
index 9a20ad12ef1..8afb8071ae5 100644
--- a/src/mame/includes/kopunch.h
+++ b/src/mame/includes/kopunch.h
@@ -7,8 +7,8 @@
class kopunch_state : public driver_device
{
public:
- kopunch_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ kopunch_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h
index f47de06a6a9..efa526954fa 100644
--- a/src/mame/includes/ksayakyu.h
+++ b/src/mame/includes/ksayakyu.h
@@ -7,8 +7,8 @@
class ksayakyu_state : public driver_device
{
public:
- ksayakyu_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ksayakyu_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h
index 3da13d15fc6..3d2bca6fbc6 100644
--- a/src/mame/includes/kyugo.h
+++ b/src/mame/includes/kyugo.h
@@ -7,8 +7,8 @@
class kyugo_state : public driver_device
{
public:
- kyugo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ kyugo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_fgvideoram;
diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h
index 1a54f1227c0..12a646f9d91 100644
--- a/src/mame/includes/labyrunr.h
+++ b/src/mame/includes/labyrunr.h
@@ -7,8 +7,8 @@
class labyrunr_state : public driver_device
{
public:
- labyrunr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ labyrunr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram1;
diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h
index 606adb7004c..b35856b0257 100644
--- a/src/mame/includes/ladybug.h
+++ b/src/mame/includes/ladybug.h
@@ -9,8 +9,8 @@
class ladybug_state : public driver_device
{
public:
- ladybug_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ladybug_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h
index 1a411cd93e6..13bfca079b3 100644
--- a/src/mame/includes/ladyfrog.h
+++ b/src/mame/includes/ladyfrog.h
@@ -7,8 +7,8 @@
class ladyfrog_state : public driver_device
{
public:
- ladyfrog_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ladyfrog_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h
index 5a41b42ad54..43aa059268b 100644
--- a/src/mame/includes/laserbat.h
+++ b/src/mame/includes/laserbat.h
@@ -7,8 +7,8 @@
class laserbat_state : public driver_device
{
public:
- laserbat_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ laserbat_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* video-related */
tilemap_t *m_bg_tilemap;
diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h
index c61e31bc6ad..1cd08df1cd7 100644
--- a/src/mame/includes/lasso.h
+++ b/src/mame/includes/lasso.h
@@ -7,8 +7,8 @@
class lasso_state : public driver_device
{
public:
- lasso_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ lasso_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h
index f2db954ae9b..632d2cc02db 100644
--- a/src/mame/includes/lastduel.h
+++ b/src/mame/includes/lastduel.h
@@ -7,8 +7,8 @@
class lastduel_state : public driver_device
{
public:
- lastduel_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ lastduel_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_vram;
diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h
index c210decb26b..be1766926a5 100644
--- a/src/mame/includes/lazercmd.h
+++ b/src/mame/includes/lazercmd.h
@@ -20,8 +20,8 @@
class lazercmd_state : public driver_device
{
public:
- lazercmd_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ lazercmd_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h
index f42844aa44f..d0ab7601534 100644
--- a/src/mame/includes/legionna.h
+++ b/src/mame/includes/legionna.h
@@ -1,8 +1,8 @@
class legionna_state : public driver_device
{
public:
- legionna_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ legionna_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_back_data;
UINT16 *m_fore_data;
diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h
index 26642ef6047..c035da5386b 100644
--- a/src/mame/includes/leland.h
+++ b/src/mame/includes/leland.h
@@ -21,8 +21,8 @@ struct vram_state_data
class leland_state : public driver_device
{
public:
- leland_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ leland_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_dac_control;
UINT8 *m_alleymas_kludge_mem;
diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h
index e47f40cdff7..5852da9d0e3 100644
--- a/src/mame/includes/lemmings.h
+++ b/src/mame/includes/lemmings.h
@@ -2,8 +2,8 @@
class lemmings_state : public driver_device
{
public:
- lemmings_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ lemmings_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_pixel_0_data;
diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h
index d7543820ac5..7821834180c 100644
--- a/src/mame/includes/lethal.h
+++ b/src/mame/includes/lethal.h
@@ -7,8 +7,8 @@
class lethal_state : public driver_device
{
public:
- lethal_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ lethal_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT8 * m_paletteram; // currently this uses generic palette handling
diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h
index a18af214b9a..0265bc33b3b 100644
--- a/src/mame/includes/lethalj.h
+++ b/src/mame/includes/lethalj.h
@@ -7,8 +7,8 @@
class lethalj_state : public driver_device
{
public:
- lethalj_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ lethalj_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 m_blitter_data[8];
UINT16 *m_screenram;
diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h
index a45301a26ac..1110ae4e4a0 100644
--- a/src/mame/includes/liberate.h
+++ b/src/mame/includes/liberate.h
@@ -1,8 +1,8 @@
class liberate_state : public driver_device
{
public:
- liberate_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ liberate_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_colorram;
diff --git a/src/mame/includes/liberatr.h b/src/mame/includes/liberatr.h
index 64317b3d92f..9d3f796c8e9 100644
--- a/src/mame/includes/liberatr.h
+++ b/src/mame/includes/liberatr.h
@@ -11,8 +11,8 @@
class liberatr_state : public atarigen_state
{
public:
- liberatr_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config),
+ liberatr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag),
m_base_ram(*this, "base_ram"),
m_planet_frame(*this, "planet_frame"),
m_planet_select(*this, "planet_select"),
diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h
index 8ea34030656..de81488397c 100644
--- a/src/mame/includes/lkage.h
+++ b/src/mame/includes/lkage.h
@@ -2,8 +2,8 @@
class lkage_state : public driver_device
{
public:
- lkage_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ lkage_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 * m_scroll;
UINT8 * m_vreg;
diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h
index 19f8d1efc98..b071d5515c6 100644
--- a/src/mame/includes/lockon.h
+++ b/src/mame/includes/lockon.h
@@ -18,8 +18,8 @@
class lockon_state : public driver_device
{
public:
- lockon_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ lockon_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 *m_char_ram;
diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h
index 4f825d3208f..681f3e91220 100644
--- a/src/mame/includes/lordgun.h
+++ b/src/mame/includes/lordgun.h
@@ -14,8 +14,8 @@ struct _lordgun_gun_data
class lordgun_state : public driver_device
{
public:
- lordgun_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ lordgun_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_old;
UINT8 m_aliencha_dip_sel;
diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h
index 64698a3f802..02d22f24b4f 100644
--- a/src/mame/includes/lsasquad.h
+++ b/src/mame/includes/lsasquad.h
@@ -2,8 +2,8 @@
class lsasquad_state : public driver_device
{
public:
- lsasquad_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ lsasquad_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_scrollram;
diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h
index 395084d8646..9170804cdaf 100644
--- a/src/mame/includes/lucky74.h
+++ b/src/mame/includes/lucky74.h
@@ -1,8 +1,8 @@
class lucky74_state : public driver_device
{
public:
- lucky74_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ lucky74_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_ym2149_portb;
UINT8 m_usart_8251;
diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h
index ca42d87cd4d..39addbd582a 100644
--- a/src/mame/includes/lvcards.h
+++ b/src/mame/includes/lvcards.h
@@ -1,8 +1,8 @@
class lvcards_state : public driver_device
{
public:
- lvcards_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ lvcards_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_payout;
UINT8 m_pulse;
diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h
index 2d5445f04a6..49b8f86698b 100644
--- a/src/mame/includes/lwings.h
+++ b/src/mame/includes/lwings.h
@@ -2,8 +2,8 @@
class lwings_state : public driver_device
{
public:
- lwings_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ lwings_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_fgvideoram;
diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h
index 9c3ab489475..84544e04197 100644
--- a/src/mame/includes/m10.h
+++ b/src/mame/includes/m10.h
@@ -30,8 +30,8 @@
class m10_state : public driver_device
{
public:
- m10_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ m10_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_chargen;
diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h
index e5e1f8fba7c..d32a9ac45d3 100644
--- a/src/mame/includes/m107.h
+++ b/src/mame/includes/m107.h
@@ -16,8 +16,8 @@ struct _pf_layer_info
class m107_state : public driver_device
{
public:
- m107_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ m107_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
emu_timer *m_scanline_timer;
UINT8 m_irq_vectorbase;
diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h
index 689d6f3896a..8baea175a59 100644
--- a/src/mame/includes/m52.h
+++ b/src/mame/includes/m52.h
@@ -1,8 +1,8 @@
class m52_state : public driver_device
{
public:
- m52_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ m52_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h
index 6a3a74e57c4..94b0e8bedcf 100644
--- a/src/mame/includes/m57.h
+++ b/src/mame/includes/m57.h
@@ -1,8 +1,8 @@
class m57_state : public driver_device
{
public:
- m57_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ m57_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h
index 955025d91cc..be6b2775110 100644
--- a/src/mame/includes/m58.h
+++ b/src/mame/includes/m58.h
@@ -1,8 +1,8 @@
class m58_state : public driver_device
{
public:
- m58_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ m58_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h
index ee75202574a..f1dd2843593 100644
--- a/src/mame/includes/m62.h
+++ b/src/mame/includes/m62.h
@@ -1,8 +1,8 @@
class m62_state : public driver_device
{
public:
- m62_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ m62_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_spriteram;
diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h
index 62982fb1445..a117708c325 100644
--- a/src/mame/includes/m72.h
+++ b/src/mame/includes/m72.h
@@ -7,8 +7,8 @@
class m72_state : public driver_device
{
public:
- m72_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ m72_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_protection_ram;
emu_timer *m_scanline_timer;
diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h
index 23908fa50d8..655cb5b90c7 100644
--- a/src/mame/includes/m90.h
+++ b/src/mame/includes/m90.h
@@ -1,8 +1,8 @@
class m90_state : public driver_device
{
public:
- m90_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ m90_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_video_data;
UINT16 *m_spriteram;
diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h
index d602a960bfa..1263dfd9b10 100644
--- a/src/mame/includes/m92.h
+++ b/src/mame/includes/m92.h
@@ -16,8 +16,8 @@ struct _pf_layer_info
class m92_state : public driver_device
{
public:
- m92_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ m92_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_irqvector;
UINT16 m_sound_status;
diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h
index b950853c2de..73fa552bd7e 100644
--- a/src/mame/includes/macrossp.h
+++ b/src/mame/includes/macrossp.h
@@ -7,8 +7,8 @@
class macrossp_state : public driver_device
{
public:
- macrossp_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ macrossp_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT32 * m_mainram;
diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h
index 1e5df150c58..d9d193ed4e7 100644
--- a/src/mame/includes/madalien.h
+++ b/src/mame/includes/madalien.h
@@ -15,8 +15,8 @@
class madalien_state : public driver_device
{
public:
- madalien_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ madalien_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_shift_hi;
UINT8 *m_shift_lo;
diff --git a/src/mame/includes/madmotor.h b/src/mame/includes/madmotor.h
index 2d4c8a891e2..39bad970420 100644
--- a/src/mame/includes/madmotor.h
+++ b/src/mame/includes/madmotor.h
@@ -7,8 +7,8 @@
class madmotor_state : public driver_device
{
public:
- madmotor_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ madmotor_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_spriteram;
diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h
index 9c5e292f39f..833fbe3d556 100644
--- a/src/mame/includes/magmax.h
+++ b/src/mame/includes/magmax.h
@@ -1,8 +1,8 @@
class magmax_state : public driver_device
{
public:
- magmax_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ magmax_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
UINT8 m_sound_latch;
diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h
index 633d126efcc..6f2f1ff4f22 100644
--- a/src/mame/includes/mainevt.h
+++ b/src/mame/includes/mainevt.h
@@ -7,8 +7,8 @@
class mainevt_state : public driver_device
{
public:
- mainevt_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mainevt_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT8 * m_paletteram; // currently this uses generic palette handling
diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h
index f8f65583342..8793f1ec934 100644
--- a/src/mame/includes/mainsnk.h
+++ b/src/mame/includes/mainsnk.h
@@ -1,8 +1,8 @@
class mainsnk_state : public driver_device
{
public:
- mainsnk_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mainsnk_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
tilemap_t *m_tx_tilemap;
tilemap_t *m_bg_tilemap;
diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h
index 9ff28aa9757..2280a2089fc 100644
--- a/src/mame/includes/malzak.h
+++ b/src/mame/includes/malzak.h
@@ -8,8 +8,8 @@
class malzak_state : public driver_device
{
public:
- malzak_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ malzak_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* misc */
// int playfield_x[256];
diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h
index 1253c33daeb..09d8647bc11 100644
--- a/src/mame/includes/mappy.h
+++ b/src/mame/includes/mappy.h
@@ -1,8 +1,8 @@
class mappy_state : public driver_device
{
public:
- mappy_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mappy_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_spriteram;
diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h
index d64669e421e..0f455d01414 100644
--- a/src/mame/includes/marineb.h
+++ b/src/mame/includes/marineb.h
@@ -1,8 +1,8 @@
class marineb_state : public driver_device
{
public:
- marineb_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ marineb_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 * m_videoram;
UINT8 * m_colorram;
diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h
index 7914c064f1b..509d43ccf85 100644
--- a/src/mame/includes/mario.h
+++ b/src/mame/includes/mario.h
@@ -33,8 +33,8 @@
class mario_state : public driver_device
{
public:
- mario_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mario_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h
index 0df178d507f..dd8aabac908 100644
--- a/src/mame/includes/markham.h
+++ b/src/mame/includes/markham.h
@@ -7,8 +7,8 @@
class markham_state : public driver_device
{
public:
- markham_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ markham_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h
index 01e8f4666da..c321a1eb4be 100644
--- a/src/mame/includes/matmania.h
+++ b/src/mame/includes/matmania.h
@@ -2,8 +2,8 @@
class matmania_state : public driver_device
{
public:
- matmania_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ matmania_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h
index 736c6cf32ba..db1d515716b 100644
--- a/src/mame/includes/mcatadv.h
+++ b/src/mame/includes/mcatadv.h
@@ -2,8 +2,8 @@
class mcatadv_state : public driver_device
{
public:
- mcatadv_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mcatadv_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram1;
diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h
index a5cad9b710c..79abd73c4c9 100644
--- a/src/mame/includes/mcr.h
+++ b/src/mame/includes/mcr.h
@@ -16,8 +16,8 @@
class mcr_state : public driver_device
{
public:
- mcr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mcr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
};
diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h
index cb97e62fddc..546d2a586bc 100644
--- a/src/mame/includes/mcr3.h
+++ b/src/mame/includes/mcr3.h
@@ -1,8 +1,8 @@
class mcr3_state : public driver_device
{
public:
- mcr3_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mcr3_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_spriteram;
diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h
index b912e2de5cd..d43b2a03063 100644
--- a/src/mame/includes/mcr68.h
+++ b/src/mame/includes/mcr68.h
@@ -13,8 +13,8 @@ struct counter_state
class mcr68_state : public driver_device
{
public:
- mcr68_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mcr68_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
UINT16 m_control_word;
diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h
index 207fbd720ed..67714892f07 100644
--- a/src/mame/includes/meadows.h
+++ b/src/mame/includes/meadows.h
@@ -9,8 +9,8 @@
class meadows_state : public driver_device
{
public:
- meadows_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ meadows_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 m_dac;
diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h
index f6d4ef05364..6c518df6f78 100644
--- a/src/mame/includes/megadriv.h
+++ b/src/mame/includes/megadriv.h
@@ -95,15 +95,15 @@ extern int megadrive_region_pal;
class md_base_state : public driver_device
{
public:
- md_base_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ md_base_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
};
class md_boot_state : public md_base_state
{
public:
- md_boot_state(running_machine &machine, const driver_device_config_base &config)
- : md_base_state(machine, config) { }
+ md_boot_state(const machine_config &mconfig, device_type type, const char *tag)
+ : md_base_state(mconfig, type, tag) { }
// bootleg specific
int m_aladmdb_mcu_port;
@@ -112,8 +112,8 @@ public:
class segac2_state : public md_base_state
{
public:
- segac2_state(running_machine &machine, const driver_device_config_base &config)
- : md_base_state(machine, config) { }
+ segac2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : md_base_state(mconfig, type, tag) { }
// for Print Club only
int m_cam_data;
@@ -143,8 +143,8 @@ public:
class mplay_state : public md_base_state
{
public:
- mplay_state(running_machine &machine, const driver_device_config_base &config)
- : md_base_state(machine, config) { }
+ mplay_state(const machine_config &mconfig, device_type type, const char *tag)
+ : md_base_state(mconfig, type, tag) { }
UINT32 m_bios_mode; // determines whether ROM banks or Game data
// is to read from 0x8000-0xffff
@@ -169,8 +169,8 @@ public:
class mtech_state : public md_base_state
{
public:
- mtech_state(running_machine &machine, const driver_device_config_base &config)
- : md_base_state(machine, config) { }
+ mtech_state(const machine_config &mconfig, device_type type, const char *tag)
+ : md_base_state(mconfig, type, tag) { }
UINT8 m_mt_cart_select_reg;
UINT32 m_bios_port_ctrl;
@@ -216,8 +216,8 @@ struct _megadriv_cart
class md_cons_state : public md_base_state
{
public:
- md_cons_state(running_machine &machine, const driver_device_config_base &config)
- : md_base_state(machine, config) { }
+ md_cons_state(const machine_config &mconfig, device_type type, const char *tag)
+ : md_base_state(mconfig, type, tag) { }
emu_timer *m_mess_io_timeout[3];
int m_mess_io_stage[3];
@@ -229,8 +229,8 @@ public:
class pico_state : public md_cons_state
{
public:
- pico_state(running_machine &machine, const driver_device_config_base &config)
- : md_cons_state(machine, config) { }
+ pico_state(const machine_config &mconfig, device_type type, const char *tag)
+ : md_cons_state(mconfig, type, tag) { }
UINT8 m_page_register;
};
@@ -238,8 +238,8 @@ public:
class mdsvp_state : public md_cons_state
{
public:
- mdsvp_state(running_machine &machine, const driver_device_config_base &config)
- : md_cons_state(machine, config) { }
+ mdsvp_state(const machine_config &mconfig, device_type type, const char *tag)
+ : md_cons_state(mconfig, type, tag) { }
UINT8 *m_iram; // IRAM (0-0x7ff)
UINT8 *m_dram; // [0x20000];
@@ -254,15 +254,15 @@ public:
class _32x_state : public md_base_state
{
public:
- _32x_state(running_machine &machine, const driver_device_config_base &config)
- : md_base_state(machine, config) { }
+ _32x_state(const machine_config &mconfig, device_type type, const char *tag)
+ : md_base_state(mconfig, type, tag) { }
};
class segacd_state : public _32x_state // use _32x_state as base to make easier the combo 32X + SCD
{
public:
- segacd_state(running_machine &machine, const driver_device_config_base &config)
- : _32x_state(machine, config) { }
+ segacd_state(const machine_config &mconfig, device_type type, const char *tag)
+ : _32x_state(mconfig, type, tag) { }
};
diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h
index 9aa01aa6b29..c61123ea89b 100644
--- a/src/mame/includes/megasys1.h
+++ b/src/mame/includes/megasys1.h
@@ -17,8 +17,8 @@
class megasys1_state : public driver_device
{
public:
- megasys1_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ megasys1_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_spriteram;
UINT16 m_ip_select;
diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h
index febd019d3f3..8bf2caac6e0 100644
--- a/src/mame/includes/megazone.h
+++ b/src/mame/includes/megazone.h
@@ -7,8 +7,8 @@
class megazone_state : public driver_device
{
public:
- megazone_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ megazone_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_scrollx;
diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h
index 865c3ead679..ab81f90d88d 100644
--- a/src/mame/includes/mermaid.h
+++ b/src/mame/includes/mermaid.h
@@ -7,8 +7,8 @@
class mermaid_state : public driver_device
{
public:
- mermaid_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mermaid_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/metalmx.h b/src/mame/includes/metalmx.h
index 6e5170125a2..211e2e31168 100644
--- a/src/mame/includes/metalmx.h
+++ b/src/mame/includes/metalmx.h
@@ -6,8 +6,8 @@
class metalmx_state : public driver_device
{
public:
- metalmx_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ metalmx_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_gsp(*this, "gsp"),
m_adsp(*this, "adsp"),
diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h
index f73a6883411..6e3b50e0be0 100644
--- a/src/mame/includes/metlclsh.h
+++ b/src/mame/includes/metlclsh.h
@@ -7,8 +7,8 @@
class metlclsh_state : public driver_device
{
public:
- metlclsh_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ metlclsh_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bgram;
diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h
index e517022a1bc..e8d4005834f 100644
--- a/src/mame/includes/metro.h
+++ b/src/mame/includes/metro.h
@@ -11,8 +11,8 @@
class metro_state : public driver_device
{
public:
- metro_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ metro_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_oki(*this, "oki"),
diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h
index eec13203cdb..88195620cc4 100644
--- a/src/mame/includes/mexico86.h
+++ b/src/mame/includes/mexico86.h
@@ -2,8 +2,8 @@
class mexico86_state : public driver_device
{
public:
- mexico86_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mexico86_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_protection_ram;
diff --git a/src/mame/includes/mhavoc.h b/src/mame/includes/mhavoc.h
index 147d0aab736..ef174f5132b 100644
--- a/src/mame/includes/mhavoc.h
+++ b/src/mame/includes/mhavoc.h
@@ -18,8 +18,8 @@
class mhavoc_state : public driver_device
{
public:
- mhavoc_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mhavoc_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_zram0;
UINT8 *m_zram1;
diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h
index 18413a38748..2ad4399162e 100644
--- a/src/mame/includes/micro3d.h
+++ b/src/mame/includes/micro3d.h
@@ -15,8 +15,8 @@
class micro3d_state : public driver_device
{
public:
- micro3d_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ micro3d_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_shared_ram;
device_t *m_duart68681;
diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h
index 07761128220..6bc7b16f914 100644
--- a/src/mame/includes/midtunit.h
+++ b/src/mame/includes/midtunit.h
@@ -7,8 +7,8 @@
class midtunit_state : public driver_device
{
public:
- midtunit_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ midtunit_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT16> m_nvram;
diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h
index a16ca6b14c1..3b489714ac5 100644
--- a/src/mame/includes/midvunit.h
+++ b/src/mame/includes/midvunit.h
@@ -11,8 +11,8 @@
class midvunit_state : public driver_device
{
public:
- midvunit_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ midvunit_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
optional_shared_ptr<UINT32> m_nvram;
diff --git a/src/mame/includes/midwunit.h b/src/mame/includes/midwunit.h
index 4956cecfbde..188e039d8f0 100644
--- a/src/mame/includes/midwunit.h
+++ b/src/mame/includes/midwunit.h
@@ -7,8 +7,8 @@
class midwunit_state : public driver_device
{
public:
- midwunit_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ midwunit_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT16> m_nvram;
diff --git a/src/mame/includes/midxunit.h b/src/mame/includes/midxunit.h
index e4cd52db175..9e30d17069c 100644
--- a/src/mame/includes/midxunit.h
+++ b/src/mame/includes/midxunit.h
@@ -7,8 +7,8 @@
class midxunit_state : public driver_device
{
public:
- midxunit_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ midxunit_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT16> m_nvram;
diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h
index 1e8745af07a..e984bc6c7bb 100644
--- a/src/mame/includes/midyunit.h
+++ b/src/mame/includes/midyunit.h
@@ -30,8 +30,8 @@ struct dma_state_t
class midyunit_state : public driver_device
{
public:
- midyunit_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ midyunit_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_cmos_ram;
UINT32 m_cmos_page;
diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h
index ea9c34323cc..dc50589cefd 100644
--- a/src/mame/includes/midzeus.h
+++ b/src/mame/includes/midzeus.h
@@ -9,8 +9,8 @@
class midzeus_state : public driver_device
{
public:
- midzeus_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ midzeus_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT32> m_nvram;
diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h
index 83609652fcd..690edb46ec1 100644
--- a/src/mame/includes/mikie.h
+++ b/src/mame/includes/mikie.h
@@ -7,8 +7,8 @@
class mikie_state : public driver_device
{
public:
- mikie_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mikie_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h
index ae3f459fb7a..3d6eb372ab5 100644
--- a/src/mame/includes/mitchell.h
+++ b/src/mame/includes/mitchell.h
@@ -9,8 +9,8 @@
class mitchell_state : public driver_device
{
public:
- mitchell_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ mitchell_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_audiocpu(*this, "audiocpu"),
m_oki(*this, "oki") { }
diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h
index ac9be177417..d84c108e90c 100644
--- a/src/mame/includes/mjkjidai.h
+++ b/src/mame/includes/mjkjidai.h
@@ -1,8 +1,8 @@
class mjkjidai_state : public driver_device
{
public:
- mjkjidai_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mjkjidai_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_spriteram1;
diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h
index 42781604410..5952773326e 100644
--- a/src/mame/includes/model1.h
+++ b/src/mame/includes/model1.h
@@ -6,8 +6,8 @@ enum {MAT_STACK_SIZE = 32};
class model1_state : public driver_device
{
public:
- model1_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ model1_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
struct view *m_view;
struct point *m_pointdb;
diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h
index 2f3e7c45e43..65a93595617 100644
--- a/src/mame/includes/model2.h
+++ b/src/mame/includes/model2.h
@@ -8,8 +8,8 @@ typedef struct _geo_state geo_state;
class model2_state : public driver_device
{
public:
- model2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ model2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT32 *m_workram;
UINT32 m_intreq;
diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h
index b2f93643f82..1a8076464e7 100644
--- a/src/mame/includes/model3.h
+++ b/src/mame/includes/model3.h
@@ -13,8 +13,8 @@ typedef struct _cached_texture cached_texture;
class model3_state : public driver_device
{
public:
- model3_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ model3_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_irq_enable;
UINT8 m_irq_state;
diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h
index 618c6088afc..2a8b5bbc798 100644
--- a/src/mame/includes/momoko.h
+++ b/src/mame/includes/momoko.h
@@ -7,8 +7,8 @@
class momoko_state : public driver_device
{
public:
- momoko_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ momoko_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bg_scrollx;
diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h
index 4a160c69cec..a166987338c 100644
--- a/src/mame/includes/moo.h
+++ b/src/mame/includes/moo.h
@@ -7,8 +7,8 @@
class moo_state : public driver_device
{
public:
- moo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ moo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_workram;
diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h
index 900051f471f..015960bd3d9 100644
--- a/src/mame/includes/mosaic.h
+++ b/src/mame/includes/mosaic.h
@@ -7,8 +7,8 @@
class mosaic_state : public driver_device
{
public:
- mosaic_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mosaic_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_fgvideoram;
diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h
index bd3839a2bef..2e6acf33f9f 100644
--- a/src/mame/includes/mouser.h
+++ b/src/mame/includes/mouser.h
@@ -7,8 +7,8 @@
class mouser_state : public driver_device
{
public:
- mouser_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mouser_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h
index c3abb083e1c..0d1c28274cb 100644
--- a/src/mame/includes/mrdo.h
+++ b/src/mame/includes/mrdo.h
@@ -7,8 +7,8 @@
class mrdo_state : public driver_device
{
public:
- mrdo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mrdo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bgvideoram;
diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h
index b594e848285..acf1e4c121a 100644
--- a/src/mame/includes/mrflea.h
+++ b/src/mame/includes/mrflea.h
@@ -7,8 +7,8 @@
class mrflea_state : public driver_device
{
public:
- mrflea_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mrflea_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h
index fe6ae0b25ca..2de79c911be 100644
--- a/src/mame/includes/mrjong.h
+++ b/src/mame/includes/mrjong.h
@@ -7,8 +7,8 @@
class mrjong_state : public driver_device
{
public:
- mrjong_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mrjong_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h
index e08628c59b0..fbeb158faa2 100644
--- a/src/mame/includes/ms32.h
+++ b/src/mame/includes/ms32.h
@@ -1,8 +1,8 @@
class ms32_state : public driver_device
{
public:
- ms32_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ms32_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_nvram_8;
UINT32 *m_mahjong_input_select;
diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h
index ea0fc1d0406..dea7234ae66 100644
--- a/src/mame/includes/msisaac.h
+++ b/src/mame/includes/msisaac.h
@@ -4,8 +4,8 @@
class msisaac_state : public driver_device
{
public:
- msisaac_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ msisaac_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h
index 3e9dcc4e380..bd5ff20f144 100644
--- a/src/mame/includes/mugsmash.h
+++ b/src/mame/includes/mugsmash.h
@@ -2,8 +2,8 @@
class mugsmash_state : public driver_device
{
public:
- mugsmash_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mugsmash_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram1;
UINT16 *m_videoram2;
diff --git a/src/mame/includes/multfish.h b/src/mame/includes/multfish.h
index 07bc6002b9d..4a907d92447 100644
--- a/src/mame/includes/multfish.h
+++ b/src/mame/includes/multfish.h
@@ -7,8 +7,8 @@
class multfish_state : public driver_device
{
public:
- multfish_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ multfish_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* Video related */
diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h
index f71c12a6a5f..fb702d1cbc9 100644
--- a/src/mame/includes/munchmo.h
+++ b/src/mame/includes/munchmo.h
@@ -7,8 +7,8 @@
class munchmo_state : public driver_device
{
public:
- munchmo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ munchmo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_vreg;
diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h
index ce1c54bf9da..91968b3a040 100644
--- a/src/mame/includes/mustache.h
+++ b/src/mame/includes/mustache.h
@@ -1,8 +1,8 @@
class mustache_state : public driver_device
{
public:
- mustache_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mustache_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
emu_timer *m_clear_irq_timer;
diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h
index 9333631d319..676bd43e68b 100644
--- a/src/mame/includes/mw8080bw.h
+++ b/src/mame/includes/mw8080bw.h
@@ -33,8 +33,8 @@
class mw8080bw_state : public driver_device
{
public:
- mw8080bw_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mw8080bw_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_main_ram;
diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h
index 99256f23914..feb52763136 100644
--- a/src/mame/includes/mystston.h
+++ b/src/mame/includes/mystston.h
@@ -13,8 +13,8 @@
class mystston_state : public driver_device
{
public:
- mystston_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mystston_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* machine state */
UINT8 *m_ay8910_data;
diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h
index bb21c8bda08..5df176a8e8b 100644
--- a/src/mame/includes/mystwarr.h
+++ b/src/mame/includes/mystwarr.h
@@ -1,8 +1,8 @@
class mystwarr_state : public driver_device
{
public:
- mystwarr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ mystwarr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_gx_workram;
UINT8 m_mw_irq_control;
diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h
index a778d6150f9..c6fca55b101 100644
--- a/src/mame/includes/n64.h
+++ b/src/mame/includes/n64.h
@@ -9,8 +9,8 @@
class _n64_state : public driver_device
{
public:
- _n64_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ _n64_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* video-related */
N64::RDP::Processor m_rdp;
diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h
index b0d5bd24b03..fcf922dc641 100644
--- a/src/mame/includes/n8080.h
+++ b/src/mame/includes/n8080.h
@@ -2,8 +2,8 @@
class n8080_state : public driver_device
{
public:
- n8080_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ n8080_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h
index 5b3243c1d45..2367e9e98f6 100644
--- a/src/mame/includes/namcofl.h
+++ b/src/mame/includes/namcofl.h
@@ -16,8 +16,8 @@
class namcofl_state : public driver_device
{
public:
- namcofl_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ namcofl_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
emu_timer *m_raster_interrupt_timer;
UINT32 *m_workram;
diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h
index 0d11558d6c3..34fcb8cf0b7 100644
--- a/src/mame/includes/namcona1.h
+++ b/src/mame/includes/namcona1.h
@@ -19,8 +19,8 @@ enum
class namcona1_state : public driver_device
{
public:
- namcona1_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ namcona1_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
UINT16 *m_spriteram;
diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h
index 222936ac602..d1d51cc29f3 100644
--- a/src/mame/includes/namconb1.h
+++ b/src/mame/includes/namconb1.h
@@ -16,8 +16,8 @@
class namconb1_state : public driver_device
{
public:
- namconb1_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ namconb1_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT32 *m_nvmem32;
UINT16 *m_namconb_shareram;
diff --git a/src/mame/includes/namcond1.h b/src/mame/includes/namcond1.h
index f8433babab5..17b5533cf46 100644
--- a/src/mame/includes/namcond1.h
+++ b/src/mame/includes/namcond1.h
@@ -9,8 +9,8 @@
class namcond1_state : public driver_device
{
public:
- namcond1_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ namcond1_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_h8_irq5_enabled;
UINT16 *m_shared_ram;
diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h
index 8aa3d4099b6..f67fc6f00d6 100644
--- a/src/mame/includes/namcos1.h
+++ b/src/mame/includes/namcos1.h
@@ -12,8 +12,8 @@ typedef struct
class namcos1_state : public driver_device
{
public:
- namcos1_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ namcos1_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_dac0_value;
int m_dac1_value;
diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h
index 3931c602548..5da4c16879f 100644
--- a/src/mame/includes/namcos21.h
+++ b/src/mame/includes/namcos21.h
@@ -26,8 +26,8 @@ struct dsp_state
class namcos21_state : public driver_device
{
public:
- namcos21_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ namcos21_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT16 *m_winrun_dspbios;
diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h
index d203ae26487..ea13681d871 100644
--- a/src/mame/includes/namcos22.h
+++ b/src/mame/includes/namcos22.h
@@ -39,8 +39,8 @@ enum
class namcos22_state : public driver_device
{
public:
- namcos22_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ namcos22_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT32 *m_spriteram;
int m_mbEnableDspIrqs;
diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h
index 10843ccdc46..2bd5f2a08f1 100644
--- a/src/mame/includes/namcos86.h
+++ b/src/mame/includes/namcos86.h
@@ -1,8 +1,8 @@
class namcos86_state : public driver_device
{
public:
- namcos86_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ namcos86_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_spriteram;
int m_wdog;
diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h
index c9813bd93f3..c8877a5206e 100644
--- a/src/mame/includes/naughtyb.h
+++ b/src/mame/includes/naughtyb.h
@@ -1,8 +1,8 @@
class naughtyb_state : public driver_device
{
public:
- naughtyb_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ naughtyb_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 m_popflame_prot_seed;
diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h
index 741251e5190..7ddf5b7d456 100644
--- a/src/mame/includes/nbmj8688.h
+++ b/src/mame/includes/nbmj8688.h
@@ -1,8 +1,8 @@
class nbmj8688_state : public driver_device
{
public:
- nbmj8688_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ nbmj8688_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_mjsikaku_scrolly;
int m_blitter_destx;
diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h
index 8e8d8cd0e66..053c0784612 100644
--- a/src/mame/includes/nbmj8891.h
+++ b/src/mame/includes/nbmj8891.h
@@ -1,8 +1,8 @@
class nbmj8891_state : public driver_device
{
public:
- nbmj8891_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ nbmj8891_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_scrolly;
int m_blitter_destx;
diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h
index bd82ab4d496..f9c957836a4 100644
--- a/src/mame/includes/nbmj8900.h
+++ b/src/mame/includes/nbmj8900.h
@@ -1,8 +1,8 @@
class nbmj8900_state : public driver_device
{
public:
- nbmj8900_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ nbmj8900_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_scrolly;
int m_blitter_destx;
diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h
index ea65cd9b2a0..46fb59b9957 100644
--- a/src/mame/includes/nbmj8991.h
+++ b/src/mame/includes/nbmj8991.h
@@ -1,8 +1,8 @@
class nbmj8991_state : public driver_device
{
public:
- nbmj8991_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ nbmj8991_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_scrollx;
int m_scrolly;
diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h
index 7ff463c8c2c..773b367b53d 100644
--- a/src/mame/includes/nbmj9195.h
+++ b/src/mame/includes/nbmj9195.h
@@ -7,8 +7,8 @@
class nbmj9195_state : public driver_device
{
public:
- nbmj9195_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ nbmj9195_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_inputport;
int m_dipswbitsel;
diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h
index 7ad94bda874..03dd5d077ee 100644
--- a/src/mame/includes/nemesis.h
+++ b/src/mame/includes/nemesis.h
@@ -1,8 +1,8 @@
class nemesis_state : public driver_device
{
public:
- nemesis_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ nemesis_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram1;
diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h
index c394a226446..3dd2343df1c 100644
--- a/src/mame/includes/neogeo.h
+++ b/src/mame/includes/neogeo.h
@@ -31,8 +31,8 @@
class neogeo_state : public driver_device
{
public:
- neogeo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ neogeo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT8 *memcard_data; // this currently uses generic handlers
diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h
index c6d05995750..3a6b22e7af4 100644
--- a/src/mame/includes/news.h
+++ b/src/mame/includes/news.h
@@ -2,8 +2,8 @@
class news_state : public driver_device
{
public:
- news_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ news_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_bgram;
diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h
index 311e2311952..b5fb334b4ab 100644
--- a/src/mame/includes/ninjakd2.h
+++ b/src/mame/includes/ninjakd2.h
@@ -1,8 +1,8 @@
class ninjakd2_state : public driver_device
{
public:
- ninjakd2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ninjakd2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
const INT16* m_sampledata;
UINT8 m_omegaf_io_protection[3];
diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h
index 77897965af3..3e0f9a3ef64 100644
--- a/src/mame/includes/ninjaw.h
+++ b/src/mame/includes/ninjaw.h
@@ -7,8 +7,8 @@
class ninjaw_state : public driver_device
{
public:
- ninjaw_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ninjaw_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_spriteram;
diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h
index 16c11f089f1..b09516401ff 100644
--- a/src/mame/includes/nitedrvr.h
+++ b/src/mame/includes/nitedrvr.h
@@ -18,8 +18,8 @@
class nitedrvr_state : public driver_device
{
public:
- nitedrvr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ nitedrvr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_hvc;
diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h
index 3f9b6e81488..04a00cfc246 100644
--- a/src/mame/includes/niyanpai.h
+++ b/src/mame/includes/niyanpai.h
@@ -3,8 +3,8 @@
class niyanpai_state : public driver_device
{
public:
- niyanpai_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ niyanpai_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_musobana_inputport;
int m_musobana_outcoin_flag;
diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h
index 41b3719846c..daa63edbd1d 100644
--- a/src/mame/includes/nmk16.h
+++ b/src/mame/includes/nmk16.h
@@ -1,8 +1,8 @@
class nmk16_state : public driver_device
{
public:
- nmk16_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ nmk16_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int mask[4*2];
UINT16* m_mainram;
diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h
index 6cfb92a58b9..e6b4bff26c8 100644
--- a/src/mame/includes/norautp.h
+++ b/src/mame/includes/norautp.h
@@ -9,8 +9,8 @@
class norautp_state : public driver_device
{
public:
- norautp_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ norautp_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_np_vram;
UINT16 m_np_addr;
diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h
index 8bc5af6e8a4..e5409c28c2d 100644
--- a/src/mame/includes/nova2001.h
+++ b/src/mame/includes/nova2001.h
@@ -1,8 +1,8 @@
class nova2001_state : public driver_device
{
public:
- nova2001_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ nova2001_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_ninjakun_io_a002_ctrl;
UINT8 *m_fg_videoram;
diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h
index e684728f28a..c295830480d 100644
--- a/src/mame/includes/nycaptor.h
+++ b/src/mame/includes/nycaptor.h
@@ -2,8 +2,8 @@
class nycaptor_state : public driver_device
{
public:
- nycaptor_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ nycaptor_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_sharedram;
diff --git a/src/mame/includes/offtwall.h b/src/mame/includes/offtwall.h
index 4455d23d4f7..120ecb18b93 100644
--- a/src/mame/includes/offtwall.h
+++ b/src/mame/includes/offtwall.h
@@ -9,8 +9,8 @@
class offtwall_state : public atarigen_state
{
public:
- offtwall_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ offtwall_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT16 *m_bankswitch_base;
UINT16 *m_bankrom_base;
diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h
index 960083edf43..ad3af3370d6 100644
--- a/src/mame/includes/ohmygod.h
+++ b/src/mame/includes/ohmygod.h
@@ -7,8 +7,8 @@
class ohmygod_state : public driver_device
{
public:
- ohmygod_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ohmygod_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h
index 98d41f42cab..2f52ba65782 100644
--- a/src/mame/includes/ojankohs.h
+++ b/src/mame/includes/ojankohs.h
@@ -7,8 +7,8 @@
class ojankohs_state : public driver_device
{
public:
- ojankohs_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ojankohs_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h
index 561f6472343..80b8c265440 100644
--- a/src/mame/includes/oneshot.h
+++ b/src/mame/includes/oneshot.h
@@ -2,8 +2,8 @@
class oneshot_state : public driver_device
{
public:
- oneshot_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ oneshot_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_sprites;
diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h
index bce73fa57f8..f8067fd7bd7 100644
--- a/src/mame/includes/opwolf.h
+++ b/src/mame/includes/opwolf.h
@@ -7,8 +7,8 @@
class opwolf_state : public driver_device
{
public:
- opwolf_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ opwolf_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_cchip_ram;
diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h
index b5ca0fafc81..a12b7da5f05 100644
--- a/src/mame/includes/orbit.h
+++ b/src/mame/includes/orbit.h
@@ -18,8 +18,8 @@
class orbit_state : public driver_device
{
public:
- orbit_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ orbit_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_playfield_ram;
diff --git a/src/mame/includes/othldrby.h b/src/mame/includes/othldrby.h
index 277381af675..729fa7c8174 100644
--- a/src/mame/includes/othldrby.h
+++ b/src/mame/includes/othldrby.h
@@ -9,8 +9,8 @@
class othldrby_state : public driver_device
{
public:
- othldrby_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ othldrby_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_vram;
diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h
index e56072d91eb..33e18919cf8 100644
--- a/src/mame/includes/othunder.h
+++ b/src/mame/includes/othunder.h
@@ -18,8 +18,8 @@ struct othunder_tempsprite
class othunder_state : public driver_device
{
public:
- othunder_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ othunder_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_spriteram;
diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h
index 8d8da6986cf..b78c41396ea 100644
--- a/src/mame/includes/overdriv.h
+++ b/src/mame/includes/overdriv.h
@@ -7,8 +7,8 @@
class overdriv_state : public driver_device
{
public:
- overdriv_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ overdriv_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT16 * m_paletteram; // currently this uses generic palette handling
diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h
index 5d7e375df01..a720fe2fc2f 100644
--- a/src/mame/includes/pacland.h
+++ b/src/mame/includes/pacland.h
@@ -1,8 +1,8 @@
class pacland_state : public driver_device
{
public:
- pacland_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pacland_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_videoram2;
diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h
index d8ec3c0bc9c..354c985d60b 100644
--- a/src/mame/includes/pacman.h
+++ b/src/mame/includes/pacman.h
@@ -7,8 +7,8 @@
class pacman_state : public driver_device
{
public:
- pacman_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pacman_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_cannonb_bit_to_read;
int m_mystery;
diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h
index 39fcb1eb624..eab03a61455 100644
--- a/src/mame/includes/pandoras.h
+++ b/src/mame/includes/pandoras.h
@@ -7,8 +7,8 @@
class pandoras_state : public driver_device
{
public:
- pandoras_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pandoras_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h
index 18b9eea93e6..dfaf5c37854 100644
--- a/src/mame/includes/paradise.h
+++ b/src/mame/includes/paradise.h
@@ -2,8 +2,8 @@
class paradise_state : public driver_device
{
public:
- paradise_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ paradise_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_vram_0;
diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h
index 10ae80c68df..c64e343e864 100644
--- a/src/mame/includes/parodius.h
+++ b/src/mame/includes/parodius.h
@@ -7,8 +7,8 @@
class parodius_state : public driver_device
{
public:
- parodius_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ parodius_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_ram;
diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h
index 866c91b26ab..4284abf1523 100644
--- a/src/mame/includes/pass.h
+++ b/src/mame/includes/pass.h
@@ -1,8 +1,8 @@
class pass_state : public driver_device
{
public:
- pass_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pass_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
tilemap_t *m_bg_tilemap;
tilemap_t *m_fg_tilemap;
diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h
index 1b1a562d603..8750366381a 100644
--- a/src/mame/includes/pastelg.h
+++ b/src/mame/includes/pastelg.h
@@ -1,8 +1,8 @@
class pastelg_state : public driver_device
{
public:
- pastelg_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pastelg_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_mux_data;
int m_blitter_destx;
diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h
index 0a3921ba9cd..14f0e89f76c 100644
--- a/src/mame/includes/pbaction.h
+++ b/src/mame/includes/pbaction.h
@@ -7,8 +7,8 @@
class pbaction_state : public driver_device
{
public:
- pbaction_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pbaction_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h
index 6a69e5040fc..94b8ee84f25 100644
--- a/src/mame/includes/pcktgal.h
+++ b/src/mame/includes/pcktgal.h
@@ -1,8 +1,8 @@
class pcktgal_state : public driver_device
{
public:
- pcktgal_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pcktgal_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_msm5205next;
int m_toggle;
diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h
index 3dec690e776..7df1d102da4 100644
--- a/src/mame/includes/pgm.h
+++ b/src/mame/includes/pgm.h
@@ -2,8 +2,8 @@
class pgm_state : public driver_device
{
public:
- pgm_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pgm_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT16 * m_mainram; // currently this is also used by nvram handler
diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h
index 8e22be61d92..661ceaef5d7 100644
--- a/src/mame/includes/phoenix.h
+++ b/src/mame/includes/phoenix.h
@@ -6,8 +6,8 @@
class phoenix_state : public driver_device
{
public:
- phoenix_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ phoenix_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram_pg[2];
UINT8 m_videoram_pg_index;
diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h
index 6657139e755..69aabb7cd48 100644
--- a/src/mame/includes/pingpong.h
+++ b/src/mame/includes/pingpong.h
@@ -1,8 +1,8 @@
class pingpong_state : public driver_device
{
public:
- pingpong_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pingpong_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_intenable;
int m_question_addr_high;
diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h
index 73f7ca60803..78502e47b07 100644
--- a/src/mame/includes/pirates.h
+++ b/src/mame/includes/pirates.h
@@ -1,8 +1,8 @@
class pirates_state : public driver_device
{
public:
- pirates_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pirates_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_tx_tileram;
UINT16 *m_spriteram;
diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h
index 808a1cda79e..c67516f1f65 100644
--- a/src/mame/includes/pitnrun.h
+++ b/src/mame/includes/pitnrun.h
@@ -1,8 +1,8 @@
class pitnrun_state : public driver_device
{
public:
- pitnrun_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pitnrun_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
int m_nmi;
diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h
index 37072d9ed81..cab46a4fd98 100644
--- a/src/mame/includes/pktgaldx.h
+++ b/src/mame/includes/pktgaldx.h
@@ -7,8 +7,8 @@
class pktgaldx_state : public driver_device
{
public:
- pktgaldx_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pktgaldx_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_pf1_rowscroll;
diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h
index cfb52eff595..dbffe910a83 100644
--- a/src/mame/includes/playch10.h
+++ b/src/mame/includes/playch10.h
@@ -7,8 +7,8 @@ typedef struct
class playch10_state : public driver_device
{
public:
- playch10_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ playch10_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_ram_8w;
diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h
index 38c425d00b4..490cdfc5000 100644
--- a/src/mame/includes/playmark.h
+++ b/src/mame/includes/playmark.h
@@ -3,8 +3,8 @@
class playmark_state : public driver_device
{
public:
- playmark_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ playmark_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_bgvideoram;
diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h
index d42deb8d4da..778831deafa 100644
--- a/src/mame/includes/plygonet.h
+++ b/src/mame/includes/plygonet.h
@@ -7,8 +7,8 @@ static const UINT16 dsp56k_bank04_size = 0x1fc0;
class polygonet_state : public driver_device
{
public:
- polygonet_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ polygonet_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* 68k-side shared ram */
UINT32* m_shared_ram;
diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h
index e519dc33edb..6bbde80bbaa 100644
--- a/src/mame/includes/pokechmp.h
+++ b/src/mame/includes/pokechmp.h
@@ -1,8 +1,8 @@
class pokechmp_state : public driver_device
{
public:
- pokechmp_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pokechmp_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
tilemap_t *m_bg_tilemap;
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index 8c48e5f0921..4de79ae9f9c 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -11,8 +11,8 @@
class polepos_state : public driver_device
{
public:
- polepos_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ polepos_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_steer_last;
UINT8 m_steer_delta;
diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h
index 6d5b86437d1..d2103e26db2 100644
--- a/src/mame/includes/policetr.h
+++ b/src/mame/includes/policetr.h
@@ -7,8 +7,8 @@
class policetr_state : public driver_device
{
public:
- policetr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ policetr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT32 m_control_data;
UINT32 m_bsmt_data_bank;
diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h
index e272ca15b7f..d8f678635f3 100644
--- a/src/mame/includes/polyplay.h
+++ b/src/mame/includes/polyplay.h
@@ -5,8 +5,8 @@
class polyplay_state : public driver_device
{
public:
- polyplay_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ polyplay_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
int m_freq1;
diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h
index 33972b1be4b..c55b18d39e3 100644
--- a/src/mame/includes/poolshrk.h
+++ b/src/mame/includes/poolshrk.h
@@ -11,8 +11,8 @@
class poolshrk_state : public driver_device
{
public:
- poolshrk_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ poolshrk_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_da_latch;
UINT8* m_playfield_ram;
diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h
index a89236077e4..f90f225a389 100644
--- a/src/mame/includes/pooyan.h
+++ b/src/mame/includes/pooyan.h
@@ -1,8 +1,8 @@
class pooyan_state : public driver_device
{
public:
- pooyan_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pooyan_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h
index c18f994f1a8..8623d8943fc 100644
--- a/src/mame/includes/popeye.h
+++ b/src/mame/includes/popeye.h
@@ -1,8 +1,8 @@
class popeye_state : public driver_device
{
public:
- popeye_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ popeye_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_prot0;
UINT8 m_prot1;
diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h
index 88b310ebbff..e3cae69dcdc 100644
--- a/src/mame/includes/popper.h
+++ b/src/mame/includes/popper.h
@@ -7,8 +7,8 @@
class popper_state : public driver_device
{
public:
- popper_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ popper_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h
index 03b08a8c4da..5c563dc1ba0 100644
--- a/src/mame/includes/portrait.h
+++ b/src/mame/includes/portrait.h
@@ -1,8 +1,8 @@
class portrait_state : public driver_device
{
public:
- portrait_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ portrait_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_bgvideoram;
UINT8 *m_fgvideoram;
diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h
index 68521f09a8f..9f72e68519e 100644
--- a/src/mame/includes/powerins.h
+++ b/src/mame/includes/powerins.h
@@ -1,8 +1,8 @@
class powerins_state : public driver_device
{
public:
- powerins_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ powerins_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_oki_bank;
UINT16 *m_vram_0;
diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h
index 3b90984b23d..23133c5cbc3 100644
--- a/src/mame/includes/prehisle.h
+++ b/src/mame/includes/prehisle.h
@@ -1,8 +1,8 @@
class prehisle_state : public driver_device
{
public:
- prehisle_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ prehisle_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_spriteram;
diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h
index 1ced0e3a3d3..26f2e5d14e4 100644
--- a/src/mame/includes/psikyo.h
+++ b/src/mame/includes/psikyo.h
@@ -7,8 +7,8 @@
class psikyo_state : public driver_device
{
public:
- psikyo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ psikyo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT32 * m_vram_0;
diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h
index e1717a6a303..66396045da0 100644
--- a/src/mame/includes/psikyo4.h
+++ b/src/mame/includes/psikyo4.h
@@ -10,8 +10,8 @@
class psikyo4_state : public driver_device
{
public:
- psikyo4_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ psikyo4_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT32 * m_vidregs;
diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h
index 130fedd9f24..3c193ecb615 100644
--- a/src/mame/includes/psikyosh.h
+++ b/src/mame/includes/psikyosh.h
@@ -19,8 +19,8 @@
class psikyosh_state : public driver_device
{
public:
- psikyosh_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ psikyosh_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT32 * m_bgram;
diff --git a/src/mame/includes/psx.h b/src/mame/includes/psx.h
index 2704b3ebbef..0d4afa8b3b1 100644
--- a/src/mame/includes/psx.h
+++ b/src/mame/includes/psx.h
@@ -45,8 +45,8 @@ typedef struct _psx_gpu psx_gpu;
class psx_state : public driver_device
{
public:
- psx_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ psx_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
psx_machine *m_p_psx;
psx_gpu *m_p_psxgpu;
diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h
index 793303b9d05..2ced0fcb9bd 100644
--- a/src/mame/includes/psychic5.h
+++ b/src/mame/includes/psychic5.h
@@ -1,8 +1,8 @@
class psychic5_state : public driver_device
{
public:
- psychic5_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ psychic5_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_bank_latch;
UINT8 m_ps5_vram_page;
diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h
index c635cb4ffb9..27b9abfd4dc 100644
--- a/src/mame/includes/punchout.h
+++ b/src/mame/includes/punchout.h
@@ -1,8 +1,8 @@
class punchout_state : public driver_device
{
public:
- punchout_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ punchout_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_rp5c01_mode_sel;
int m_rp5c01_mem[16*4];
diff --git a/src/mame/includes/pushman.h b/src/mame/includes/pushman.h
index d2760e0ee8c..4d0a3d854bf 100644
--- a/src/mame/includes/pushman.h
+++ b/src/mame/includes/pushman.h
@@ -7,8 +7,8 @@
class pushman_state : public driver_device
{
public:
- pushman_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ pushman_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram;
diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h
index 35822090051..ca6e6589020 100644
--- a/src/mame/includes/qdrmfgp.h
+++ b/src/mame/includes/qdrmfgp.h
@@ -1,8 +1,8 @@
class qdrmfgp_state : public driver_device
{
public:
- qdrmfgp_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ qdrmfgp_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT8> m_nvram;
diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h
index bbd5bb794ad..ecd1aac4f02 100644
--- a/src/mame/includes/qix.h
+++ b/src/mame/includes/qix.h
@@ -22,8 +22,8 @@
class qix_state : public driver_device
{
public:
- qix_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ qix_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* machine state */
UINT8 *m_68705_port_out;
diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h
index c80fd3bbe45..a9bbcfb3add 100644
--- a/src/mame/includes/quizdna.h
+++ b/src/mame/includes/quizdna.h
@@ -1,8 +1,8 @@
class quizdna_state : public driver_device
{
public:
- quizdna_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ quizdna_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_bg_ram;
UINT8 *m_fg_ram;
diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h
index 3ddc78c9254..5949f5440f4 100644
--- a/src/mame/includes/quizpani.h
+++ b/src/mame/includes/quizpani.h
@@ -1,8 +1,8 @@
class quizpani_state : public driver_device
{
public:
- quizpani_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ quizpani_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_bg_videoram;
UINT16 *m_txt_videoram;
diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h
index 3204332bea1..23a8ab9ca72 100644
--- a/src/mame/includes/raiden.h
+++ b/src/mame/includes/raiden.h
@@ -1,8 +1,8 @@
class raiden_state : public driver_device
{
public:
- raiden_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ raiden_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
UINT16 *m_shared_ram;
diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h
index a73f7a4552e..4bf877ce4e3 100644
--- a/src/mame/includes/raiden2.h
+++ b/src/mame/includes/raiden2.h
@@ -1,8 +1,8 @@
class raiden2_state : public driver_device
{
public:
- raiden2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ raiden2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
DECLARE_WRITE16_MEMBER( cop_itoa_low_w );
DECLARE_WRITE16_MEMBER( cop_itoa_high_w );
diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h
index 69c9158a89c..7863df3a0af 100644
--- a/src/mame/includes/rainbow.h
+++ b/src/mame/includes/rainbow.h
@@ -7,8 +7,8 @@
class rainbow_state : public driver_device
{
public:
- rainbow_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ rainbow_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_spriteram;
diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h
index 76c2da8b127..005a8c93092 100644
--- a/src/mame/includes/rallyx.h
+++ b/src/mame/includes/rallyx.h
@@ -8,8 +8,8 @@ struct jungler_star
class rallyx_state : public driver_device
{
public:
- rallyx_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ rallyx_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/rampart.h b/src/mame/includes/rampart.h
index 7c81b7ee041..b44a1029b8b 100644
--- a/src/mame/includes/rampart.h
+++ b/src/mame/includes/rampart.h
@@ -9,8 +9,8 @@
class rampart_state : public atarigen_state
{
public:
- rampart_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ rampart_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT16 * m_bitmap;
UINT8 m_has_mo;
diff --git a/src/mame/includes/rastan.h b/src/mame/includes/rastan.h
index 2e7aefae9eb..3614ced9d8b 100644
--- a/src/mame/includes/rastan.h
+++ b/src/mame/includes/rastan.h
@@ -7,8 +7,8 @@
class rastan_state : public driver_device
{
public:
- rastan_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ rastan_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT16 * paletteram; // this currently uses generic palette handlers
diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h
index 0161c5b69cf..369fc01f303 100644
--- a/src/mame/includes/realbrk.h
+++ b/src/mame/includes/realbrk.h
@@ -1,8 +1,8 @@
class realbrk_state : public driver_device
{
public:
- realbrk_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ realbrk_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_dsw_select;
UINT16 *m_backup_ram;
diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h
index e0400898a1e..05730cb3579 100644
--- a/src/mame/includes/redalert.h
+++ b/src/mame/includes/redalert.h
@@ -10,8 +10,8 @@
class redalert_state : public driver_device
{
public:
- redalert_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ redalert_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_ay8910_latch_1;
UINT8 m_ay8910_latch_2;
diff --git a/src/mame/includes/relief.h b/src/mame/includes/relief.h
index f97de5d3e78..f2350622819 100644
--- a/src/mame/includes/relief.h
+++ b/src/mame/includes/relief.h
@@ -9,8 +9,8 @@
class relief_state : public atarigen_state
{
public:
- relief_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ relief_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT8 m_ym2413_volume;
UINT8 m_overall_volume;
diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h
index c18c6b8035f..b10fbb17ac5 100644
--- a/src/mame/includes/renegade.h
+++ b/src/mame/includes/renegade.h
@@ -3,8 +3,8 @@
class renegade_state : public driver_device
{
public:
- renegade_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ renegade_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_bank;
int m_mcu_sim;
diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h
index 9e3c91fa53f..a279bf08c20 100644
--- a/src/mame/includes/retofinv.h
+++ b/src/mame/includes/retofinv.h
@@ -1,8 +1,8 @@
class retofinv_state : public driver_device
{
public:
- retofinv_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ retofinv_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_cpu2_m6000;
UINT8 *m_fg_videoram;
diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h
index 14d81e80a48..d165a861e81 100644
--- a/src/mame/includes/rockrage.h
+++ b/src/mame/includes/rockrage.h
@@ -7,8 +7,8 @@
class rockrage_state : public driver_device
{
public:
- rockrage_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ rockrage_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_paletteram;
diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h
index 2a0017ace16..f2d970d1fb8 100644
--- a/src/mame/includes/rocnrope.h
+++ b/src/mame/includes/rocnrope.h
@@ -1,8 +1,8 @@
class rocnrope_state : public driver_device
{
public:
- rocnrope_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ rocnrope_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h
index 3d67543cd5b..9a393feb010 100644
--- a/src/mame/includes/rohga.h
+++ b/src/mame/includes/rohga.h
@@ -11,8 +11,8 @@
class rohga_state : public driver_device
{
public:
- rohga_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ rohga_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_decocomn(*this, "deco_common"),
diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h
index c60a4bc452b..1e294f16dc9 100644
--- a/src/mame/includes/rollerg.h
+++ b/src/mame/includes/rollerg.h
@@ -7,8 +7,8 @@
class rollerg_state : public driver_device
{
public:
- rollerg_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ rollerg_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT8 * m_paletteram; // currently this uses generic palette handling
diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h
index 6d685f6d286..2d7b714f904 100644
--- a/src/mame/includes/rollrace.h
+++ b/src/mame/includes/rollrace.h
@@ -1,8 +1,8 @@
class rollrace_state : public driver_device
{
public:
- rollrace_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ rollrace_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_colorram;
diff --git a/src/mame/includes/route16.h b/src/mame/includes/route16.h
index 712bb899a1a..b50636901df 100644
--- a/src/mame/includes/route16.h
+++ b/src/mame/includes/route16.h
@@ -1,8 +1,8 @@
class route16_state : public driver_device
{
public:
- route16_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ route16_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_sharedram;
UINT8 m_ttmahjng_port_select;
diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h
index 3706ef269a6..2e26661a6af 100644
--- a/src/mame/includes/rpunch.h
+++ b/src/mame/includes/rpunch.h
@@ -1,8 +1,8 @@
class rpunch_state : public driver_device
{
public:
- rpunch_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ rpunch_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
UINT8 m_sound_data;
diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h
index 99d1533d937..e208e533634 100644
--- a/src/mame/includes/runaway.h
+++ b/src/mame/includes/runaway.h
@@ -1,8 +1,8 @@
class runaway_state : public driver_device
{
public:
- runaway_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ runaway_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
emu_timer *m_interrupt_timer;
UINT8* m_video_ram;
diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h
index 31fca98cc4d..a8369b4777a 100644
--- a/src/mame/includes/rungun.h
+++ b/src/mame/includes/rungun.h
@@ -7,8 +7,8 @@
class rungun_state : public driver_device
{
public:
- rungun_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ rungun_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_936_videoram;
diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h
index 3fbff6f07f8..21f4f7af141 100644
--- a/src/mame/includes/sauro.h
+++ b/src/mame/includes/sauro.h
@@ -1,8 +1,8 @@
class sauro_state : public driver_device
{
public:
- sauro_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sauro_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
size_t m_spriteram_size;
UINT8 *m_spriteram;
diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h
index 9a56149eda8..deb421761fe 100644
--- a/src/mame/includes/sbasketb.h
+++ b/src/mame/includes/sbasketb.h
@@ -1,8 +1,8 @@
class sbasketb_state : public driver_device
{
public:
- sbasketb_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sbasketb_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h
index d8f3187c77e..b2d43d035a2 100644
--- a/src/mame/includes/sbugger.h
+++ b/src/mame/includes/sbugger.h
@@ -1,8 +1,8 @@
class sbugger_state : public driver_device
{
public:
- sbugger_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sbugger_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_videoram_attr;
diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h
index 5f9ad2a264f..a173e1342bc 100644
--- a/src/mame/includes/scotrsht.h
+++ b/src/mame/includes/scotrsht.h
@@ -1,8 +1,8 @@
class scotrsht_state : public driver_device
{
public:
- scotrsht_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ scotrsht_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_irq_enable;
UINT8 *m_scroll;
diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h
index 0117463621c..54e5679c50f 100644
--- a/src/mame/includes/scramble.h
+++ b/src/mame/includes/scramble.h
@@ -4,8 +4,8 @@
class scramble_state : public galaxold_state
{
public:
- scramble_state(running_machine &machine, const driver_device_config_base &config)
- : galaxold_state(machine, config) { }
+ scramble_state(const machine_config &mconfig, device_type type, const char *tag)
+ : galaxold_state(mconfig, type, tag) { }
UINT8 *m_soundram;
UINT8 m_cavelon_bank;
diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h
index 96ce4e3c60e..391007befd7 100644
--- a/src/mame/includes/sderby.h
+++ b/src/mame/includes/sderby.h
@@ -1,8 +1,8 @@
class sderby_state : public driver_device
{
public:
- sderby_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sderby_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_spriteram;
size_t m_spriteram_size;
diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h
index 329a686eb53..7f1e599b545 100644
--- a/src/mame/includes/segag80r.h
+++ b/src/mame/includes/segag80r.h
@@ -9,8 +9,8 @@
class segag80r_state : public driver_device
{
public:
- segag80r_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ segag80r_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_sound_state[2];
UINT8 m_sound_rate;
diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h
index a70da5b18d5..10d04bbd0f0 100644
--- a/src/mame/includes/segag80v.h
+++ b/src/mame/includes/segag80v.h
@@ -9,8 +9,8 @@
class segag80v_state : public driver_device
{
public:
- segag80v_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ segag80v_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_mainram;
device_t *m_usb;
diff --git a/src/mame/includes/segas16.h b/src/mame/includes/segas16.h
index fefc0497aae..b78e47f83ef 100644
--- a/src/mame/includes/segas16.h
+++ b/src/mame/includes/segas16.h
@@ -2,8 +2,8 @@
class segas1x_state : public driver_device
{
public:
- segas1x_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ segas1x_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_interrupt_timer(*this, "int_timer") { }
/* memory pointers */
diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h
index bb7ca9db8fe..34dee277a81 100644
--- a/src/mame/includes/segas24.h
+++ b/src/mame/includes/segas24.h
@@ -3,8 +3,8 @@
class segas24_state : public driver_device
{
public:
- segas24_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ segas24_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
static const UINT8 mahmajn_mlt[8];
diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h
index 9403db443b5..6a6c00cafc0 100644
--- a/src/mame/includes/segas32.h
+++ b/src/mame/includes/segas32.h
@@ -16,8 +16,8 @@ struct layer_info
class segas32_state : public driver_device
{
public:
- segas32_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ segas32_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_z80_shared_ram;
UINT8 m_v60_irq_control[0x10];
diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h
index 31d1f4403cd..c060675e812 100644
--- a/src/mame/includes/seibuspi.h
+++ b/src/mame/includes/seibuspi.h
@@ -5,8 +5,8 @@
class seibuspi_state : public driver_device
{
public:
- seibuspi_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ seibuspi_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT32 *m_spimainram;
UINT32 *m_spi_scrollram;
diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h
index d72d794c005..fba7b479e5d 100644
--- a/src/mame/includes/seicross.h
+++ b/src/mame/includes/seicross.h
@@ -1,8 +1,8 @@
class seicross_state : public driver_device
{
public:
- seicross_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ seicross_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_nvram;
size_t m_nvram_size;
diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h
index da264d32d97..32493551dc5 100644
--- a/src/mame/includes/senjyo.h
+++ b/src/mame/includes/senjyo.h
@@ -6,8 +6,8 @@
class senjyo_state : public driver_device
{
public:
- senjyo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ senjyo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_int_delay_kludge;
UINT8 m_sound_cmd;
diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h
index 78db6f71447..27ae2b1dd98 100644
--- a/src/mame/includes/seta.h
+++ b/src/mame/includes/seta.h
@@ -27,8 +27,8 @@ struct _game_offset
class seta_state : public driver_device
{
public:
- seta_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ seta_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_sharedram;
UINT16 *m_workram;
diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h
index 20b4ceb765c..5c0f3adb93a 100644
--- a/src/mame/includes/seta2.h
+++ b/src/mame/includes/seta2.h
@@ -1,8 +1,8 @@
class seta2_state : public driver_device
{
public:
- seta2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ seta2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
optional_shared_ptr<UINT16> m_nvram;
diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h
index 73cb7cf27de..e74b5e0e411 100644
--- a/src/mame/includes/sf.h
+++ b/src/mame/includes/sf.h
@@ -7,8 +7,8 @@
class sf_state : public driver_device
{
public:
- sf_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sf_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram;
diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h
index ce141c18b47..1b76e78516b 100644
--- a/src/mame/includes/shadfrce.h
+++ b/src/mame/includes/shadfrce.h
@@ -1,8 +1,8 @@
class shadfrce_state : public driver_device
{
public:
- shadfrce_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ shadfrce_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
tilemap_t *m_fgtilemap;
tilemap_t *m_bg0tilemap;
diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h
index 0cc9037f735..271f129f430 100644
--- a/src/mame/includes/shangha3.h
+++ b/src/mame/includes/shangha3.h
@@ -1,8 +1,8 @@
class shangha3_state : public driver_device
{
public:
- shangha3_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ shangha3_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_prot_count;
UINT16 *m_ram;
diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h
index 55dc38aa94e..1991a705a1c 100644
--- a/src/mame/includes/shangkid.h
+++ b/src/mame/includes/shangkid.h
@@ -1,8 +1,8 @@
class shangkid_state : public driver_device
{
public:
- shangkid_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ shangkid_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_spriteram;
diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h
index 11dff920c36..1033f5b6046 100644
--- a/src/mame/includes/shaolins.h
+++ b/src/mame/includes/shaolins.h
@@ -1,8 +1,8 @@
class shaolins_state : public driver_device
{
public:
- shaolins_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ shaolins_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
size_t m_spriteram_size;
UINT8 *m_spriteram;
diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h
index d6af97294c5..17dcddb06d1 100644
--- a/src/mame/includes/shisen.h
+++ b/src/mame/includes/shisen.h
@@ -1,8 +1,8 @@
class shisen_state : public driver_device
{
public:
- shisen_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ shisen_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_gfxbank;
tilemap_t *m_bg_tilemap;
diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h
index b104a6b7573..d7f154cbd1f 100644
--- a/src/mame/includes/shootout.h
+++ b/src/mame/includes/shootout.h
@@ -1,8 +1,8 @@
class shootout_state : public driver_device
{
public:
- shootout_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ shootout_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
tilemap_t *m_background;
tilemap_t *m_foreground;
diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h
index b76b0f1d66c..2245a84072e 100644
--- a/src/mame/includes/shuuz.h
+++ b/src/mame/includes/shuuz.h
@@ -9,8 +9,8 @@
class shuuz_state : public atarigen_state
{
public:
- shuuz_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ shuuz_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
int m_cur[2];
};
diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h
index 0873f0f844b..a2fa87058bf 100644
--- a/src/mame/includes/sidearms.h
+++ b/src/mame/includes/sidearms.h
@@ -1,8 +1,8 @@
class sidearms_state : public driver_device
{
public:
- sidearms_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sidearms_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_gameid;
diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h
index 0f9627baccc..e70a31d20c3 100644
--- a/src/mame/includes/sidepckt.h
+++ b/src/mame/includes/sidepckt.h
@@ -1,8 +1,8 @@
class sidepckt_state : public driver_device
{
public:
- sidepckt_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sidepckt_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
tilemap_t *m_bg_tilemap;
UINT8 *m_colorram;
diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h
index 10472b4f665..e4b74a557b5 100644
--- a/src/mame/includes/silkroad.h
+++ b/src/mame/includes/silkroad.h
@@ -1,8 +1,8 @@
class silkroad_state : public driver_device
{
public:
- silkroad_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ silkroad_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT32 *m_vidram;
UINT32 *m_vidram2;
diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h
index 9d7ad2e8e1f..6ee7be80f02 100644
--- a/src/mame/includes/simpl156.h
+++ b/src/mame/includes/simpl156.h
@@ -11,8 +11,8 @@
class simpl156_state : public driver_device
{
public:
- simpl156_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ simpl156_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_deco_tilegen1(*this, "tilegen1"),
m_eeprom(*this, "eeprom"),
diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h
index c22ccc093ad..7a88cbcb097 100644
--- a/src/mame/includes/simpsons.h
+++ b/src/mame/includes/simpsons.h
@@ -2,8 +2,8 @@
class simpsons_state : public driver_device
{
public:
- simpsons_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ simpsons_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_ram;
diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h
index 13718a0be5d..b9bed8c023c 100644
--- a/src/mame/includes/skullxbo.h
+++ b/src/mame/includes/skullxbo.h
@@ -9,8 +9,8 @@
class skullxbo_state : public atarigen_state
{
public:
- skullxbo_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ skullxbo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
};
diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h
index 9dcf2f9ca75..424d7f1f486 100644
--- a/src/mame/includes/skydiver.h
+++ b/src/mame/includes/skydiver.h
@@ -22,8 +22,8 @@
class skydiver_state : public driver_device
{
public:
- skydiver_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ skydiver_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_nmion;
UINT8 *m_videoram;
diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h
index ea25adfe54c..6faf1705558 100644
--- a/src/mame/includes/skyfox.h
+++ b/src/mame/includes/skyfox.h
@@ -7,8 +7,8 @@
class skyfox_state : public driver_device
{
public:
- skyfox_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ skyfox_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_spriteram;
diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h
index f0d456e36e5..64fa347ca8a 100644
--- a/src/mame/includes/skykid.h
+++ b/src/mame/includes/skykid.h
@@ -1,8 +1,8 @@
class skykid_state : public driver_device
{
public:
- skykid_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ skykid_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_inputport_selected;
UINT8 *m_textram;
diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h
index 926cb6b4458..5347135ebf8 100644
--- a/src/mame/includes/skyraid.h
+++ b/src/mame/includes/skyraid.h
@@ -3,8 +3,8 @@
class skyraid_state : public driver_device
{
public:
- skyraid_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ skyraid_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_analog_range;
int m_analog_offset;
diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h
index f6e87063d35..4e0ddcfe545 100644
--- a/src/mame/includes/slapfght.h
+++ b/src/mame/includes/slapfght.h
@@ -14,8 +14,8 @@ enum {
class slapfght_state : public driver_device
{
public:
- slapfght_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ slapfght_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_getstar_id;
UINT8 *m_slapfight_videoram;
diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h
index e0a3f2c18ee..bbba495a9d4 100644
--- a/src/mame/includes/slapshot.h
+++ b/src/mame/includes/slapshot.h
@@ -17,8 +17,8 @@ struct slapshot_tempsprite
class slapshot_state : public driver_device
{
public:
- slapshot_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ slapshot_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_color_ram;
diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h
index abbe1ea23f5..7665f4f3006 100644
--- a/src/mame/includes/snes.h
+++ b/src/mame/includes/snes.h
@@ -404,8 +404,8 @@ typedef UINT8 (*snes_oldjoy_read)(running_machine &machine);
class snes_state : public driver_device
{
public:
- snes_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ snes_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* misc */
UINT16 m_htmult; /* in 512 wide, we run HTOTAL double and halve it on latching */
diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h
index f52968262e0..09932558214 100644
--- a/src/mame/includes/snk.h
+++ b/src/mame/includes/snk.h
@@ -7,8 +7,8 @@
class snk_state : public driver_device
{
public:
- snk_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ snk_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_countryc_trackball;
int m_last_value[2];
diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h
index 965ac9b2599..a968658c605 100644
--- a/src/mame/includes/snk6502.h
+++ b/src/mame/includes/snk6502.h
@@ -13,8 +13,8 @@
class snk6502_state : public driver_device
{
public:
- snk6502_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ snk6502_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_sasuke_counter;
diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h
index 5c6fdbbdc78..9f2a1ee55ab 100644
--- a/src/mame/includes/snk68.h
+++ b/src/mame/includes/snk68.h
@@ -1,8 +1,8 @@
class snk68_state : public driver_device
{
public:
- snk68_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ snk68_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_invert_controls;
int m_sound_status;
diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h
index a7ffaed1294..c440192be8b 100644
--- a/src/mame/includes/snookr10.h
+++ b/src/mame/includes/snookr10.h
@@ -1,8 +1,8 @@
class snookr10_state : public driver_device
{
public:
- snookr10_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ snookr10_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_outportl;
int m_outporth;
diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h
index 81bf94f257a..c59360faac4 100644
--- a/src/mame/includes/snowbros.h
+++ b/src/mame/includes/snowbros.h
@@ -3,8 +3,8 @@
class snowbros_state : public driver_device
{
public:
- snowbros_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ snowbros_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_hyperpac_ram;
int m_sb3_music_is_playing;
diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h
index bf0d527cc22..07c03ba6746 100644
--- a/src/mame/includes/solomon.h
+++ b/src/mame/includes/solomon.h
@@ -1,8 +1,8 @@
class solomon_state : public driver_device
{
public:
- solomon_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ solomon_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
size_t m_spriteram_size;
UINT8 *m_spriteram;
diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h
index b01c49c42a0..5c4edd8c00c 100644
--- a/src/mame/includes/sonson.h
+++ b/src/mame/includes/sonson.h
@@ -7,8 +7,8 @@
class sonson_state : public driver_device
{
public:
- sonson_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sonson_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h
index 30af71df7af..b6c8a0affaa 100644
--- a/src/mame/includes/spacefb.h
+++ b/src/mame/includes/spacefb.h
@@ -27,8 +27,8 @@
class spacefb_state : public driver_device
{
public:
- spacefb_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ spacefb_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_sound_latch;
emu_timer *m_interrupt_timer;
diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h
index fa546983498..b7ded7af8bd 100644
--- a/src/mame/includes/spbactn.h
+++ b/src/mame/includes/spbactn.h
@@ -1,8 +1,8 @@
class spbactn_state : public driver_device
{
public:
- spbactn_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ spbactn_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_bgvideoram;
UINT16 *m_fgvideoram;
diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h
index 3622a95f113..bab1ecbc7ac 100644
--- a/src/mame/includes/spcforce.h
+++ b/src/mame/includes/spcforce.h
@@ -1,8 +1,8 @@
class spcforce_state : public driver_device
{
public:
- spcforce_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ spcforce_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_scrollram;
UINT8 *m_videoram;
diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h
index 34ae7bbdf69..5b883a94942 100644
--- a/src/mame/includes/spdodgeb.h
+++ b/src/mame/includes/spdodgeb.h
@@ -1,8 +1,8 @@
class spdodgeb_state : public driver_device
{
public:
- spdodgeb_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ spdodgeb_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_toggle;
int m_adpcm_pos[2];
diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h
index bc16e024420..5f5d2184cbb 100644
--- a/src/mame/includes/speedatk.h
+++ b/src/mame/includes/speedatk.h
@@ -1,8 +1,8 @@
class speedatk_state : public driver_device
{
public:
- speedatk_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ speedatk_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_colorram;
diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h
index 0741bf5276e..59cf6fdafc2 100644
--- a/src/mame/includes/speedbal.h
+++ b/src/mame/includes/speedbal.h
@@ -1,8 +1,8 @@
class speedbal_state : public driver_device
{
public:
- speedbal_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ speedbal_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_background_videoram;
UINT8 *m_foreground_videoram;
diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h
index 309b0874329..deec090a051 100644
--- a/src/mame/includes/speedspn.h
+++ b/src/mame/includes/speedspn.h
@@ -1,8 +1,8 @@
class speedspn_state : public driver_device
{
public:
- speedspn_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ speedspn_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_attram;
tilemap_t *m_tilemap;
diff --git a/src/mame/includes/spiders.h b/src/mame/includes/spiders.h
index aee604a2076..42ab797bdae 100644
--- a/src/mame/includes/spiders.h
+++ b/src/mame/includes/spiders.h
@@ -10,8 +10,8 @@
class spiders_state : public driver_device
{
public:
- spiders_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ spiders_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_ram;
UINT8 m_flipscreen;
diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h
index 2cd55e56e1d..f452844ace0 100644
--- a/src/mame/includes/splash.h
+++ b/src/mame/includes/splash.h
@@ -1,8 +1,8 @@
class splash_state : public driver_device
{
public:
- splash_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ splash_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_vregs;
UINT16 *m_videoram;
diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h
index 8a87d40f406..d5fc24dc606 100644
--- a/src/mame/includes/sprcros2.h
+++ b/src/mame/includes/sprcros2.h
@@ -1,8 +1,8 @@
class sprcros2_state : public driver_device
{
public:
- sprcros2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sprcros2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_s_port3;
UINT8 m_port7;
diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h
index f6914676b4d..46d25f429ca 100644
--- a/src/mame/includes/sprint2.h
+++ b/src/mame/includes/sprint2.h
@@ -24,8 +24,8 @@
class sprint2_state : public driver_device
{
public:
- sprint2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sprint2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_attract;
int m_steering[2];
diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h
index 580aecbab8d..94092cb166b 100644
--- a/src/mame/includes/sprint4.h
+++ b/src/mame/includes/sprint4.h
@@ -1,8 +1,8 @@
class sprint4_state : public driver_device
{
public:
- sprint4_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sprint4_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
int m_da_latch;
diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h
index 71a4f4d168d..911f518edd4 100644
--- a/src/mame/includes/sprint8.h
+++ b/src/mame/includes/sprint8.h
@@ -3,8 +3,8 @@
class sprint8_state : public driver_device
{
public:
- sprint8_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sprint8_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_steer_dir[8];
int m_steer_flag[8];
diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h
index 577121cc550..80056a9edad 100644
--- a/src/mame/includes/spy.h
+++ b/src/mame/includes/spy.h
@@ -7,8 +7,8 @@
class spy_state : public driver_device
{
public:
- spy_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ spy_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_ram;
diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h
index c5e0f1b6d86..d5dc7d68b9a 100644
--- a/src/mame/includes/srmp2.h
+++ b/src/mame/includes/srmp2.h
@@ -9,8 +9,8 @@ struct iox_t
class srmp2_state : public driver_device
{
public:
- srmp2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ srmp2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_color_bank;
int m_gfx_bank;
diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h
index 139eaf39b7b..f66060574ac 100644
--- a/src/mame/includes/srumbler.h
+++ b/src/mame/includes/srumbler.h
@@ -1,8 +1,8 @@
class srumbler_state : public driver_device
{
public:
- srumbler_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ srumbler_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_backgroundram;
UINT8 *m_foregroundram;
diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h
index fb40f5f5c3e..996d1b26476 100644
--- a/src/mame/includes/sshangha.h
+++ b/src/mame/includes/sshangha.h
@@ -3,8 +3,8 @@
class sshangha_state : public driver_device
{
public:
- sshangha_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ sshangha_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_deco_tilegen1(*this, "tilegen1")
{ }
diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h
index a5815e87749..9b8380c7676 100644
--- a/src/mame/includes/sslam.h
+++ b/src/mame/includes/sslam.h
@@ -1,8 +1,8 @@
class sslam_state : public driver_device
{
public:
- sslam_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sslam_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
emu_timer *m_music_timer;
diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h
index f67dcea15f1..80b4bddf10e 100644
--- a/src/mame/includes/ssozumo.h
+++ b/src/mame/includes/ssozumo.h
@@ -1,8 +1,8 @@
class ssozumo_state : public driver_device
{
public:
- ssozumo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ssozumo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
size_t m_spriteram_size;
UINT8 *m_spriteram;
diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h
index 19b0f89c2c1..a08a92b7302 100644
--- a/src/mame/includes/sspeedr.h
+++ b/src/mame/includes/sspeedr.h
@@ -1,8 +1,8 @@
class sspeedr_state : public driver_device
{
public:
- sspeedr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ sspeedr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_led_TIME[2];
UINT8 m_led_SCORE[24];
diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h
index 3d78af3f5b5..2a75ae9d6b5 100644
--- a/src/mame/includes/ssrj.h
+++ b/src/mame/includes/ssrj.h
@@ -1,8 +1,8 @@
class ssrj_state : public driver_device
{
public:
- ssrj_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ssrj_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_oldport;
tilemap_t *m_tilemap1;
diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h
index 92ba5ca7585..3a906fafaa3 100644
--- a/src/mame/includes/ssv.h
+++ b/src/mame/includes/ssv.h
@@ -3,8 +3,8 @@
class ssv_state : public driver_device
{
public:
- ssv_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ ssv_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_dsp(*this, "dsp")
{ }
diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h
index f9d7a64b2e0..3fc8a3990af 100644
--- a/src/mame/includes/stactics.h
+++ b/src/mame/includes/stactics.h
@@ -10,8 +10,8 @@
class stactics_state : public driver_device
{
public:
- stactics_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ stactics_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* machine state */
int m_vert_pos;
diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h
index 6523f67c250..6859a691412 100644
--- a/src/mame/includes/stadhero.h
+++ b/src/mame/includes/stadhero.h
@@ -1,8 +1,8 @@
class stadhero_state : public driver_device
{
public:
- stadhero_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ stadhero_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_pf1_data;
tilemap_t *m_pf1_tilemap;
diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h
index 2c049aad679..0ef6ae44828 100644
--- a/src/mame/includes/starcrus.h
+++ b/src/mame/includes/starcrus.h
@@ -1,8 +1,8 @@
class starcrus_state : public driver_device
{
public:
- starcrus_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ starcrus_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
bitmap_t *m_ship1_vid;
bitmap_t *m_ship2_vid;
diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h
index c6fd778835f..629116df564 100644
--- a/src/mame/includes/starfire.h
+++ b/src/mame/includes/starfire.h
@@ -13,8 +13,8 @@
class starfire_state : public driver_device
{
public:
- starfire_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ starfire_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
read8_space_func m_input_read;
diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h
index f27010b0331..c2235c5d9af 100644
--- a/src/mame/includes/starshp1.h
+++ b/src/mame/includes/starshp1.h
@@ -33,8 +33,8 @@
class starshp1_state : public driver_device
{
public:
- starshp1_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ starshp1_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_analog_in_select;
int m_attract;
diff --git a/src/mame/includes/starwars.h b/src/mame/includes/starwars.h
index 393aa4ccd49..f43ef0f938d 100644
--- a/src/mame/includes/starwars.h
+++ b/src/mame/includes/starwars.h
@@ -10,8 +10,8 @@
class starwars_state : public driver_device
{
public:
- starwars_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ starwars_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_sound_data;
UINT8 m_main_data;
diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h
index 5bfddb832c0..c1c3b470235 100644
--- a/src/mame/includes/stfight.h
+++ b/src/mame/includes/stfight.h
@@ -1,8 +1,8 @@
class stfight_state : public driver_device
{
public:
- stfight_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ stfight_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_text_char_ram;
UINT8 *m_text_attr_ram;
diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h
index 6d337da4c5e..ec72c92cc32 100644
--- a/src/mame/includes/stlforce.h
+++ b/src/mame/includes/stlforce.h
@@ -1,8 +1,8 @@
class stlforce_state : public driver_device
{
public:
- stlforce_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ stlforce_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
tilemap_t *m_bg_tilemap;
tilemap_t *m_mlow_tilemap;
diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h
index 8932d679235..70778739f97 100644
--- a/src/mame/includes/strnskil.h
+++ b/src/mame/includes/strnskil.h
@@ -1,8 +1,8 @@
class strnskil_state : public driver_device
{
public:
- strnskil_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ strnskil_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_xscroll;
diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h
index 0b5000b7dbd..9f360e79e4a 100644
--- a/src/mame/includes/subs.h
+++ b/src/mame/includes/subs.h
@@ -19,8 +19,8 @@
class subs_state : public driver_device
{
public:
- subs_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ subs_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_spriteram;
diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h
index 5fab251677f..de34e78c52a 100644
--- a/src/mame/includes/suna16.h
+++ b/src/mame/includes/suna16.h
@@ -1,8 +1,8 @@
class suna16_state : public driver_device
{
public:
- suna16_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ suna16_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 m_prot;
UINT16 *m_paletteram;
diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h
index c2b2d243ba8..f9e241dccc9 100644
--- a/src/mame/includes/suna8.h
+++ b/src/mame/includes/suna8.h
@@ -5,8 +5,8 @@
class suna8_state : public driver_device
{
public:
- suna8_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ suna8_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_rombank;
UINT8 m_spritebank;
diff --git a/src/mame/includes/supbtime.h b/src/mame/includes/supbtime.h
index cf11fd1c8c7..042a849d720 100644
--- a/src/mame/includes/supbtime.h
+++ b/src/mame/includes/supbtime.h
@@ -7,8 +7,8 @@
class supbtime_state : public driver_device
{
public:
- supbtime_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ supbtime_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_pf1_rowscroll;
diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h
index 5e28ca5cc04..49818094577 100644
--- a/src/mame/includes/superchs.h
+++ b/src/mame/includes/superchs.h
@@ -11,8 +11,8 @@ struct tempsprite
class superchs_state : public driver_device
{
public:
- superchs_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ superchs_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 m_coin_word;
UINT32 *m_ram;
diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h
index 8c47ca312bd..36227370766 100644
--- a/src/mame/includes/superqix.h
+++ b/src/mame/includes/superqix.h
@@ -1,8 +1,8 @@
class superqix_state : public driver_device
{
public:
- superqix_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ superqix_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
INT16 *m_samplebuf;
UINT8 m_port1;
diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h
index 91904c84436..4060050d864 100644
--- a/src/mame/includes/suprloco.h
+++ b/src/mame/includes/suprloco.h
@@ -1,8 +1,8 @@
class suprloco_state : public driver_device
{
public:
- suprloco_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ suprloco_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_scrollram;
diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h
index 278bc237740..640c5948b54 100644
--- a/src/mame/includes/suprnova.h
+++ b/src/mame/includes/suprnova.h
@@ -17,8 +17,8 @@ typedef struct
class skns_state : public driver_device
{
public:
- skns_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ skns_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
sknsspr_device* m_spritegen;
UINT32 *m_tilemapA_ram;
diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h
index a64d78a941b..424542a0257 100644
--- a/src/mame/includes/suprridr.h
+++ b/src/mame/includes/suprridr.h
@@ -7,8 +7,8 @@
class suprridr_state : public driver_device
{
public:
- suprridr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ suprridr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_nmi_enable;
UINT8 m_sound_data;
diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h
index 3666f08aa93..f8df81df3b8 100644
--- a/src/mame/includes/suprslam.h
+++ b/src/mame/includes/suprslam.h
@@ -7,8 +7,8 @@
class suprslam_state : public driver_device
{
public:
- suprslam_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ suprslam_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_screen_videoram;
diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h
index e90603e213d..360ba2c5a00 100644
--- a/src/mame/includes/surpratk.h
+++ b/src/mame/includes/surpratk.h
@@ -7,8 +7,8 @@
class surpratk_state : public driver_device
{
public:
- surpratk_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ surpratk_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_ram;
diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h
index 5cffe12a6fb..560e562334b 100644
--- a/src/mame/includes/system1.h
+++ b/src/mame/includes/system1.h
@@ -1,8 +1,8 @@
class system1_state : public driver_device
{
public:
- system1_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ system1_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
void (*m_videomode_custom)(running_machine &machine, UINT8 data, UINT8 prevdata);
diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h
index 40dca40376f..b8625d4d36e 100644
--- a/src/mame/includes/system16.h
+++ b/src/mame/includes/system16.h
@@ -4,8 +4,8 @@
class segas1x_bootleg_state : public driver_device
{
public:
- segas1x_bootleg_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ segas1x_bootleg_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 * m_bg0_tileram;
UINT16 * m_bg1_tileram;
diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h
index 9747d76775a..a1f076e2f8f 100644
--- a/src/mame/includes/tagteam.h
+++ b/src/mame/includes/tagteam.h
@@ -1,8 +1,8 @@
class tagteam_state : public driver_device
{
public:
- tagteam_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tagteam_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_coin;
UINT8 *m_videoram;
diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h
index 871830d7b44..c2d96eb2712 100644
--- a/src/mame/includes/tail2nos.h
+++ b/src/mame/includes/tail2nos.h
@@ -7,8 +7,8 @@
class tail2nos_state : public driver_device
{
public:
- tail2nos_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tail2nos_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_bgvideoram;
diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h
index 5c242369b59..987e1aff213 100644
--- a/src/mame/includes/taito_b.h
+++ b/src/mame/includes/taito_b.h
@@ -2,8 +2,8 @@
class taitob_state : public driver_device
{
public:
- taitob_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ taitob_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_spriteram;
diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h
index 70f36d15ffd..dd73fc5a949 100644
--- a/src/mame/includes/taito_f2.h
+++ b/src/mame/includes/taito_f2.h
@@ -13,8 +13,8 @@ struct f2_tempsprite
class taitof2_state : public driver_device
{
public:
- taitof2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ taitof2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_oki(*this, "oki") { }
/* memory pointers */
diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h
index 5382657f0b6..319bdb160a0 100644
--- a/src/mame/includes/taito_f3.h
+++ b/src/mame/includes/taito_f3.h
@@ -43,8 +43,8 @@ enum {
class taito_f3_state : public driver_device
{
public:
- taito_f3_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ taito_f3_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
UINT16 *m_spriteram;
diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h
index f860b4b225e..471ed9e7a8d 100644
--- a/src/mame/includes/taito_h.h
+++ b/src/mame/includes/taito_h.h
@@ -7,8 +7,8 @@
class taitoh_state : public driver_device
{
public:
- taitoh_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ taitoh_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_m68000_mainram;
diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h
index 7db85c97e18..c72036a47c2 100644
--- a/src/mame/includes/taito_l.h
+++ b/src/mame/includes/taito_l.h
@@ -4,8 +4,8 @@
class taitol_state : public driver_device
{
public:
- taitol_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ taitol_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_shared_ram;
diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h
index 0e3a43ed4e9..989906929f3 100644
--- a/src/mame/includes/taito_o.h
+++ b/src/mame/includes/taito_o.h
@@ -7,8 +7,8 @@
class taitoo_state : public driver_device
{
public:
- taitoo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ taitoo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT16 * paletteram; // currently this uses generic palette handling
diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h
index 237af045d66..ef990e6cce4 100644
--- a/src/mame/includes/taito_z.h
+++ b/src/mame/includes/taito_z.h
@@ -8,8 +8,8 @@
class taitoz_state : public driver_device
{
public:
- taitoz_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ taitoz_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_spriteram;
diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h
index fbe388b4793..a9713b7a36f 100644
--- a/src/mame/includes/taitoair.h
+++ b/src/mame/includes/taitoair.h
@@ -20,8 +20,8 @@ struct taitoair_poly {
class taitoair_state : public driver_device
{
public:
- taitoair_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ taitoair_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_m68000_mainram;
diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h
index 4a85b4f26f4..72529069b9b 100644
--- a/src/mame/includes/taitojc.h
+++ b/src/mame/includes/taitojc.h
@@ -3,8 +3,8 @@
class taitojc_state : public driver_device
{
public:
- taitojc_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ taitojc_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_texture_x;
int m_texture_y;
diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h
index edafecb30db..d8cb809b298 100644
--- a/src/mame/includes/taitosj.h
+++ b/src/mame/includes/taitosj.h
@@ -1,8 +1,8 @@
class taitosj_state : public driver_device
{
public:
- taitosj_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ taitosj_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_sndnmi_disable;
UINT8 m_input_port_4_f0;
diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h
index 8d54f35dadc..5d3eae47a17 100644
--- a/src/mame/includes/tank8.h
+++ b/src/mame/includes/tank8.h
@@ -26,8 +26,8 @@
class tank8_state : public driver_device
{
public:
- tank8_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tank8_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_collision_index;
UINT8 *m_video_ram;
diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h
index b03fe4bb211..d3e2ea41e67 100644
--- a/src/mame/includes/tankbatt.h
+++ b/src/mame/includes/tankbatt.h
@@ -1,8 +1,8 @@
class tankbatt_state : public driver_device
{
public:
- tankbatt_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tankbatt_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
int m_nmi_enable;
diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h
index 7e65447ae98..f641d887c34 100644
--- a/src/mame/includes/tankbust.h
+++ b/src/mame/includes/tankbust.h
@@ -1,8 +1,8 @@
class tankbust_state : public driver_device
{
public:
- tankbust_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tankbust_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_latch;
UINT32 m_timer1;
diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h
index 4b95fcfe0ba..4a2f4ed4f95 100644
--- a/src/mame/includes/taotaido.h
+++ b/src/mame/includes/taotaido.h
@@ -1,8 +1,8 @@
class taotaido_state : public driver_device
{
public:
- taotaido_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ taotaido_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_pending_command;
UINT16 *m_spriteram;
diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h
index 95c7ecd85db..4f2b137831a 100644
--- a/src/mame/includes/targeth.h
+++ b/src/mame/includes/targeth.h
@@ -1,8 +1,8 @@
class targeth_state : public driver_device
{
public:
- targeth_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ targeth_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_vregs;
UINT16 *m_videoram;
diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h
index f2ee8257dbb..efc5af904fd 100644
--- a/src/mame/includes/tatsumi.h
+++ b/src/mame/includes/tatsumi.h
@@ -1,8 +1,8 @@
class tatsumi_state : public driver_device
{
public:
- tatsumi_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tatsumi_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
UINT16 *m_cyclwarr_cpua_ram;
diff --git a/src/mame/includes/taxidrvr.h b/src/mame/includes/taxidrvr.h
index 646de68b906..243a1878d76 100644
--- a/src/mame/includes/taxidrvr.h
+++ b/src/mame/includes/taxidrvr.h
@@ -1,8 +1,8 @@
class taxidrvr_state : public driver_device
{
public:
- taxidrvr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ taxidrvr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_s1;
int m_s2;
diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h
index cdefda7cf81..73f26ad0e3b 100644
--- a/src/mame/includes/tbowl.h
+++ b/src/mame/includes/tbowl.h
@@ -1,8 +1,8 @@
class tbowl_state : public driver_device
{
public:
- tbowl_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tbowl_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_adpcm_pos[2];
int m_adpcm_end[2];
diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h
index 6fdd0327288..7162223ec3c 100644
--- a/src/mame/includes/tceptor.h
+++ b/src/mame/includes/tceptor.h
@@ -1,8 +1,8 @@
class tceptor_state : public driver_device
{
public:
- tceptor_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tceptor_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_m6809_irq_enable;
UINT8 m_m68k_irq_enable;
diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h
index 87e20f71a48..31f903ea766 100644
--- a/src/mame/includes/tecmo.h
+++ b/src/mame/includes/tecmo.h
@@ -1,8 +1,8 @@
class tecmo_state : public driver_device
{
public:
- tecmo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tecmo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_adpcm_pos;
int m_adpcm_end;
diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h
index c572bf0a01c..6e0bd48db84 100644
--- a/src/mame/includes/tecmo16.h
+++ b/src/mame/includes/tecmo16.h
@@ -1,8 +1,8 @@
class tecmo16_state : public driver_device
{
public:
- tecmo16_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tecmo16_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
UINT16 *m_colorram;
diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h
index 1afa135c764..3e717a0598b 100644
--- a/src/mame/includes/tecmosys.h
+++ b/src/mame/includes/tecmosys.h
@@ -7,8 +7,8 @@
class tecmosys_state : public driver_device
{
public:
- tecmosys_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tecmosys_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16* m_spriteram;
UINT16* m_tilemap_paletteram16;
diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h
index f0cceb1645e..9be4a260037 100644
--- a/src/mame/includes/tehkanwc.h
+++ b/src/mame/includes/tehkanwc.h
@@ -1,8 +1,8 @@
class tehkanwc_state : public driver_device
{
public:
- tehkanwc_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tehkanwc_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_track0[2];
int m_track1[2];
diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h
index a152da467b1..f34a4c02ed0 100644
--- a/src/mame/includes/terracre.h
+++ b/src/mame/includes/terracre.h
@@ -1,8 +1,8 @@
class terracre_state : public driver_device
{
public:
- terracre_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ terracre_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
const UINT16 *m_mpProtData;
diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h
index ed5e36e9ef8..a0211026875 100644
--- a/src/mame/includes/tetrisp2.h
+++ b/src/mame/includes/tetrisp2.h
@@ -1,8 +1,8 @@
class tetrisp2_state : public driver_device
{
public:
- tetrisp2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tetrisp2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 m_systemregs[0x10];
UINT16 *m_vram_bg;
diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h
index 1b7d3f4d146..50e67b7e435 100644
--- a/src/mame/includes/thedeep.h
+++ b/src/mame/includes/thedeep.h
@@ -1,8 +1,8 @@
class thedeep_state : public driver_device
{
public:
- thedeep_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ thedeep_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_spriteram;
size_t m_spriteram_size;
diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h
index dba2c56c53e..b435d7e6173 100644
--- a/src/mame/includes/thepit.h
+++ b/src/mame/includes/thepit.h
@@ -1,8 +1,8 @@
class thepit_state : public driver_device
{
public:
- thepit_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ thepit_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_question_address;
int m_question_rom;
diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h
index 17b255d153a..a5707ee4d80 100644
--- a/src/mame/includes/thief.h
+++ b/src/mame/includes/thief.h
@@ -8,8 +8,8 @@ typedef struct {
class thief_state : public driver_device
{
public:
- thief_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ thief_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 m_input_select;
diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h
index ff96bd88369..fbb8f0366a7 100644
--- a/src/mame/includes/thoop2.h
+++ b/src/mame/includes/thoop2.h
@@ -1,8 +1,8 @@
class thoop2_state : public driver_device
{
public:
- thoop2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ thoop2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_vregs;
UINT16 *m_videoram;
diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h
index 232feb58600..9c7f85f0dec 100644
--- a/src/mame/includes/thunderj.h
+++ b/src/mame/includes/thunderj.h
@@ -9,8 +9,8 @@
class thunderj_state : public atarigen_state
{
public:
- thunderj_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ thunderj_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT8 m_alpha_tile_bank;
};
diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h
index f2a6b81edcb..f9fc42122c3 100644
--- a/src/mame/includes/thunderx.h
+++ b/src/mame/includes/thunderx.h
@@ -7,8 +7,8 @@
class thunderx_state : public driver_device
{
public:
- thunderx_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ thunderx_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_ram;
diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h
index e6efbb828e6..00ff3f41f25 100644
--- a/src/mame/includes/tiamc1.h
+++ b/src/mame/includes/tiamc1.h
@@ -3,8 +3,8 @@
class tiamc1_state : public driver_device
{
public:
- tiamc1_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tiamc1_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_tileram;
UINT8 *m_charram;
diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h
index a3dcd7f6f28..e0012585c53 100644
--- a/src/mame/includes/tigeroad.h
+++ b/src/mame/includes/tigeroad.h
@@ -1,8 +1,8 @@
class tigeroad_state : public driver_device
{
public:
- tigeroad_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tigeroad_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
UINT16 *m_ram16;
diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h
index 9f7cb0f4dcb..809bd506074 100644
--- a/src/mame/includes/timelimt.h
+++ b/src/mame/includes/timelimt.h
@@ -1,8 +1,8 @@
class timelimt_state : public driver_device
{
public:
- timelimt_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ timelimt_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
int m_nmi_enabled;
diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h
index f4aa44ed650..e6dd1621f32 100644
--- a/src/mame/includes/timeplt.h
+++ b/src/mame/includes/timeplt.h
@@ -7,8 +7,8 @@
class timeplt_state : public driver_device
{
public:
- timeplt_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ timeplt_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h
index 92a89f06635..ee4086b55b8 100644
--- a/src/mame/includes/tmnt.h
+++ b/src/mame/includes/tmnt.h
@@ -2,8 +2,8 @@
class tmnt_state : public driver_device
{
public:
- tmnt_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tmnt_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_tmnt2_1c0800;
diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h
index a19c3e6080d..81352d2c71c 100644
--- a/src/mame/includes/tnzs.h
+++ b/src/mame/includes/tnzs.h
@@ -18,8 +18,8 @@ enum
class tnzs_state : public driver_device
{
public:
- tnzs_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tnzs_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_objram;
diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h
index 40ee4280dd6..dcb0c57c5be 100644
--- a/src/mame/includes/toaplan1.h
+++ b/src/mame/includes/toaplan1.h
@@ -7,8 +7,8 @@
class toaplan1_state : public driver_device
{
public:
- toaplan1_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ toaplan1_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_unk_reset_port;
UINT16 *m_colorram1;
diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h
index cc41d7e497d..b29ec8eba2b 100644
--- a/src/mame/includes/toaplan2.h
+++ b/src/mame/includes/toaplan2.h
@@ -12,8 +12,8 @@
class toaplan2_state : public driver_device
{
public:
- toaplan2_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config)
+ toaplan2_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag)
{
m_vdp0 = NULL;
m_vdp1 = NULL;
diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h
index 711d712fb94..7db761254c8 100644
--- a/src/mame/includes/toki.h
+++ b/src/mame/includes/toki.h
@@ -1,8 +1,8 @@
class toki_state : public driver_device
{
public:
- toki_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ toki_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
int m_msm5205next;
diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h
index 15a25a6777b..cd26ea35394 100644
--- a/src/mame/includes/toobin.h
+++ b/src/mame/includes/toobin.h
@@ -9,8 +9,8 @@
class toobin_state : public atarigen_state
{
public:
- toobin_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ toobin_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT16 * m_interrupt_scan;
diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h
index 045dd888109..544d78d0044 100644
--- a/src/mame/includes/topspeed.h
+++ b/src/mame/includes/topspeed.h
@@ -7,8 +7,8 @@
class topspeed_state : public driver_device
{
public:
- topspeed_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ topspeed_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_spritemap;
diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h
index 9ff298b8f07..2bc85d749c2 100644
--- a/src/mame/includes/toypop.h
+++ b/src/mame/includes/toypop.h
@@ -1,8 +1,8 @@
class toypop_state : public driver_device
{
public:
- toypop_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ toypop_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_spriteram;
diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h
index f90d85a5ac6..e24ff5bb5b0 100644
--- a/src/mame/includes/tp84.h
+++ b/src/mame/includes/tp84.h
@@ -1,8 +1,8 @@
class tp84_state : public driver_device
{
public:
- tp84_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tp84_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
cpu_device *m_audiocpu;
UINT8 *m_bg_videoram;
diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h
index 264a7f93de4..68e13a8a29c 100644
--- a/src/mame/includes/trackfld.h
+++ b/src/mame/includes/trackfld.h
@@ -8,8 +8,8 @@
class trackfld_state : public driver_device
{
public:
- trackfld_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ trackfld_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h
index 435c41f1d0a..cd358f825d4 100644
--- a/src/mame/includes/travrusa.h
+++ b/src/mame/includes/travrusa.h
@@ -1,8 +1,8 @@
class travrusa_state : public driver_device
{
public:
- travrusa_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ travrusa_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h
index 702e18db386..7e2ec9eb8cf 100644
--- a/src/mame/includes/triplhnt.h
+++ b/src/mame/includes/triplhnt.h
@@ -19,8 +19,8 @@
class triplhnt_state : public driver_device
{
public:
- triplhnt_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ triplhnt_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_cmos[16];
UINT8 m_da_latch;
diff --git a/src/mame/includes/truco.h b/src/mame/includes/truco.h
index d4214cae472..245ceb979cc 100644
--- a/src/mame/includes/truco.h
+++ b/src/mame/includes/truco.h
@@ -1,8 +1,8 @@
class truco_state : public driver_device
{
public:
- truco_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ truco_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_battery_ram;
diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h
index eb50e275d58..90698564cf2 100644
--- a/src/mame/includes/trucocl.h
+++ b/src/mame/includes/trucocl.h
@@ -1,8 +1,8 @@
class trucocl_state : public driver_device
{
public:
- trucocl_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ trucocl_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_cur_dac_address;
int m_cur_dac_address_index;
diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h
index 7c33b85879a..9454724039b 100644
--- a/src/mame/includes/tryout.h
+++ b/src/mame/includes/tryout.h
@@ -1,8 +1,8 @@
class tryout_state : public driver_device
{
public:
- tryout_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tryout_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_gfx_control;
diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h
index 0f5f04d3b82..00e4c58bd79 100644
--- a/src/mame/includes/tsamurai.h
+++ b/src/mame/includes/tsamurai.h
@@ -1,8 +1,8 @@
class tsamurai_state : public driver_device
{
public:
- tsamurai_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tsamurai_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_nmi_enabled;
int m_sound_command1;
diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h
index f179555e535..b18951259ea 100644
--- a/src/mame/includes/tubep.h
+++ b/src/mame/includes/tubep.h
@@ -1,8 +1,8 @@
class tubep_state : public driver_device
{
public:
- tubep_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tubep_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_sound_latch;
UINT8 m_ls74;
diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h
index 23268fa23a0..8dac704db44 100644
--- a/src/mame/includes/tumbleb.h
+++ b/src/mame/includes/tumbleb.h
@@ -2,8 +2,8 @@
class tumbleb_state : public driver_device
{
public:
- tumbleb_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tumbleb_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_pf1_data;
diff --git a/src/mame/includes/tumblep.h b/src/mame/includes/tumblep.h
index f3a7bc201d0..96816be4d77 100644
--- a/src/mame/includes/tumblep.h
+++ b/src/mame/includes/tumblep.h
@@ -7,8 +7,8 @@
class tumblep_state : public driver_device
{
public:
- tumblep_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tumblep_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_pf1_rowscroll;
diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h
index a6e6ce808cc..6b0e97f1fb2 100644
--- a/src/mame/includes/tunhunt.h
+++ b/src/mame/includes/tunhunt.h
@@ -1,8 +1,8 @@
class tunhunt_state : public driver_device
{
public:
- tunhunt_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tunhunt_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_control;
UINT8 *m_workram;
diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h
index d6bf925ad8e..cb2e1e87918 100644
--- a/src/mame/includes/turbo.h
+++ b/src/mame/includes/turbo.h
@@ -25,8 +25,8 @@ struct i8279_state
class turbo_state : public driver_device
{
public:
- turbo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ turbo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h
index c5958028240..899d5039790 100644
--- a/src/mame/includes/tutankhm.h
+++ b/src/mame/includes/tutankhm.h
@@ -1,8 +1,8 @@
class tutankhm_state : public driver_device
{
public:
- tutankhm_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tutankhm_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h
index f368b689df6..390a2275d4f 100644
--- a/src/mame/includes/twin16.h
+++ b/src/mame/includes/twin16.h
@@ -1,8 +1,8 @@
class twin16_state : public driver_device
{
public:
- twin16_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ twin16_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
UINT16 m_CPUA_register;
diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h
index e5c4f8386ac..b21d1b2e149 100644
--- a/src/mame/includes/twincobr.h
+++ b/src/mame/includes/twincobr.h
@@ -10,8 +10,8 @@
class twincobr_state : public driver_device
{
public:
- twincobr_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ twincobr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_toaplan_main_cpu;
int m_wardner_membank;
diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h
index 97845f28c37..e71cdeb4cbd 100644
--- a/src/mame/includes/tx1.h
+++ b/src/mame/includes/tx1.h
@@ -101,8 +101,8 @@ struct vregs_t
class tx1_state : public driver_device
{
public:
- tx1_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ tx1_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
math_t m_math;
sn74s516_t m_sn74s516;
diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h
index 303baacfea9..738516a5b22 100644
--- a/src/mame/includes/ultraman.h
+++ b/src/mame/includes/ultraman.h
@@ -7,8 +7,8 @@
class ultraman_state : public driver_device
{
public:
- ultraman_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ultraman_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT16 * m_paletteram; // currently this uses generic palette handling
diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h
index 822ebcd4a51..84c4165db3b 100644
--- a/src/mame/includes/ultratnk.h
+++ b/src/mame/includes/ultratnk.h
@@ -8,8 +8,8 @@
class ultratnk_state : public driver_device
{
public:
- ultratnk_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ ultratnk_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
int m_da_latch;
diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h
index 0fad111c5e0..ec57ae3b225 100644
--- a/src/mame/includes/undrfire.h
+++ b/src/mame/includes/undrfire.h
@@ -11,8 +11,8 @@ struct tempsprite
class undrfire_state : public driver_device
{
public:
- undrfire_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ undrfire_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 m_coin_word;
UINT16 m_port_sel;
diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h
index dc728964ac3..278bcb66f27 100644
--- a/src/mame/includes/unico.h
+++ b/src/mame/includes/unico.h
@@ -1,8 +1,8 @@
class unico_state : public driver_device
{
public:
- unico_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ unico_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_vram;
UINT16 *m_scroll;
diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h
index 64db14c5961..c59fe1f5f64 100644
--- a/src/mame/includes/usgames.h
+++ b/src/mame/includes/usgames.h
@@ -1,8 +1,8 @@
class usgames_state : public driver_device
{
public:
- usgames_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ usgames_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_charram;
diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h
index ae0d40177b0..7a16951d317 100644
--- a/src/mame/includes/vaportra.h
+++ b/src/mame/includes/vaportra.h
@@ -7,8 +7,8 @@
class vaportra_state : public driver_device
{
public:
- vaportra_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ vaportra_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_pf1_rowscroll;
diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h
index 1aee0bbadcd..1bb72043b3d 100644
--- a/src/mame/includes/vastar.h
+++ b/src/mame/includes/vastar.h
@@ -1,8 +1,8 @@
class vastar_state : public driver_device
{
public:
- vastar_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ vastar_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_spriteram1;
UINT8 *m_spriteram2;
diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h
index fae4731448b..67e871cd72f 100644
--- a/src/mame/includes/vball.h
+++ b/src/mame/includes/vball.h
@@ -1,8 +1,8 @@
class vball_state : public driver_device
{
public:
- vball_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ vball_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_vb_attribram;
UINT8 *m_vb_videoram;
diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h
index ba2923449f3..74142920e0e 100644
--- a/src/mame/includes/vendetta.h
+++ b/src/mame/includes/vendetta.h
@@ -7,8 +7,8 @@
class vendetta_state : public driver_device
{
public:
- vendetta_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ vendetta_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_ram;
diff --git a/src/mame/includes/vertigo.h b/src/mame/includes/vertigo.h
index 299c8c90217..2949e53e80b 100644
--- a/src/mame/includes/vertigo.h
+++ b/src/mame/includes/vertigo.h
@@ -24,10 +24,8 @@ typedef struct _am2901
class vector_generator
{
public:
- vector_generator(running_machine &machine)
- : m_machine(machine) { }
-
- running_machine &machine() const { return m_machine; }
+ running_machine &machine() const { assert(m_machine != NULL); return *m_machine; }
+ void set_machine(running_machine &machine) { m_machine = &machine; }
UINT32 sreg; /* shift register */
UINT32 l1; /* latch 1 adder operand only */
@@ -49,7 +47,7 @@ public:
UINT32 ven; /* vector intensity enable */
private:
- running_machine &m_machine;
+ running_machine *m_machine;
};
typedef struct _microcode
@@ -86,9 +84,8 @@ typedef struct _vproc
class vertigo_state : public driver_device
{
public:
- vertigo_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
- m_vgen(machine) { }
+ vertigo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_vectorram;
device_t *m_ttl74148;
diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h
index 8c109a2d0a1..28ea1a64f8d 100644
--- a/src/mame/includes/vicdual.h
+++ b/src/mame/includes/vicdual.h
@@ -25,8 +25,8 @@
class vicdual_state : public driver_device
{
public:
- vicdual_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ vicdual_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT32 m_coin_status;
UINT8 *m_videoram;
diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h
index dc6b868c752..12645be721c 100644
--- a/src/mame/includes/victory.h
+++ b/src/mame/includes/victory.h
@@ -32,8 +32,8 @@ struct micro_t
class victory_state : public driver_device
{
public:
- victory_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ victory_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_charram;
diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h
index 5bd16acdd03..6e02869b6a7 100644
--- a/src/mame/includes/videopin.h
+++ b/src/mame/includes/videopin.h
@@ -18,8 +18,8 @@
class videopin_state : public driver_device
{
public:
- videopin_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ videopin_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
attotime m_time_pushed;
attotime m_time_released;
diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h
index 15e0c1080fc..635b446af1f 100644
--- a/src/mame/includes/vigilant.h
+++ b/src/mame/includes/vigilant.h
@@ -1,8 +1,8 @@
class vigilant_state : public driver_device
{
public:
- vigilant_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ vigilant_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
int m_horiz_scroll_low;
diff --git a/src/mame/includes/vindictr.h b/src/mame/includes/vindictr.h
index 2463f67df6c..41ac951ee27 100644
--- a/src/mame/includes/vindictr.h
+++ b/src/mame/includes/vindictr.h
@@ -9,8 +9,8 @@
class vindictr_state : public atarigen_state
{
public:
- vindictr_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ vindictr_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT8 m_playfield_tile_bank;
UINT16 m_playfield_xscroll;
diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h
index e1905029ad4..f2bd70e9bcf 100644
--- a/src/mame/includes/volfied.h
+++ b/src/mame/includes/volfied.h
@@ -7,8 +7,8 @@
class volfied_state : public driver_device
{
public:
- volfied_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ volfied_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_video_ram;
diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h
index 7391940793c..ddec3328f78 100644
--- a/src/mame/includes/vsnes.h
+++ b/src/mame/includes/vsnes.h
@@ -1,8 +1,8 @@
class vsnes_state : public driver_device
{
public:
- vsnes_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ vsnes_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_work_ram;
UINT8 *m_work_ram_1;
diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h
index 0ab535685f8..e23929fe152 100644
--- a/src/mame/includes/vulgus.h
+++ b/src/mame/includes/vulgus.h
@@ -1,8 +1,8 @@
class vulgus_state : public driver_device
{
public:
- vulgus_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ vulgus_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_fgvideoram;
UINT8 *m_bgvideoram;
diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h
index 5f66537a963..3bbd1cf925a 100644
--- a/src/mame/includes/warpwarp.h
+++ b/src/mame/includes/warpwarp.h
@@ -3,8 +3,8 @@
class warpwarp_state : public driver_device
{
public:
- warpwarp_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ warpwarp_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_geebee_videoram;
UINT8 *m_videoram;
diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h
index 3040e67eccc..a2cbcb10588 100644
--- a/src/mame/includes/warriorb.h
+++ b/src/mame/includes/warriorb.h
@@ -7,8 +7,8 @@
class warriorb_state : public driver_device
{
public:
- warriorb_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ warriorb_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_spriteram;
diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h
index bdbd1ba0eda..bbfdf3ec4a0 100644
--- a/src/mame/includes/wc90.h
+++ b/src/mame/includes/wc90.h
@@ -1,8 +1,8 @@
class wc90_state : public driver_device
{
public:
- wc90_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ wc90_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_fgvideoram;
UINT8 *m_bgvideoram;
diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h
index 71183ab85c0..b73a77ab5e5 100644
--- a/src/mame/includes/wc90b.h
+++ b/src/mame/includes/wc90b.h
@@ -1,8 +1,8 @@
class wc90b_state : public driver_device
{
public:
- wc90b_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ wc90b_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_msm5205next;
int m_toggle;
diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h
index a8c5fcced03..a43d8627bc1 100644
--- a/src/mame/includes/wecleman.h
+++ b/src/mame/includes/wecleman.h
@@ -1,8 +1,8 @@
class wecleman_state : public driver_device
{
public:
- wecleman_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ wecleman_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_blitter_regs;
int m_multiply_reg[2];
diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h
index 0264cc3d763..acd59ca9571 100644
--- a/src/mame/includes/welltris.h
+++ b/src/mame/includes/welltris.h
@@ -1,8 +1,8 @@
class welltris_state : public driver_device
{
public:
- welltris_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ welltris_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_pending_command;
diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h
index e6ce50aa487..9056bb50fa1 100644
--- a/src/mame/includes/wgp.h
+++ b/src/mame/includes/wgp.h
@@ -7,8 +7,8 @@
class wgp_state : public driver_device
{
public:
- wgp_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ wgp_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_spritemap;
diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h
index ef943e99898..143d8f9dad3 100644
--- a/src/mame/includes/williams.h
+++ b/src/mame/includes/williams.h
@@ -10,8 +10,8 @@
class williams_state : public driver_device
{
public:
- williams_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config),
+ williams_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT8> m_nvram;
diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h
index 0a8b09b6f3c..8320702acbc 100644
--- a/src/mame/includes/wiping.h
+++ b/src/mame/includes/wiping.h
@@ -1,8 +1,8 @@
class wiping_state : public driver_device
{
public:
- wiping_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ wiping_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_sharedram1;
UINT8 *m_sharedram2;
diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h
index f177f1e1e08..ac84ae94862 100644
--- a/src/mame/includes/wiz.h
+++ b/src/mame/includes/wiz.h
@@ -1,8 +1,8 @@
class wiz_state : public driver_device
{
public:
- wiz_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ wiz_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
int m_dsc0;
diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h
index 29558e5b592..6d3a9a5d824 100644
--- a/src/mame/includes/wolfpack.h
+++ b/src/mame/includes/wolfpack.h
@@ -1,8 +1,8 @@
class wolfpack_state : public driver_device
{
public:
- wolfpack_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ wolfpack_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_collision;
UINT8* m_alpha_num_ram;
diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h
index dff1eb55122..dc2ded6157e 100644
--- a/src/mame/includes/wrally.h
+++ b/src/mame/includes/wrally.h
@@ -1,8 +1,8 @@
class wrally_state : public driver_device
{
public:
- wrally_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ wrally_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_shareram;
tilemap_t *m_pant[2];
diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h
index 6d8c760c9d6..8d8e943b00a 100644
--- a/src/mame/includes/wwfsstar.h
+++ b/src/mame/includes/wwfsstar.h
@@ -1,8 +1,8 @@
class wwfsstar_state : public driver_device
{
public:
- wwfsstar_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ wwfsstar_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_vblank;
int m_scrollx;
diff --git a/src/mame/includes/wwfwfest.h b/src/mame/includes/wwfwfest.h
index f9e74d9f10e..8c9b040e4dc 100644
--- a/src/mame/includes/wwfwfest.h
+++ b/src/mame/includes/wwfwfest.h
@@ -1,8 +1,8 @@
class wwfwfest_state : public driver_device
{
public:
- wwfwfest_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ wwfwfest_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_fg0_videoram;
UINT16 *m_bg0_videoram;
diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h
index 7815006d222..4eb7a425651 100644
--- a/src/mame/includes/xain.h
+++ b/src/mame/includes/xain.h
@@ -1,8 +1,8 @@
class xain_state : public driver_device
{
public:
- xain_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ xain_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_vblank;
int m_from_main;
diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h
index 9552bc815b2..6ba8ee66539 100644
--- a/src/mame/includes/xexex.h
+++ b/src/mame/includes/xexex.h
@@ -7,8 +7,8 @@
class xexex_state : public driver_device
{
public:
- xexex_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ xexex_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_workram;
diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h
index 89b68946a99..88a5d7b60f1 100644
--- a/src/mame/includes/xmen.h
+++ b/src/mame/includes/xmen.h
@@ -2,8 +2,8 @@
class xmen_state : public driver_device
{
public:
- xmen_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ xmen_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
// UINT16 * m_paletteram; // currently this uses generic palette handling
diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h
index 6b0e584e8f0..0f0d366df5c 100644
--- a/src/mame/includes/xorworld.h
+++ b/src/mame/includes/xorworld.h
@@ -1,8 +1,8 @@
class xorworld_state : public driver_device
{
public:
- xorworld_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ xorworld_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT16 *m_videoram;
tilemap_t *m_bg_tilemap;
diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h
index b508fb709ae..c4a9cb80f8d 100644
--- a/src/mame/includes/xxmissio.h
+++ b/src/mame/includes/xxmissio.h
@@ -1,8 +1,8 @@
class xxmissio_state : public driver_device
{
public:
- xxmissio_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ xxmissio_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 m_status;
UINT8 *m_bgram;
diff --git a/src/mame/includes/xybots.h b/src/mame/includes/xybots.h
index f95af2ad0a3..1775d66dfd5 100644
--- a/src/mame/includes/xybots.h
+++ b/src/mame/includes/xybots.h
@@ -9,8 +9,8 @@
class xybots_state : public atarigen_state
{
public:
- xybots_state(running_machine &machine, const driver_device_config_base &config)
- : atarigen_state(machine, config) { }
+ xybots_state(const machine_config &mconfig, device_type type, const char *tag)
+ : atarigen_state(mconfig, type, tag) { }
UINT16 m_h256;
};
diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h
index ae1990b4d55..2f95c9470b6 100644
--- a/src/mame/includes/xyonix.h
+++ b/src/mame/includes/xyonix.h
@@ -1,8 +1,8 @@
class xyonix_state : public driver_device
{
public:
- xyonix_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ xyonix_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_vidram;
tilemap_t *m_tilemap;
diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h
index d7f5e5299ec..9ad3bb0bbfa 100644
--- a/src/mame/includes/yiear.h
+++ b/src/mame/includes/yiear.h
@@ -1,8 +1,8 @@
class yiear_state : public driver_device
{
public:
- yiear_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ yiear_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT8 * m_videoram;
diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h
index 9eb0b193e73..758268833a6 100644
--- a/src/mame/includes/yunsun16.h
+++ b/src/mame/includes/yunsun16.h
@@ -7,8 +7,8 @@
class yunsun16_state : public driver_device
{
public:
- yunsun16_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ yunsun16_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_vram_0;
diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h
index 24e39b12d10..0fdd3a7f04c 100644
--- a/src/mame/includes/yunsung8.h
+++ b/src/mame/includes/yunsung8.h
@@ -7,8 +7,8 @@
class yunsung8_state : public driver_device
{
public:
- yunsung8_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ yunsung8_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* video-related */
tilemap_t *m_tilemap_0;
diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h
index c50b964152a..82c028684a4 100644
--- a/src/mame/includes/zac2650.h
+++ b/src/mame/includes/zac2650.h
@@ -1,8 +1,8 @@
class zac2650_state : public driver_device
{
public:
- zac2650_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ zac2650_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_videoram;
UINT8 *m_s2636_0_ram;
diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h
index eb91543a5b8..ebf9da1c263 100644
--- a/src/mame/includes/zaccaria.h
+++ b/src/mame/includes/zaccaria.h
@@ -1,8 +1,8 @@
class zaccaria_state : public driver_device
{
public:
- zaccaria_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ zaccaria_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
int m_dsw;
int m_active_8910;
diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h
index 44423726157..e53988d0c6b 100644
--- a/src/mame/includes/zaxxon.h
+++ b/src/mame/includes/zaxxon.h
@@ -7,8 +7,8 @@
class zaxxon_state : public driver_device
{
public:
- zaxxon_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ zaxxon_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 *m_colorram;
UINT8 *m_videoram;
diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h
index 8d2dc6617e2..a516e8ac4c4 100644
--- a/src/mame/includes/zerozone.h
+++ b/src/mame/includes/zerozone.h
@@ -7,8 +7,8 @@
class zerozone_state : public driver_device
{
public:
- zerozone_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ zerozone_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
/* memory pointers */
UINT16 * m_videoram;
diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h
index 8178deba6a2..62a84e98f58 100644
--- a/src/mame/includes/zodiack.h
+++ b/src/mame/includes/zodiack.h
@@ -1,8 +1,8 @@
class zodiack_state : public driver_device
{
public:
- zodiack_state(running_machine &machine, const driver_device_config_base &config)
- : driver_device(machine, config) { }
+ zodiack_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag) { }
UINT8 * m_videoram;
UINT8 * m_attributeram;